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

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

Author: michael.neale at jboss.com
Date: 2007-05-18 08:13:41 -0400 (Fri, 18 May 2007)
New Revision: 11940

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
Log:
JBRULES-858 drl import feature

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-05-18 08:42:11 UTC (rev 11939)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-05-18 12:13:41 UTC (rev 11940)
@@ -12,6 +12,7 @@
 import javax.jcr.ItemExistsException;
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
@@ -428,6 +429,21 @@
              throw new RulesRepositoryException(e);
        }
     }
+    
+    
+    /**
+     * Returns true if this package item contains an asset of the given name.
+     */
+    public boolean containsAsset(String name) {
+        Node content;
+        try {
+            content = getVersionContentNode();
+            return content.getNode( ASSET_FOLDER_NAME ).hasNode( name );
+        }         
+        catch ( RepositoryException e ) {
+            throw new RulesRepositoryException(e);
+        }
+    }
 
     /**
      * Nicely formats the information contained by the node that this object encapsulates    

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-05-18 08:42:11 UTC (rev 11939)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-05-18 12:13:41 UTC (rev 11940)
@@ -354,15 +354,13 @@
 
             return new PackageItem( this,
                                     rulePackageNode );
-        } catch ( Exception e ) {
+        } catch ( RepositoryException e ) {
             log.error( "Unable to load a rule package. ",
                        e );
-            if ( e instanceof RuntimeException ) {
-                throw (RuntimeException) e;
-            } else {
+
                 throw new RulesRepositoryException( "Unable to load a rule package. ",
                                                     e );
-            }
+            
         }
     }
 

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2007-05-18 08:42:11 UTC (rev 11939)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2007-05-18 12:13:41 UTC (rev 11940)
@@ -411,6 +411,10 @@
             ruleItem1.updateContent( "test lhs content" );
 
             
+            assertTrue(rulePackageItem1.containsAsset( "testGetRules" ));
+            assertFalse(rulePackageItem1.containsAsset( "XXXXYYYYZZZZ" ));
+            
+            
             List rules = iteratorToList(rulePackageItem1.getAssets());
             assertNotNull(rules);
             assertEquals(1, rules.size());