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

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

Author: Rikkola
Date: 2009-06-18 09:58:38 -0400 (Thu, 18 Jun 2009)
New Revision: 27011

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
Log:
GUVNOR-361 : Unarchiving packages doesn't unarchive their configuration

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2009-06-18 13:58:12 UTC (rev 27010)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2009-06-18 13:58:38 UTC (rev 27011)
@@ -857,8 +857,10 @@
         if ( data.archived ) {
             for ( Iterator<AssetItem> iter = item.getAssets(); iter.hasNext(); ) {
                 AssetItem assetItem = iter.next();
-                assetItem.archiveItem( true );
-                assetItem.checkin( data.description );
+                if ( !assetItem.isArchived() ) {
+                    assetItem.archiveItem( true );
+                    assetItem.checkin( data.description );
+                }
             }
         } else if ( unarchived ) {
             for ( Iterator<AssetItem> iter = item.getAssets(); iter.hasNext(); ) {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java	2009-06-18 13:58:12 UTC (rev 27010)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java	2009-06-18 13:58:38 UTC (rev 27011)
@@ -583,12 +583,21 @@
         PackageConfigData data = impl.loadPackageConfig( uuid );
         PackageItem it = impl.repository.loadPackageByUUID( uuid );
         data.archived = true;
-
+        
+        AssetItem rule1 = it.addAsset("rule_1", "");
+        rule1.updateFormat(AssetFormats.DRL);
+        rule1
+                .updateContent("rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end");
+        rule1.archiveItem( true );
+        rule1.checkin("");
+        impl.repository.save();
+        
         impl.savePackage( data );
         data = impl.loadPackageConfig( uuid );
         it = impl.repository.loadPackage( data.name );
         assertTrue( data.archived );
         assertTrue( it.loadAsset( "drools" ).isArchived() );
+        assertTrue( it.loadAsset( "rule_1" ).isArchived() );
 
         data.archived = false;
 
@@ -597,6 +606,7 @@
         it = impl.repository.loadPackage( data.name );
         assertFalse( data.archived );
         assertFalse( it.loadAsset( "drools" ).isArchived() );
+        assertTrue( it.loadAsset( "rule_1" ).isArchived() );
 
         data.archived = true;
 
@@ -605,6 +615,7 @@
         it = impl.repository.loadPackage( data.name );
         assertTrue( data.archived );
         assertTrue( it.loadAsset( "drools" ).isArchived() );
+        assertTrue( it.loadAsset( "rule_1" ).isArchived() );
 
     }