[jboss-svn-commits] JBL Code SVN: r32663 - in labs/jbossrules/trunk/drools-container/drools-spring/src: test/java/org/drools/container/spring/beans/persistence and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Apr 27 17:10:24 EDT 2010


Author: baunax
Date: 2010-04-27 17:10:23 -0400 (Tue, 27 Apr 2010)
New Revision: 32663

Modified:
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandService.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandServiceFactory.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java
Log:
JBRULES-2332 Drools JPA- Spring Transactions
	- renamed method of interface JPASingleSessionCommandService

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandService.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandService.java	2010-04-27 20:37:47 UTC (rev 32662)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandService.java	2010-04-27 21:10:23 UTC (rev 32663)
@@ -4,6 +4,6 @@
 
 
 public interface JPASingleSessionCommandService  {
-	public SingleSessionCommandService createNew();
-	public SingleSessionCommandService load(int sessionId);
+	public SingleSessionCommandService newStatefulKnowledgeSession();
+	public SingleSessionCommandService loadStatefulKnowledgeSession(int sessionId);
 }

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandServiceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandServiceFactory.java	2010-04-27 20:37:47 UTC (rev 32662)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/JPASingleSessionCommandServiceFactory.java	2010-04-27 21:10:23 UTC (rev 32663)
@@ -127,11 +127,11 @@
 		private EntityManagerFactory entityManagerFactory;
 		private PlatformTransactionManager transactionManager;
 
-		public SingleSessionCommandService createNew() {
+		public SingleSessionCommandService newStatefulKnowledgeSession() {
 			return new SpringSingleSessionCommandService(knowledgeBase, getSessionConfiguration(), getEnvironment());
 		}
 
-		public SingleSessionCommandService load(int sessionId) {
+		public SingleSessionCommandService loadStatefulKnowledgeSession(int sessionId) {
 			return new SpringSingleSessionCommandService(sessionId, knowledgeBase, getSessionConfiguration(),
 					getEnvironment());
 		}

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java	2010-04-27 20:37:47 UTC (rev 32662)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java	2010-04-27 21:10:23 UTC (rev 32663)
@@ -131,7 +131,7 @@
         JPASingleSessionCommandService jpaService = (JPASingleSessionCommandService) ctx.getBean("jpaSingleSessionCommandService");
         
         log.info("---> create new SingleSessionCommandService");
-        SingleSessionCommandService service = jpaService.createNew();
+        SingleSessionCommandService service = jpaService.newStatefulKnowledgeSession();
         
         int sessionId = service.getSessionId();
         log.info("---> created SingleSessionCommandService id: " + sessionId);
@@ -146,14 +146,14 @@
         assertNotNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
         assertNotNull( processInstance );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         CompleteWorkItemCommand completeWorkItemCommand = new CompleteWorkItemCommand();
         completeWorkItemCommand.setWorkItemId( workItem.getId() );
         service.execute( completeWorkItemCommand );
@@ -162,14 +162,14 @@
         assertNotNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
         assertNotNull( processInstance );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         completeWorkItemCommand = new CompleteWorkItemCommand();
         completeWorkItemCommand.setWorkItemId( workItem.getId() );
         service.execute( completeWorkItemCommand );
@@ -178,14 +178,14 @@
         assertNotNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
         assertNotNull( processInstance );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         completeWorkItemCommand = new CompleteWorkItemCommand();
         completeWorkItemCommand.setWorkItemId( workItem.getId() );
         service.execute( completeWorkItemCommand );
@@ -194,7 +194,7 @@
         assertNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
@@ -206,7 +206,7 @@
     public void testPersistenceWorkItemsUserTransaction() throws Exception {
         
         JPASingleSessionCommandService jpaService = (JPASingleSessionCommandService) ctx.getBean("jpaSingleSessionCommandService");
-        SingleSessionCommandService service = jpaService.createNew();
+        SingleSessionCommandService service = jpaService.newStatefulKnowledgeSession();
 
         int sessionId = service.getSessionId();
 
@@ -220,14 +220,14 @@
         assertNotNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
         assertNotNull( processInstance );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         CompleteWorkItemCommand completeWorkItemCommand = new CompleteWorkItemCommand();
         completeWorkItemCommand.setWorkItemId( workItem.getId() );
         service.execute( completeWorkItemCommand );
@@ -236,14 +236,14 @@
         assertNotNull( workItem );
         service.dispose();
 
-		service = jpaService.load(sessionId);
+		service = jpaService.loadStatefulKnowledgeSession(sessionId);
         getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
         assertNotNull( processInstance );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         completeWorkItemCommand = new CompleteWorkItemCommand();
         completeWorkItemCommand.setWorkItemId( workItem.getId() );
         service.execute( completeWorkItemCommand );
@@ -252,14 +252,14 @@
         assertNotNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
         assertNotNull( processInstance );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         completeWorkItemCommand = new CompleteWorkItemCommand();
         completeWorkItemCommand.setWorkItemId( workItem.getId() );
         service.execute( completeWorkItemCommand );
@@ -268,7 +268,7 @@
         assertNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );
@@ -369,7 +369,7 @@
     public void testPersistenceSubProcess() {
 
         JPASingleSessionCommandService jpaService = (JPASingleSessionCommandService) ctx.getBean("jpaSingleSessionCommandService");
-        SingleSessionCommandService service = jpaService.createNew();
+        SingleSessionCommandService service = jpaService.newStatefulKnowledgeSession();
 
         int sessionId = service.getSessionId();
 
@@ -384,7 +384,7 @@
         assertNotNull( workItem );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstanceId );
         processInstance = (RuleFlowProcessInstance) service.execute( getProcessInstanceCommand );
@@ -401,13 +401,13 @@
         assertNotNull( subProcessInstance );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         CompleteWorkItemCommand completeWorkItemCommand = new CompleteWorkItemCommand();
         completeWorkItemCommand.setWorkItemId( workItem.getId() );
         service.execute( completeWorkItemCommand );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( subProcessInstanceId );
         subProcessInstance = (RuleFlowProcessInstance) service.execute( getProcessInstanceCommand );
@@ -515,7 +515,7 @@
         JPASingleSessionCommandService jpaService = (JPASingleSessionCommandService) ctx.getBean("jpaSingleSessionCommandService");
         
         log.info("---> create new SingleSessionCommandService");
-        SingleSessionCommandService service = jpaService.createNew();
+        SingleSessionCommandService service = jpaService.newStatefulKnowledgeSession();
         
         int sessionId = service.getSessionId();
         log.info("---> created SingleSessionCommandService id: " + sessionId);
@@ -528,7 +528,7 @@
         service.dispose();
         log.info( "---> session disposed" );
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         log.info( "---> load session: " + sessionId);
         GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( procId );
@@ -538,7 +538,7 @@
         log.info( "---> session disposed" );
         service.dispose();
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         log.info( "---> load session: " + sessionId);
         Thread.sleep( 3000 );
         getProcessInstanceCommand = new GetProcessInstanceCommand();
@@ -600,7 +600,7 @@
     @Test
     public void testPersistenceTimer2() throws Exception {
     	JPASingleSessionCommandService jpaService = (JPASingleSessionCommandService) ctx.getBean("jpaSingleSessionCommandService");
-        SingleSessionCommandService service = jpaService.createNew();
+        SingleSessionCommandService service = jpaService.newStatefulKnowledgeSession();
 
         int sessionId = service.getSessionId();
         
@@ -611,7 +611,7 @@
 
         Thread.sleep( 2000 );
 
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = service.execute( getProcessInstanceCommand );

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java	2010-04-27 20:37:47 UTC (rev 32662)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java	2010-04-27 21:10:23 UTC (rev 32663)
@@ -81,7 +81,7 @@
         JPASingleSessionCommandService jpaService = (JPASingleSessionCommandService) ctx.getBean("jpaSingleSessionCommandService");
         
         log.info("---> create new SingleSessionCommandService");
-        SingleSessionCommandService service = jpaService.createNew();
+        SingleSessionCommandService service = jpaService.newStatefulKnowledgeSession();
         
         int sessionId = service.getSessionId();
         log.info("---> created SingleSessionCommandService id: " + sessionId);
@@ -109,7 +109,7 @@
         assertEquals(5, result.size());
         log.info("### Retrieving process instance ###");
         
-        service = jpaService.load(sessionId);
+        service = jpaService.loadStatefulKnowledgeSession(sessionId);
         GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
         getProcessInstanceCommand.setProcessInstanceId( processInstance.getId() );
         processInstance = (WorkflowProcessInstance) service.execute( getProcessInstanceCommand );



More information about the jboss-svn-commits mailing list