[jboss-svn-commits] JBL Code SVN: r29516 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/testframework and 4 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tirelli
Date: 2009-09-30 11:03:06 -0400 (Wed, 30 Sep 2009)
New Revision: 29516

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
   labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/StatefulKnowledgeSessionClient.java
Log:
JBRULES-2285: adding entry point ID access method to the drools-api

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java	2009-09-30 13:27:25 UTC (rev 29515)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java	2009-09-30 15:03:06 UTC (rev 29516)
@@ -33,6 +33,13 @@
 public interface WorkingMemoryEntryPoint {
 
     /**
+     * Returns the String Id of this entry point
+     * 
+     * @return
+     */
+    public String getEntryPointId();
+
+    /**
      * Inserts a new fact into this entry point
      * 
      * @param object 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java	2009-09-30 13:27:25 UTC (rev 29515)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java	2009-09-30 15:03:06 UTC (rev 29516)
@@ -597,4 +597,9 @@
         
     }
 
+    public String getEntryPointId() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java	2009-09-30 13:27:25 UTC (rev 29515)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java	2009-09-30 15:03:06 UTC (rev 29516)
@@ -51,6 +51,7 @@
 import org.drools.event.rule.AgendaEventListener;
 import org.drools.event.rule.WorkingMemoryEventListener;
 import org.drools.impl.StatefulKnowledgeSessionImpl;
+import org.drools.rule.EntryPoint;
 import org.drools.runtime.Environment;
 import org.drools.runtime.ExecutionResults;
 import org.drools.runtime.ExitPoint;
@@ -391,5 +392,9 @@
                                              arguments );
         return this.commandService.execute( cmd );
     }
+    
+    public String getEntryPointId() {
+        return EntryPoint.DEFAULT.getEntryPointId();
+    }
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2009-09-30 13:27:25 UTC (rev 29515)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2009-09-30 15:03:06 UTC (rev 29516)
@@ -337,8 +337,13 @@
 
         this.opCounter = new AtomicLong( 0 );
         this.lastIdleTimestamp = new AtomicLong( -1 );
+        
     }
 
+    public String getEntryPointId() {
+        return EntryPoint.DEFAULT.getEntryPointId();
+    }
+
     public static class GlobalsAdapter
         implements
         GlobalResolver {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java	2009-09-30 13:27:25 UTC (rev 29515)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java	2009-09-30 15:03:06 UTC (rev 29516)
@@ -539,6 +539,10 @@
         return new ObjectStoreWrapper( this.objectStore,
                                        filter,
                                        ObjectStoreWrapper.OBJECT );
+    }
+
+    public String getEntryPointId() {
+        return this.entryPoint.getEntryPointId();
     }    
 
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java	2009-09-30 13:27:25 UTC (rev 29515)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java	2009-09-30 15:03:06 UTC (rev 29516)
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -57,9 +56,9 @@
 import org.drools.reteoo.ReteooWorkingMemory;
 import org.drools.rule.EntryPoint;
 import org.drools.rule.Rule;
-import org.drools.runtime.ExecutionResults;
 import org.drools.runtime.CommandExecutor;
 import org.drools.runtime.Environment;
+import org.drools.runtime.ExecutionResults;
 import org.drools.runtime.ExitPoint;
 import org.drools.runtime.Globals;
 import org.drools.runtime.StatefulKnowledgeSession;
@@ -820,4 +819,8 @@
         }        
     }
 
+    public String getEntryPointId() {
+        return this.session.getEntryPointId();
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/StatefulKnowledgeSessionClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/StatefulKnowledgeSessionClient.java	2009-09-30 13:27:25 UTC (rev 29515)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/StatefulKnowledgeSessionClient.java	2009-09-30 15:03:06 UTC (rev 29516)
@@ -350,5 +350,10 @@
         // TODO Auto-generated method stub
 
     }
+    
+    public String getEntryPointId() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 
 }