[jboss-svn-commits] JBL Code SVN: r8431 - 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-12-20 06:40:51 -0500 (Wed, 20 Dec 2006)
New Revision: 8431

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
Log:
added UUID accessability

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java	2006-12-20 02:17:15 UTC (rev 8430)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java	2006-12-20 11:40:51 UTC (rev 8431)
@@ -77,6 +77,17 @@
     }
 
     /**
+     * @return A unique identifier for this items content node.
+     */
+    public String getUUID() {
+        try {
+            return this.getVersionContentNode().getUUID();
+        } catch (  RepositoryException e ) {            
+            throw new RulesRepositoryException(e);
+        }
+    }
+    
+    /**
      * This will return true if the current entity is actually a
      * historical version (which means is effectively read only).
      */
@@ -488,15 +499,11 @@
      */
     public void checkin(String comment) {
         try {
-            this.node.setProperty( LAST_MODIFIED_PROPERTY_NAME,
-                                   Calendar.getInstance() );
-            this.node.setProperty( CHECKIN_COMMENT,
-                                   comment );
+            this.node.setProperty( LAST_MODIFIED_PROPERTY_NAME, Calendar.getInstance() );
+            this.node.setProperty( CHECKIN_COMMENT, comment );
             VersionNumberGenerator gen = rulesRepository.versionNumberGenerator;
-            String nextVersion = gen.calculateNextVersion( getVersionNumber(),
-                                                           this );
-            this.node.setProperty( VERSION_NUMBER_PROPERTY_NAME,
-                                   nextVersion );
+            String nextVersion = gen.calculateNextVersion( getVersionNumber(), this );
+            this.node.setProperty( VERSION_NUMBER_PROPERTY_NAME,  nextVersion );
             this.node.getSession().save();
             this.node.checkin();
         } catch ( RepositoryException e ) {

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2006-12-20 02:17:15 UTC (rev 8430)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2006-12-20 11:40:51 UTC (rev 8431)
@@ -17,7 +17,7 @@
         return getRepo().loadDefaultPackage();
     }
     
-    public void testRuleItemCreation() throws Exception {
+    public void testAssetItemCreation() throws Exception {
                 
             Calendar now = Calendar.getInstance();
         
@@ -37,6 +37,7 @@
 
             assertEquals(packName, ruleItem1.getPackageName());
             
+            assertNotNull(ruleItem1.getUUID());
             
         //try constructing with node of wrong type
         try {
@@ -345,18 +346,13 @@
             ruleItem1.checkin( "version0" );
             assertTrue(ruleItem1.getPrecedingVersion() == null);
             
-            
-            
             ruleItem1.addCategory( "foo" );
             ruleItem1.updateContent( "test content" );
             ruleItem1.checkin( "boo" );
             
-            
             AssetItem predecessorRuleItem = (AssetItem) ruleItem1.getPrecedingVersion();
             assertNotNull(predecessorRuleItem);            
             
-            
-            
             ruleItem1.updateContent("new content");
             ruleItem1.updateContentURI( "foobar" );
             ruleItem1.checkin( "two changes" );
@@ -367,15 +363,10 @@
             CategoryItem cat = (CategoryItem) predecessorRuleItem.getCategories().get( 0 );
             assertEquals("foo", cat.getName());
             
-            
             assertEquals("test content", predecessorRuleItem.getContent());
-            
             assertEquals("descr", predecessorRuleItem.getDescription());
-            
             assertEquals("default", predecessorRuleItem.getPackageName());
             
-            
-            
             ruleItem1.updateContent("newer lhs");
             ruleItem1.checkin( "another" );