[jboss-svn-commits] JBL Code SVN: r9548 - in labs/jbossrules/trunk/drools-repository/src: main/java/org/drools/scm/jcr and 1 other directories.

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

Author: michael.neale at jboss.com
Date: 2007-02-16 02:24:18 -0500 (Fri, 16 Feb 2007)
New Revision: 9548

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java
Log:
JBRULES-640 fixed syncing

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-02-16 06:02:06 UTC (rev 9547)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-02-16 07:24:18 UTC (rev 9548)
@@ -564,10 +564,10 @@
             Calendar lastModified = Calendar.getInstance();
             rulePackageNode.setProperty(PackageItem.LAST_MODIFIED_PROPERTY_NAME, lastModified);
             
-            this.session.save();
+            PackageItem item = new PackageItem(this, rulePackageNode);
+            item.checkin( "Initial" );            
             
-            
-            return new PackageItem(this, rulePackageNode);
+            return item;
         } catch (ItemExistsException e) {
             throw new RulesRepositoryException("A package name must be unique.", e);
         } catch (RepositoryException e) {
@@ -748,8 +748,10 @@
             item.checkout();
             item.node.setProperty( AssetItem.PACKAGE_NAME_PROPERTY, newPackage );
             
-            item.checkin( explanation );            
+            item.checkin( explanation );   
+            sourcePkg.checkout();
             sourcePkg.checkin( explanation );
+            destPkg.checkout();
             destPkg.checkin( explanation );
             
         } catch ( RepositoryException e ) {

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java	2007-02-16 06:02:06 UTC (rev 9547)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java	2007-02-16 07:24:18 UTC (rev 9548)
@@ -129,15 +129,18 @@
             for ( Iterator assetIter = item.getAssets(); assetIter.hasNext(); ) {
                 AssetItem assetItem = (AssetItem) assetIter.next();
 
-                scmEntry = new DefaultScmEntry();
-                scmEntry.setPath( pkgNameAsPath );
-                scmEntry.setName( toFileName( assetItem ) );
-                scmEntry.setAuthor( assetItem.getPublisher() );
-                scmEntry.setDate( assetItem.getLastModified().getTime() );
-                scmEntry.setRevision( new Long( assetItem.getVersionNumber() ).longValue() );
-                scmEntry.setSize( 0 );
-                scmEntry.setType( ScmEntry.FILE );
-                entries.add( scmEntry );
+                if (!assetItem.getVersionNumber().equals( "" )) {
+                
+                    scmEntry = new DefaultScmEntry();
+                    scmEntry.setPath( pkgNameAsPath );
+                    scmEntry.setName( toFileName( assetItem ) );
+                    scmEntry.setAuthor( assetItem.getPublisher() );
+                    scmEntry.setDate( assetItem.getLastModified().getTime() );
+                    scmEntry.setRevision( new Long( assetItem.getVersionNumber() ).longValue() );
+                    scmEntry.setSize( 0 );
+                    scmEntry.setType( ScmEntry.FILE );
+                    entries.add( scmEntry );
+                }
             }
         }
 
@@ -352,7 +355,7 @@
 
             PackageItem item = ctx.repository.createPackage( toPackageName( root + "/" + this.path ),
                                                              "initial package" );
-            item.checkin( "save" );
+            //item.checkin( "save" );
         }
     }
 

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java	2007-02-16 06:02:06 UTC (rev 9547)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java	2007-02-16 07:24:18 UTC (rev 9548)
@@ -34,7 +34,7 @@
                       fact.toDirectoryName( "foo" ) );
     }
 
-    public void FIXME_testAddDirectories() throws Exception {
+    public void testAddDirectories() throws Exception {
         ScmActionFactory svn = new JcrActionFactory( RepositorySessionUtil.getRepository() );
 
         CompositeScmAction actions = new CompositeScmAction();