[jboss-svn-commits] JBL Code SVN: r9900 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/ruleeditor and 2 other directories.

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

Author: michael.neale at jboss.com
Date: 2007-03-01 21:57:54 -0500 (Thu, 01 Mar 2007)
New Revision: 9900

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
   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-715

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java	2007-03-02 02:55:53 UTC (rev 9899)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java	2007-03-02 02:57:54 UTC (rev 9900)
@@ -16,7 +16,7 @@
     public String description = "";
     
     public String title = "";
-    public String state = "";
+    public String status = "";
 
     public Date lastModifiedDate;
     public String lastContributor = "";

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java	2007-03-02 02:55:53 UTC (rev 9899)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java	2007-03-02 02:57:54 UTC (rev 9900)
@@ -49,7 +49,7 @@
         this.checkin = checkin;
         this.uuid = asset.uuid;
         this.state = new HTML();
-        String status = metaData.state;
+        String status = metaData.status;
 
         FlexCellFormatter formatter = layout.getFlexCellFormatter();
         HorizontalPanel saveControls = new HorizontalPanel();

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-03-02 02:55:53 UTC (rev 9899)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2007-03-02 02:57:54 UTC (rev 9900)
@@ -220,7 +220,7 @@
     MetaData populateMetaData(VersionableItem item) {
         MetaData meta = new MetaData();
         
-        meta.state = (item.getState() != null) ? item.getState().getName() : "";
+        meta.status = (item.getState() != null) ? item.getState().getName() : "";
 
         getMetaDataMapper().copyToMetaData( meta, item );
         
@@ -277,14 +277,16 @@
         
         repoAsset.updateDateEffective( dateToCalendar( meta.dateEffective ) );
         repoAsset.updateDateExpired( dateToCalendar( meta.dateExpired ) );        
-        repoAsset.updateState( StateItem.DRAFT_STATE_NAME );
         
+        
         repoAsset.updateCategoryList( meta.categories );
         ContentHandler handler = ContentHandler.getHandler( repoAsset.getFormat() );//new AssetContentFormatHandler();
         handler.storeAssetContent( asset, repoAsset );
         
         repoAsset.checkin( meta.checkinComment );
                 
+//        repoAsset.updateState( StateItem.DRAFT_STATE_NAME );
+//        repo.save();
         
         return repoAsset.getUUID();
     }

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-03-02 02:55:53 UTC (rev 9899)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-03-02 02:57:54 UTC (rev 9900)
@@ -187,7 +187,7 @@
       rule.checkin( "changed state" );
       asset = impl.loadRuleAsset( uuid );
       
-      assertEquals("whee", asset.metaData.state);
+      assertEquals("whee", asset.metaData.status);
       assertEquals("changed state", asset.metaData.checkinComment);
       
       
@@ -427,12 +427,12 @@
       impl.createState( "testState" );
       
       RuleAsset asset = impl.loadRuleAsset( ruleUUID );
-      assertEquals(StateItem.DRAFT_STATE_NAME, asset.metaData.state);
+      assertEquals(StateItem.DRAFT_STATE_NAME, asset.metaData.status);
       impl.changeState( ruleUUID, "testState", false );
       asset = impl.loadRuleAsset( ruleUUID );
-      assertEquals("testState", asset.metaData.state);
+      assertEquals("testState", asset.metaData.status);
       asset = impl.loadRuleAsset( ruleUUID2 );
-      assertEquals( StateItem.DRAFT_STATE_NAME, asset.metaData.state);
+      assertEquals( StateItem.DRAFT_STATE_NAME, asset.metaData.status);
       
       
       
@@ -443,11 +443,11 @@
       assertEquals("testState2", pkg.state);
       
       asset = impl.loadRuleAsset( ruleUUID2 );
-      assertEquals("testState2", asset.metaData.state);
+      assertEquals("testState2", asset.metaData.status);
       
       impl.checkinVersion( asset );
       asset = impl.loadRuleAsset( asset.uuid );
-      assertEquals(StateItem.DRAFT_STATE_NAME, asset.metaData.state);
+      assertEquals("testState2", asset.metaData.status);
       
   }
   
@@ -507,6 +507,8 @@
       assertEquals("X", snaps[0].name);
       assertEquals("ya", snaps[0].comment);
       assertNotNull(snaps[0].uuid);
+      PackageConfigData confSnap = impl.loadPackageConfig( snaps[0].uuid );
+      assertEquals("testSnapshot", confSnap.name);
       
       
       impl.createPackageSnapshot( "testSnapshot", "Y", false, "we" );
@@ -517,6 +519,10 @@
       impl.copyOrRemoveSnapshot( "testSnapshot", "X", false, "Q" );
       assertEquals(3, impl.listSnapshots( "testSnapshot" ).length);
       
+      
+      
+      
+      
       try {
           impl.copyOrRemoveSnapshot( "testSnapshot", "X", false, "" );
           fail("should not be able to copy snapshot to empty detination");
@@ -525,7 +531,9 @@
       }
       
       impl.copyOrRemoveSnapshot( "testSnapshot", "X", true, null );
-      assertEquals(2, impl.listSnapshots( "testSnapshot" ).length);      
+      assertEquals(2, impl.listSnapshots( "testSnapshot" ).length);   
+      
+      
   }