[jboss-svn-commits] JBL Code SVN: r6851 - in labs/jbossrules/trunk/drools-repository/src: main/java/org/drools/repository test/java/org/drools/repository

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

Author: michael.neale at jboss.com
Date: 2006-10-17 07:24:51 -0400 (Tue, 17 Oct 2006)
New Revision: 6851

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java
Log:
small changes for default packaging

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	2006-10-17 11:24:02 UTC (rev 6850)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2006-10-17 11:24:51 UTC (rev 6851)
@@ -64,6 +64,8 @@
  */
 public class RulesRepository {
 
+    static final String DEFAULT_PACKAGE = "default";
+
     public static final String DROOLS_URI = "http://www.jboss.org/drools-repository/1.0";
 
     private static final Logger log = Logger.getLogger(RulesRepository.class);
@@ -530,10 +532,10 @@
     public RulePackageItem loadDefaultRulePackage() throws RulesRepositoryException {
         Node folderNode = this.getAreaNode( RULE_PACKAGE_AREA );
         try {
-            if (folderNode.hasNode( "default" )) {
-                return loadRulePackage( "default" );
+            if (folderNode.hasNode( DEFAULT_PACKAGE )) {
+                return loadRulePackage( DEFAULT_PACKAGE );
             } else {
-                return createRulePackage( "default", "" );
+                return createRulePackage( DEFAULT_PACKAGE, "" );
             }
         } catch ( RepositoryException e ) {
             throw new RulesRepositoryException(e);
@@ -703,7 +705,12 @@
      */
     public Iterator listPackages()  {
         Node folderNode = this.getAreaNode(RULE_PACKAGE_AREA);
+
         try {
+            if (!folderNode.hasNode(DEFAULT_PACKAGE)) {
+                createRulePackage( DEFAULT_PACKAGE, "" );
+                folderNode = this.getAreaNode( RULE_PACKAGE_AREA );
+            }            
             return new RulePackageIterator(this, folderNode.getNodes());
         } catch ( RepositoryException e ) {
             throw new RulesRepositoryException(e);

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java	2006-10-17 11:24:02 UTC (rev 6850)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java	2006-10-17 11:24:51 UTC (rev 6851)
@@ -19,9 +19,22 @@
     
     public void testDefaultPackage() throws Exception {
         RulesRepository repo = RepositorySession.getRepository();
+        
+        Iterator it = repo.listPackages();
+        boolean foundDefault = false;
+        while(it.hasNext()) {
+            RulePackageItem item = (RulePackageItem) it.next();
+            if (item.getName().equals( RulesRepository.DEFAULT_PACKAGE )) {
+                foundDefault = true;
+            }
+        }
+        assertTrue(foundDefault);
+        
         RulePackageItem def = repo.loadDefaultRulePackage();
         assertNotNull(def);
         assertEquals("default", def.getName());
+        
+        
     }
     
     public void testAddVersionARule() throws Exception {