[jboss-svn-commits] JBL Code SVN: r9669 - in labs/jbossrules/trunk/drools-jbrms/src: test/java/org/drools/brms/server and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2007-02-21 02:41:44 -0500 (Wed, 21 Feb 2007)
New Revision: 9669

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-692 Automatically sets status to draft on checkin

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2007-02-21 07:41:07 UTC (rev 9668)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2007-02-21 07:41:44 UTC (rev 9669)
@@ -253,6 +253,7 @@
         
         repoAsset.updateDateEffective( dateToCalendar( meta.dateEffective ) );
         repoAsset.updateDateExpired( dateToCalendar( meta.dateExpired ) );        
+        repoAsset.updateState( StateItem.DRAFT_STATE_NAME );
         
         repoAsset.updateCategoryList( meta.categories );
         AssetContentFormatHandler handler = new AssetContentFormatHandler();
@@ -410,15 +411,11 @@
         if (!wholePackage) {
             AssetItem asset = repo.loadAssetByUUID( uuid );
             asset.updateState( newState );
-            repo.save();
         } else {
             PackageItem pkg = repo.loadPackageByUUID( uuid );
-            pkg.changeStatus(newState);
-            repo.save();
+            pkg.changeStatus(newState);            
         }
-        
-        
-        
+        repo.save();
     }
     
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-02-21 07:41:07 UTC (rev 9668)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-02-21 07:41:44 UTC (rev 9669)
@@ -281,6 +281,7 @@
           assertEquals("testCheckinCategory", asset2.metaData.categories[0]);
           assertEquals("testCheckinCategory2", asset2.metaData.categories[1]);
           assertEquals("testCheckinCategory/deeper", asset2.metaData.categories[2]);
+
           
   }
   
@@ -437,6 +438,10 @@
       asset = impl.loadRuleAsset( ruleUUID2 );
       assertEquals("testState2", asset.metaData.state);
       
+      impl.checkinVersion( asset );
+      asset = impl.loadRuleAsset( asset.uuid );
+      assertEquals(StateItem.DRAFT_STATE_NAME, asset.metaData.state);
+      
   }