[jboss-svn-commits] JBL Code SVN: r32381 - in labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services: src/main/java/org/drools/services and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Apr 3 16:21:47 EDT 2010


Author: salaboy21
Date: 2010-04-03 16:21:47 -0400 (Sat, 03 Apr 2010)
New Revision: 32381

Added:
   labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/Command.java
   labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/CommandName.java
Modified:
   labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml
   labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteConnection.java
   labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/ClientGenericMessageReceiverImpl.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/RemoteExecutionNodeTest.java
Log:
JBRULES-2446: Drools Services API
	- drools-services removing process-task dep

Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml	2010-04-03 18:36:58 UTC (rev 32380)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml	2010-04-03 20:21:47 UTC (rev 32381)
@@ -13,6 +13,7 @@
     <name>Drools :: Services</name>
     <url>http://maven.apache.org</url>
     <dependencies>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -24,29 +25,42 @@
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-api</artifactId>
-            
-            <type>jar</type>
             <version>5.1.0.SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
-            
+            <version>5.1.0.SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-compiler</artifactId>
+            <version>5.1.0.SNAPSHOT</version>
+        </dependency>
+
         <!-- Apache Mina for default Service Remote Implementation -->
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
             <version>2.0.0-M6</version>
         </dependency>
+
+        <!-- logging -->
+        
+        
         <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-process-task</artifactId>
-            
-            <type>jar</type>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.5.10</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.10</version>
+        </dependency>
+
     </dependencies>
     
 </project>

Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteConnection.java	2010-04-03 18:36:58 UTC (rev 32380)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteConnection.java	2010-04-03 20:21:47 UTC (rev 32381)
@@ -71,21 +71,21 @@
 
     public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) {
         ExecutionNode node = null;
-        GenericNodeConnector currentService = null;
+        GenericNodeConnector currentNode = null;
         try {
 
             //if the strategy is null use the default one
             if (strategy == null) {
-                currentService = getBestNode(new StaticIncrementalSelectionStrategy(this));
+                currentNode = getBestNode(new StaticIncrementalSelectionStrategy(this));
             } else {
                 strategy.setConnection(this);
-                currentService = getBestNode(strategy);
+                currentNode = getBestNode(strategy);
             }
-            if (currentService.connect()) {
+            if (currentNode.connect()) {
                 node = new ExecutionNode();
-                node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(currentService));
-                node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(currentService));
-                node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(currentService, this));
+                node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(currentNode));
+                node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(currentNode));
+                node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(currentNode, this));
 
             }
             

Added: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/Command.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/Command.java	                        (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/Command.java	2010-04-03 20:21:47 UTC (rev 32381)
@@ -0,0 +1,48 @@
+package org.drools.services.command;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Command implements Serializable {
+    
+    private int id;
+    
+    private CommandName name;    
+    
+    private List<Object> arguments;
+    
+    public Command(int id, CommandName name, List<Object> arguments) {
+        super();
+        this.id = id;
+        this.arguments = arguments;
+        this.name = name;
+    }
+    
+    
+    
+    public int getId() {
+        return id;
+    }
+
+
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+
+
+    public CommandName getName() {
+        return name;
+    }
+    public void setName(CommandName name) {
+        this.name = name;
+    }
+    public List<Object> getArguments() {
+        return arguments;
+    }
+    public void setArguments(List<Object> arguments) {
+        this.arguments = arguments;
+    }
+            
+}

Added: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/CommandName.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/CommandName.java	                        (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/CommandName.java	2010-04-03 20:21:47 UTC (rev 32381)
@@ -0,0 +1,79 @@
+package org.drools.services.command;
+
+
+public enum CommandName {   
+    OperationRequest,
+    OperationResponse,
+    
+    ClaimRequest,
+    ClaimResponse,
+    
+    StartRequest,
+    StartResponse,
+    
+    StopRequest,
+    StopResponse,
+    
+    ReleaseRequest,
+    ReleaseResponse,  
+    
+    SuspendRequest,
+    SuspendResponse, 
+    
+    ResumeRequest,
+    ResumeResponse, 
+    
+    SkipRequest,
+    SkipResponse,  
+    
+    DelegateRequest,
+    DelegateResponse,
+    
+    ForwardRequest,
+    ForwardResponse,
+    
+    CompleteRequest,
+    CompleteResponse,   
+    
+    FailRequest,
+    FailResponse,
+    
+    GetTaskRequest,
+    GetTaskResponse,
+    
+    AddTaskRequest,
+    AddTaskResponse,
+    
+    AddAttachmentRequest,
+    AddAttachmentResponse,    
+    DeleteAttachmentRequest,
+    DeleteAttachmentResponse,
+        
+    SetDocumentContentRequest,
+    SetDocumentContentResponse,
+    GetContentRequest,
+    GetContentResponse,
+    
+    AddCommentRequest,
+    AddCommentResponse,    
+    DeleteCommentRequest,    
+    DeleteCommentResponse,    
+    
+    QueryTasksOwned,    
+    QueryTasksAssignedAsBusinessAdministrator,
+    QueryTasksAssignedAsExcludedOwner,
+    QueryTasksAssignedAsPotentialOwner,
+    QueryTasksAssignedAsPotentialOwnerWithGroup,
+    QueryTasksAssignedAsPotentialOwnerByGroup,
+    QuerySubTasksAssignedAsPotentialOwner,
+    QueryGetSubTasksByParentTaskId,
+    QueryTasksAssignedAsRecipient,
+    QueryTasksAssignedAsTaskInitiator,
+    QueryTasksAssignedAsTaskStakeholder,    
+    QueryTaskSummaryResponse,
+    
+    RegisterForEventRequest,
+    EventTriggerResponse,
+    
+    RegisterClient
+}

Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/ClientGenericMessageReceiverImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/ClientGenericMessageReceiverImpl.java	2010-04-03 18:36:58 UTC (rev 32380)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/ClientGenericMessageReceiverImpl.java	2010-04-03 20:21:47 UTC (rev 32381)
@@ -7,10 +7,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.drools.SystemEventListener;
-import org.drools.task.service.Command;
+import org.drools.services.command.Command;
 
 
 
+
 import org.drools.services.generic.ClientGenericMessageReceiver;
 import org.drools.services.generic.GenericIoWriter;
 import org.drools.services.generic.GenericMessageHandler;

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-04-03 18:36:58 UTC (rev 32380)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/ExecutionNodeBaseTest.java	2010-04-03 20:21:47 UTC (rev 32381)
@@ -29,7 +29,6 @@
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.ExecutionResults;
 import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.services.RemoteConnection;
 import org.drools.services.generic.GenericConnection;
 import org.junit.Assert;
 import org.junit.Before;

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-04-03 18:36:58 UTC (rev 32380)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/RemoteExecutionNodeTest.java	2010-04-03 20:21:47 UTC (rev 32381)
@@ -89,9 +89,9 @@
         for(Iterator<GenericNodeConnector> iterator = connection.getNodeConnectors().iterator(); iterator.hasNext();){
             iterator.next().disconnect();
         }
+       
+        this.server.stop();
 
-         this.server.stop();
-
     }
 
     



More information about the jboss-svn-commits mailing list