svn commit: r534399 - in /lenya/trunk/src: java/org/apache/lenya/transaction/ modules/sourcerepository/java/src/org/apache/lenya/cms/repository/

Author: andreas
Date: Wed May  2 04:52:23 2007
New Revision: 534399

URL: http://svn.apache.org/viewvc?view=rev&rev=534399
Log:
Delete RCML files after deleting a node. This fixes bug 42299.

Modified:
    lenya/trunk/src/java/org/apache/lenya/transaction/UnitOfWorkImpl.java
    
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
    
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java

Modified: lenya/trunk/src/java/org/apache/lenya/transaction/UnitOfWorkImpl.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/transaction/UnitOfWorkImpl.java?view=diff&rev=534399&r1=534398&r2=534399
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/transaction/UnitOfWorkImpl.java 
(original)
+++ lenya/trunk/src/java/org/apache/lenya/transaction/UnitOfWorkImpl.java Wed 
May  2 04:52:23 2007
@@ -138,7 +138,7 @@
             for (int i = 0; i < objects.length; i++) {
                 if (objects[i] instanceof Transactionable) {
                     Transactionable t = (Transactionable) objects[i];
-                    if (t.isCheckedOutByUser()) {
+                    if (t.isCheckedOutByUser() && 
!this.removedObjects.contains(t)) {
                         t.checkin();
                     }
                     if (t.isLocked()) {

Modified: 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java?view=diff&rev=534399&r1=534398&r2=534399
==============================================================================
--- 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
 (original)
+++ 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
 Wed May  2 04:52:23 2007
@@ -84,6 +84,7 @@
     public void deleteTransactionable() throws RepositoryException {
         this.contentSource.deleteTransactionable();
         this.metaSource.deleteTransactionable();
+        getRcml().delete();
     }
 
     protected String getUserId() {

Modified: 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java?view=diff&rev=534399&r1=534398&r2=534399
==============================================================================
--- 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java
 (original)
+++ 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java
 Wed May  2 04:52:23 2007
@@ -37,7 +37,6 @@
 import org.apache.lenya.cms.rc.RCML;
 import org.apache.lenya.cms.rc.RCMLEntry;
 import org.apache.lenya.cms.rc.RevisionControlException;
-import org.apache.lenya.cms.rc.RevisionController;
 import org.apache.lenya.xml.DocumentHelper;
 import org.apache.xpath.XPathAPI;
 import org.w3c.dom.Document;
@@ -519,11 +518,12 @@
     }
 
     /**
-     * delete the rcml file and the directory if this one is empty
+     * Delete the revisions, the RCML source and the collection if the latter 
is empty.
      * @return boolean true, if the file was deleted
      */
     public boolean delete() {
         try {
+            deleteRevisions();
             SourceUtil.delete(getRcmlSourceUri(), this.manager);
             SourceUtil.deleteEmptyCollections(getRcmlSourceUri(), 
this.manager);
         } catch (Exception e) {