[jboss-svn-commits] JBL Code SVN: r31535 - in labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src: test/java/org/drools/vms and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Feb 9 16:33:57 EST 2010


Author: salaboy21
Date: 2010-02-09 16:33:57 -0500 (Tue, 09 Feb 2010)
New Revision: 31535

Modified:
   labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBaseProviderGridClient.java
   labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBuilderProviderGridClient.java
   labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/ServiceManagerGridClient.java
   labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java
Log:
new nomeclature

Modified: labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBaseProviderGridClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBaseProviderGridClient.java	2010-02-09 20:21:34 UTC (rev 31534)
+++ labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBaseProviderGridClient.java	2010-02-09 21:33:57 UTC (rev 31535)
@@ -6,7 +6,8 @@
 
 import org.drools.KnowledgeBase;
 import org.drools.KnowledgeBaseConfiguration;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
+
 import org.drools.command.FinishedCommand;
 import org.drools.command.NewKnowledgeBaseCommand;
 import org.drools.command.SetVariableCommand;
@@ -16,7 +17,7 @@
 
 public class KnowledgeBaseProviderGridClient
     implements
-    KnowledgeBaseProvider {
+    KnowledgeBaseFactoryService {
     private ServiceManagerGridClient serviceManager;
     private String localId = "";
     public KnowledgeBaseProviderGridClient(ServiceManagerGridClient serviceManager) {
@@ -99,6 +100,6 @@
 
     public void setLocalId(String localId) {
         this.localId = localId;
-    }
-
+    } 
+ 
 }

Modified: labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBuilderProviderGridClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBuilderProviderGridClient.java	2010-02-09 20:21:34 UTC (rev 31534)
+++ labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/KnowledgeBuilderProviderGridClient.java	2010-02-09 21:33:57 UTC (rev 31535)
@@ -11,7 +11,8 @@
 import org.drools.builder.DecisionTableConfiguration;
 import org.drools.builder.KnowledgeBuilder;
 import org.drools.builder.KnowledgeBuilderConfiguration;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+
 import org.drools.command.FinishedCommand;
 import org.drools.command.SetVariableCommand;
 import org.drools.command.builder.NewKnowledgeBuilderCommand;
@@ -19,7 +20,7 @@
 
 public class KnowledgeBuilderProviderGridClient
     implements
-    KnowledgeBuilderProvider { 
+    KnowledgeBuilderFactoryService {
     private ServiceManagerGridClient serviceManager;
 
     public KnowledgeBuilderProviderGridClient(ServiceManagerGridClient serviceManager) {

Modified: labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/ServiceManagerGridClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/ServiceManagerGridClient.java	2010-02-09 20:21:34 UTC (rev 31534)
+++ labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/main/java/org/drools/vsm/grid/ServiceManagerGridClient.java	2010-02-09 21:33:57 UTC (rev 31535)
@@ -1,7 +1,6 @@
 package org.drools.vsm.grid;
 
 import java.rmi.RemoteException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
@@ -10,12 +9,12 @@
 import java.util.logging.Logger;
 
 import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
 import org.drools.agent.KnowledgeAgentProvider;
 import org.drools.builder.DecisionTableConfiguration;
 import org.drools.builder.KnowledgeBuilder;
 import org.drools.builder.KnowledgeBuilderConfiguration;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
 import org.drools.command.Command;
 import org.drools.command.FinishedCommand;
 import org.drools.command.KnowledgeContextResolveFromContextCommand;
@@ -114,14 +113,8 @@
                 }
 	}
 
-    public KnowledgeBuilderProvider getKnowledgeBuilderFactory() {
-        return new KnowledgeBuilderProviderGridClient( this );
-    }
+   
 
-    public KnowledgeBaseProvider getKnowledgeBaseFactory() {
-        return new KnowledgeBaseProviderGridClient( this );
-    }
-
     public KnowledgeAgentProvider getKnowledgeAgentFactory() {
         // TODO Auto-generated method stub
         return null;
@@ -249,8 +242,18 @@
     	return new HumanTaskServiceGridProviderImpl(this);
     }
 
-    public static class RemoveKnowledgeBuilderProvider implements KnowledgeBuilderProvider {
+    @Override
+    public KnowledgeBuilderFactoryService getKnowledgeBuilderFactoryService() {
+        return new KnowledgeBuilderProviderGridClient( this );
+    }
 
+    @Override
+    public KnowledgeBaseFactoryService getKnowledgeBaseFactoryService() {
+        return new KnowledgeBaseProviderGridClient( this );
+    }
+
+    public static class RemoveKnowledgeBuilderProvider implements KnowledgeBuilderFactoryService {
+
         public DecisionTableConfiguration newDecisionTableConfiguration() {
             // TODO Auto-generated method stub
             return null;

Modified: labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java	2010-02-09 20:21:34 UTC (rev 31534)
+++ labs/jbossrules/branches/salaboy_grid-rio2/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java	2010-02-09 21:33:57 UTC (rev 31535)
@@ -4,17 +4,15 @@
 
 import junit.framework.Assert;
 import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
 import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
 import org.drools.builder.ResourceType;
 import org.drools.command.runtime.rule.FireAllRulesCommand;
-import org.drools.impl.KnowledgeBaseProviderImpl;
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.ExecutionResults;
 import org.drools.runtime.StatefulKnowledgeSession;
 import org.drools.vsm.ServiceManager;
-import org.drools.vsm.grid.KnowledgeBaseGridClient;
 import org.drools.vsm.grid.KnowledgeBaseProviderGridClient;
 import org.drools.vsm.grid.ServiceManagerGridClient;
 import org.drools.vsm.grid.SessionService;
@@ -45,7 +43,7 @@
         str += "    System.out.println( \"hello2!!!\" ); \n";
         str += "end \n";
 
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
         KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
         kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
                       ResourceType.DRL );
@@ -54,7 +52,7 @@
             System.out.println( "Errors: " + kbuilder.getErrors() );
         }
 
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
         KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
 
         kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -83,7 +81,7 @@
         str += "    System.out.println( \"hello2!!!\" ); \n";
         str += "end \n";
 
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
         KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
         kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
                       ResourceType.DRL );
@@ -92,7 +90,7 @@
             System.out.println( "Errors: " + kbuilder.getErrors() );
         }
 
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
         KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
 
         kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -123,7 +121,7 @@
         str += "    System.out.println( \"hello4!!!\" ); \n";
         str += "end \n";
 
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
         KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
         kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
                       ResourceType.DRL );
@@ -132,7 +130,7 @@
             System.out.println( "Errors: " + kbuilder.getErrors() );
         }
 
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
         KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
 
         kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -165,7 +163,7 @@
         str += "    System.out.println( \"hello2!!!\" ); \n";
         str += "end \n";
 
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
         KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
         kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
                       ResourceType.DRL );
@@ -174,7 +172,7 @@
             System.out.println( "Errors: " + kbuilder.getErrors() );
         }
 
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
         KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
 
         kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -209,7 +207,7 @@
         str += "    System.out.println( \"hello2!!!\" ); \n";
         str += "end \n";
         ((ServiceManagerGridClient)this.client).setCurrentSessionService((SessionService)((ServiceManagerGridClient)this.client).getSessionServices().get(0));
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
         KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
         kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
                       ResourceType.DRL );
@@ -218,7 +216,7 @@
             System.out.println( "Errors: " + kbuilder.getErrors() );
         }
 
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
         KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
 
         kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -231,7 +229,7 @@
         ((ServiceManagerGridClient)this.client).setCurrentSessionService((SessionService)((ServiceManagerGridClient)this.client).getSessionServices().get(1));
         //If I do this here.. and I don't create a new Kbase. the context got nothing and cannot find the kbase in the new session service.. of course
 
-        KnowledgeBuilderProvider kbuilderFactory2 = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilderFactoryService kbuilderFactory2 = this.client.getKnowledgeBuilderFactoryService();
         KnowledgeBuilder kbuilder2 = kbuilderFactory2.newKnowledgeBuilder();
         kbuilder2.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
                       ResourceType.DRL );
@@ -240,7 +238,7 @@
             System.out.println( "Errors: " + kbuilder2.getErrors() );
         }
 
-        KnowledgeBaseProvider kbaseFactory2 = this.client.getKnowledgeBaseFactory();
+        KnowledgeBaseFactoryService kbaseFactory2 = this.client.getKnowledgeBaseFactoryService();
         KnowledgeBase kbase2 = kbaseFactory2.newKnowledgeBase();
 
         kbase2.addKnowledgePackages( kbuilder2.getKnowledgePackages() );
@@ -283,7 +281,7 @@
         str += "    System.out.println( \"hello2!!!\" ); \n";
         str += "end \n";
         ((ServiceManagerGridClient)this.client).setCurrentSessionService((SessionService)((ServiceManagerGridClient)this.client).getSessionServices().get(0));
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
         KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
         kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
                       ResourceType.DRL );
@@ -292,7 +290,7 @@
             System.out.println( "Errors: " + kbuilder.getErrors() );
         }
 
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
         ((KnowledgeBaseProviderGridClient)kbaseFactory).setLocalId("MyFirstKBase");
         KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
         



More information about the jboss-svn-commits mailing list