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

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

Author: mark.proctor at jboss.com
Date: 2010-07-15 20:37:02 -0400 (Thu, 15 Jul 2010)
New Revision: 33928

Modified:
   labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java
Log:
JBRULES-2332 Drools JPA-Spring Transactions
-added comment, citing original author
JBRULES-2347 Drools Pipeline integration with Camel
-added assert equals xml check

Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java	2010-07-15 23:56:38 UTC (rev 33927)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java	2010-07-16 00:37:02 UTC (rev 33928)
@@ -163,7 +163,7 @@
         expectedXml += "    <facts/>\n";
         expectedXml += "</execution-results>\n";
 
-        //assertEquals(expectedXml, outXml);
+        assertXMLEqual(expectedXml, outXml);
 
         cmd = "<batch-execution lookup='ksession1'>\n";
         cmd += "   <get-object out-identifier='rider' fact-handle='" + handle + "'/>\n";

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java	2010-07-15 23:56:38 UTC (rev 33927)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java	2010-07-16 00:37:02 UTC (rev 33928)
@@ -52,6 +52,10 @@
         this.ptm.rollback( currentTransaction );
     }
 
+    /**
+     * Borrowed from Seam
+     * @author Michael Youngstrom
+     */
     public int getStatus() {
         if ( ptm == null ) {
             return TransactionManager.STATUS_NO_TRANSACTION;