[jboss-svn-commits] JBL Code SVN: r25440 - in labs/jbossrules/trunk/drools-process/drools-process-enterprise/src: test/java/org/drools/persistence/session and 1 other directory.

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

Author: KrisVerlaenen
Date: 2009-02-26 11:48:47 -0500 (Thu, 26 Feb 2009)
New Revision: 25440

Modified:
   labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/session/SingleSessionCommandService.java
   labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java
Log:
JBRULES-1915: Improve process persistence usability
 - fixed errors introduced by Mark ;)

Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/session/SingleSessionCommandService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/session/SingleSessionCommandService.java	2009-02-26 16:20:01 UTC (rev 25439)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/session/SingleSessionCommandService.java	2009-02-26 16:48:47 UTC (rev 25440)
@@ -22,7 +22,6 @@
 import org.drools.persistence.processinstance.JPASignalManager;
 import org.drools.process.command.Command;
 import org.drools.process.command.CommandService;
-import org.drools.reteoo.ReteooStatefulSession;
 import org.drools.reteoo.ReteooWorkingMemory;
 import org.drools.runtime.Environment;
 import org.drools.runtime.EnvironmentName;
@@ -38,8 +37,6 @@
     private SessionInfo                 sessionInfo;
     private JPASessionMarshallingHelper marshallingHelper;
     private StatefulSession             session;
-
-    private KnowledgeBase               kbase;
     private StatefulKnowledgeSession    ksession;
     private Environment                 env;
 
@@ -147,16 +144,15 @@
             }
         }
 
-        this.session = ((KnowledgeBaseImpl) kbase).ruleBase.newStatefulSession( (SessionConfiguration) conf,
-                                                                                this.env );
-        
-        this.ksession = new StatefulKnowledgeSessionImpl( (ReteooWorkingMemory) session );
-        ((JPASignalManager) this.session.getSignalManager()).setCommandService( this );
-        
-        this.marshallingHelper = new JPASessionMarshallingHelper( this.ksession,
-                                                                  conf );
+        this.marshallingHelper = new JPASessionMarshallingHelper( this.sessionInfo,
+                                                                  kbase,
+                                                                  conf,
+                                                                  env );
 
         this.sessionInfo.setJPASessionMashallingHelper( this.marshallingHelper );        
+		this.ksession = this.marshallingHelper.getObject();
+		this.session = (StatefulSession) ((StatefulKnowledgeSessionImpl) ksession).session;
+        ((JPASignalManager) this.session.getSignalManager()).setCommandService( this );
 
         new Thread( new Runnable() {
             public void run() {

Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java	2009-02-26 16:20:01 UTC (rev 25439)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java	2009-02-26 16:48:47 UTC (rev 25440)
@@ -6,7 +6,6 @@
 import java.util.Properties;
 
 import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import javax.transaction.UserTransaction;
@@ -390,7 +389,7 @@
         ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
         processBuilder.buildProcess( process,
                                      null );
-        List list = new ArrayList<KnowledgePackage>();
+        List<KnowledgePackage> list = new ArrayList<KnowledgePackage>();
         list.add( new KnowledgePackageImp( packageBuilder.getPackage() ) );
         return list;
     }
@@ -562,7 +561,7 @@
         return packageBuilder.getPackage();
     }
 
-    public void FIXME_testPersistenceTimer() throws Exception {
+    public void testPersistenceTimer() throws Exception {
         Environment env = KnowledgeBaseFactory.newEnvironment();
         env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
                  emf );
@@ -581,7 +580,7 @@
         SessionConfiguration config = new SessionConfiguration( properties );
 
         KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
-        Collection<KnowledgePackage> kpkgs = getProcessWorkItems();
+        Collection<KnowledgePackage> kpkgs = getProcessTimer();
         kbase.addKnowledgePackages( kpkgs );
 
         SingleSessionCommandService service = new SingleSessionCommandService( kbase,
@@ -615,7 +614,7 @@
         assertNull( processInstance );
     }
 
-    private Package getProcessTimer() {
+    private List<KnowledgePackage> getProcessTimer() {
         RuleFlowProcess process = new RuleFlowProcess();
         process.setId( "org.drools.test.TestProcess" );
         process.setName( "TestProcess" );
@@ -660,10 +659,12 @@
         ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
         processBuilder.buildProcess( process,
                                      null );
-        return packageBuilder.getPackage();
+        List<KnowledgePackage> list = new ArrayList<KnowledgePackage>();
+        list.add( new KnowledgePackageImp( packageBuilder.getPackage() ) );
+        return list;
     }
 
-    public void FIXME_testPersistenceTimer2() throws Exception {
+    public void testPersistenceTimer2() throws Exception {
         Environment env = KnowledgeBaseFactory.newEnvironment();
         env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
                  emf );
@@ -682,7 +683,7 @@
         SessionConfiguration config = new SessionConfiguration( properties );
 
         KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
-        Collection<KnowledgePackage> kpkgs = getProcessWorkItems();
+        Collection<KnowledgePackage> kpkgs = getProcessTimer2();
         kbase.addKnowledgePackages( kpkgs );
 
         SingleSessionCommandService service = new SingleSessionCommandService( kbase,
@@ -706,7 +707,7 @@
         assertNull( processInstance );
     }
 
-    private Package getProcessTimer2() {
+    private List<KnowledgePackage> getProcessTimer2() {
         RuleFlowProcess process = new RuleFlowProcess();
         process.setId( "org.drools.test.TestProcess" );
         process.setName( "TestProcess" );
@@ -751,7 +752,9 @@
         ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
         processBuilder.buildProcess( process,
                                      null );
-        return packageBuilder.getPackage();
+        List<KnowledgePackage> list = new ArrayList<KnowledgePackage>();
+        list.add( new KnowledgePackageImp( packageBuilder.getPackage() ) );
+        return list;
     }
 
 }