AVM DAO refactor

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/admin/patch/impl/AVMGuidPatch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,8 +29,9 @@ import java.util.List;
 
 import org.alfresco.i18n.I18NUtil;
 import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.avm.AVMNode;
-import org.alfresco.repo.avm.AVMNodeDAO;
+import org.alfresco.repo.domain.avm.AVMNodeDAO;
+import org.alfresco.repo.domain.avm.AVMNodeEntity;
+import org.alfresco.repo.domain.patch.PatchDAO;
 import org.alfresco.util.GUID;
 
 /**
@@ -40,6 +41,7 @@ import org.alfresco.util.GUID;
 public class AVMGuidPatch extends AbstractPatch
 {
     private AVMNodeDAO fAVMNodeDAO;
+    private PatchDAO patchDAO;
     
     private static final String MSG_SUCCESS = "patch.AVMGuidPatch.result";
     
@@ -52,6 +54,11 @@ public class AVMGuidPatch extends AbstractPatch
         fAVMNodeDAO = dao;
     }
     
+    public void setPatchDao(PatchDAO dao)
+    {
+        patchDAO = dao;
+    }
+    
     /* (non-Javadoc)
      * @see org.alfresco.repo.admin.patch.AbstractPatch#applyInternal()
      */
@@ -60,16 +67,17 @@ public class AVMGuidPatch extends AbstractPatch
     {
         while (true)
         {
-            List<AVMNode> batch = fAVMNodeDAO.getEmptyGUIDS(200);
-            for (AVMNode node : batch)
+            List<AVMNodeEntity> batch = patchDAO.getEmptyGUIDS(200);
+            for (AVMNodeEntity nodeEntity : batch)
             {
-                node.setGuid(GUID.generate());
+                nodeEntity.setGuid(GUID.generate());
+                
+                fAVMNodeDAO.updateNode(nodeEntity);
             }
             if (batch.size() == 0)
             {
                 break;
             }
-            fAVMNodeDAO.flush();
         }
         
         return I18NUtil.getMessage(MSG_SUCCESS);

source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,9 +29,9 @@ import java.util.List;
 
 import org.alfresco.i18n.I18NUtil;
 import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.avm.AVMNodeDAO;
-import org.alfresco.repo.avm.LayeredDirectoryNode;
-import org.alfresco.repo.avm.LayeredFileNode;
+import org.alfresco.repo.domain.avm.AVMNodeDAO;
+import org.alfresco.repo.domain.avm.AVMNodeEntity;
+import org.alfresco.repo.domain.patch.PatchDAO;
 
 /**
  * Patch for changes to Layered Node path traversal.
@@ -40,6 +40,7 @@ import org.alfresco.repo.avm.LayeredFileNode;
 public class AVMLayeredSnapshotPatch extends AbstractPatch
 {
     private AVMNodeDAO fAVMNodeDAO;
+    private PatchDAO patchDAO;
     
     private static final String MSG_SUCCESS = "patch.AVMLayeredSnapshot.result";
     
@@ -47,9 +48,14 @@ public class AVMLayeredSnapshotPatch extends AbstractPatch
     {
     }
     
-    public void setAvmNodeDAO(AVMNodeDAO dao)
+    public void setAvmNodeDao(AVMNodeDAO dao)
     {
-        fAVMNodeDAO = dao;   
+        fAVMNodeDAO = dao;
+    }
+    
+    public void setPatchDao(PatchDAO dao)
+    {
+        patchDAO = dao;
     }
     
     /* (non-Javadoc)
@@ -60,29 +66,31 @@ public class AVMLayeredSnapshotPatch extends AbstractPatch
     {
         while (true)
         {
-            List<LayeredDirectoryNode> batch = fAVMNodeDAO.getNullVersionLayeredDirectories(200);
-            for (LayeredDirectoryNode node : batch)
+            List<AVMNodeEntity> batch = patchDAO.getNullVersionLayeredDirectories(200);
+            for (AVMNodeEntity nodeEntity : batch)
             {
-                node.setIndirectionVersion(-1);
+                nodeEntity.setIndirectionVersion(-1);
+                
+                fAVMNodeDAO.updateNode(nodeEntity);
             }
             if (batch.size() == 0)
             {
                 break;
             }
-            fAVMNodeDAO.flush();
         }
         while (true)
         {
-            List<LayeredFileNode> batch = fAVMNodeDAO.getNullVersionLayeredFiles(200);
-            for (LayeredFileNode node : batch)
+            List<AVMNodeEntity> batch = patchDAO.getNullVersionLayeredFiles(200);
+            for (AVMNodeEntity nodeEntity : batch)
             {
-                node.setIndirectionVersion(-1);
+                nodeEntity.setIndirectionVersion(-1);
+                
+                fAVMNodeDAO.updateNode(nodeEntity);
             }
             if (batch.size() == 0)
             {
                 break;
             }
-            fAVMNodeDAO.flush();
         }
         return I18NUtil.getMessage(MSG_SUCCESS);
     }

source/java/org/alfresco/repo/admin/patch/impl/AVMPermissionsPatch.java

@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing
- */
-package org.alfresco.repo.admin.patch.impl;
-
-import java.util.Map;
-
-import org.alfresco.i18n.I18NUtil;
-import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.domain.AccessControlListDAO;
-import org.alfresco.repo.domain.hibernate.AclDaoComponentImpl;
-import org.alfresco.repo.security.permissions.ACLType;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-
-/**
- * Migrate permissions from the OLD format to defining, shared and layered
- */
-public class AVMPermissionsPatch extends AbstractPatch
-{
-
-    private static final String MSG_SUCCESS = "patch.updateAvmPermissions.result";
-
-    private AccessControlListDAO accessControlListDao;
-
-    private AclDaoComponentImpl aclDaoComponent;
-
-    @Override
-    protected String applyInternal() throws Exception
-    {
-        Thread progressThread = null;
-        if (aclDaoComponent.supportsProgressTracking())
-        {
-            progressThread = new Thread(new ProgressWatcher(), "WCMPactchProgressWatcher");
-            progressThread.start();
-        }
-
-        Map<ACLType, Integer> summary = this.accessControlListDao.patchAcls();
-
-        if (progressThread != null)
-        {
-            progressThread.interrupt();
-            progressThread.join();
-        }
-
-        // build the result message
-        String msg = I18NUtil.getMessage(AVMPermissionsPatch.MSG_SUCCESS, summary.get(ACLType.DEFINING), summary
-                .get(ACLType.LAYERED));
-        // done
-        return msg;
-    }
-
-    public void setAccessControlListDao(AccessControlListDAO accessControlListDao)
-    {
-        this.accessControlListDao = accessControlListDao;
-    }
-
-    public void setAclDaoComponent(AclDaoComponentImpl aclDaoComponent)
-    {
-        this.aclDaoComponent = aclDaoComponent;
-    }
-
-    private class ProgressWatcher implements Runnable
-    {
-        private boolean running = true;
-
-        Long toDo;
-
-        Long max;
-
-        public void run()
-        {
-            while (this.running)
-            {
-                try
-                {
-                    Thread.sleep(60000);
-                }
-                catch (InterruptedException e)
-                {
-                    this.running = false;
-                }
-
-                if (this.running)
-                {
-                    RetryingTransactionHelper txHelper = AVMPermissionsPatch.this.transactionService
-                            .getRetryingTransactionHelper();
-                    txHelper.setMaxRetries(1);
-                    Long done = txHelper.doInTransaction(new RetryingTransactionCallback<Long>()
-                    {
-
-                        public Long execute() throws Throwable
-                        {
-                            if (ProgressWatcher.this.toDo == null)
-                            {
-                                ProgressWatcher.this.toDo = AVMPermissionsPatch.this.aclDaoComponent
-                                        .getAVMHeadNodeCount();
-                                ProgressWatcher.this.max = AVMPermissionsPatch.this.aclDaoComponent.getMaxAclId();
-                            }
-                            return AVMPermissionsPatch.this.aclDaoComponent
-                                    .getAVMNodeCountWithNewACLS(ProgressWatcher.this.max);
-                        }
-                    }, true, true);
-
-                    reportProgress(this.toDo, done);
-                }
-            }
-        }
-
-    }
-
-}

source/java/org/alfresco/repo/admin/patch/impl/MoveWCMToGroupBasedPermissionsPatch.java

@@ -115,13 +115,6 @@ public class MoveWCMToGroupBasedPermissionsPatch extends AbstractPatch
     @Override
     protected String applyInternal() throws Exception
     {
-        Thread progressThread = null;
-        if (this.aclDaoComponent.supportsProgressTracking())
-        {
-            progressThread = new Thread(new ProgressWatcher(), "WCMPactchProgressWatcher");
-            progressThread.start();
-        }
-
         List<AVMStoreDescriptor> stores = this.avmService.getStores();
         for (AVMStoreDescriptor store : stores)
         {
@@ -159,12 +152,6 @@ public class MoveWCMToGroupBasedPermissionsPatch extends AbstractPatch
             }
         }
 
-        if (progressThread != null)
-        {
-            progressThread.interrupt();
-            progressThread.join();
-        }
-
         // build the result message
         String msg = I18NUtil.getMessage(MoveWCMToGroupBasedPermissionsPatch.MSG_SUCCESS);
         // done
@@ -452,58 +439,4 @@ public class MoveWCMToGroupBasedPermissionsPatch extends AbstractPatch
         }
         return name.substring(0, index);
     }
-
-    private class ProgressWatcher implements Runnable
-    {
-        private boolean running = true;
-
-        Long toDo;
-
-        Long max;
-
-        ProgressWatcher()
-        {
-        }
-
-        public void run()
-        {
-            while (this.running)
-            {
-                try
-                {
-                    Thread.sleep(60000);
-                }
-                catch (InterruptedException e)
-                {
-                    this.running = false;
-                }
-
-                if (this.running)
-                {
-                    RetryingTransactionHelper txHelper = MoveWCMToGroupBasedPermissionsPatch.this.transactionService
-                            .getRetryingTransactionHelper();
-                    txHelper.setMaxRetries(1);
-                    Long done = txHelper.doInTransaction(new RetryingTransactionCallback<Long>()
-                    {
-
-                        public Long execute() throws Throwable
-                        {
-                            if (ProgressWatcher.this.toDo == null)
-                            {
-                                ProgressWatcher.this.toDo = MoveWCMToGroupBasedPermissionsPatch.this.aclDaoComponent
-                                        .getAVMHeadNodeCount();
-                                ProgressWatcher.this.max = MoveWCMToGroupBasedPermissionsPatch.this.aclDaoComponent
-                                        .getMaxAclId();
-                            }
-                            return MoveWCMToGroupBasedPermissionsPatch.this.aclDaoComponent
-                                    .getAVMNodeCountWithNewACLS(org.alfresco.repo.admin.patch.impl.MoveWCMToGroupBasedPermissionsPatch.ProgressWatcher.this.max);
-                        }
-                    }, true, true);
-
-                    reportProgress(this.toDo, done);
-                }
-            }
-        }
-
-    }
 }

source/java/org/alfresco/repo/admin/patch/impl/WCMPermissionPatch.java

@@ -1,339 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.repo.admin.patch.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.i18n.I18NUtil;
-import org.alfresco.model.WCMAppModel;
-import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.repo.avm.AVMRepository;
-import org.alfresco.repo.domain.PropertyValue;
-import org.alfresco.repo.domain.hibernate.AclDaoComponentImpl;
-import org.alfresco.repo.search.AVMSnapShotTriggeredIndexingMethodInterceptor;
-import org.alfresco.repo.search.AVMSnapShotTriggeredIndexingMethodInterceptor.StoreType;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
-import org.alfresco.service.cmr.avm.AVMService;
-import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
-import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.PermissionService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.service.namespace.RegexQNamePattern;
-
-/**
- * Remove ACLs on all but staging area stores On staging area stores, set ACls according to the users and roles as set
- * on the web site Note: runs as the system user
- * 
- * @author andyh
- */
-public class WCMPermissionPatch extends AbstractPatch
-{
-    private static final String MSG_SUCCESS = "patch.wcmPermissionPatch.result";
-
-    AVMSnapShotTriggeredIndexingMethodInterceptor avmSnapShotTriggeredIndexingMethodInterceptor;
-
-    AVMService avmService;
-
-    PermissionService permissionService;
-
-    AclDaoComponentImpl aclDaoComponent;
-
-    public void setAvmService(AVMService avmService)
-    {
-        this.avmService = avmService;
-    }
-
-    public void setAvmSnapShotTriggeredIndexingMethodInterceptor(
-            AVMSnapShotTriggeredIndexingMethodInterceptor avmSnapShotTriggeredIndexingMethodInterceptor)
-    {
-        this.avmSnapShotTriggeredIndexingMethodInterceptor = avmSnapShotTriggeredIndexingMethodInterceptor;
-    }
-
-    public void setPermissionService(PermissionService permissionService)
-    {
-        this.permissionService = permissionService;
-    }
-
-    public void setAclDaoComponent(AclDaoComponentImpl aclDaoComponent)
-    {
-        this.aclDaoComponent = aclDaoComponent;
-    }
-
-    @Override
-    protected String applyInternal() throws Exception
-    {
-        Thread progressThread = null;
-        if (this.aclDaoComponent.supportsProgressTracking())
-        {
-            progressThread = new Thread(new ProgressWatcher(), "WCMPactchProgressWatcher");
-            progressThread.start();
-        }
-
-        List<AVMStoreDescriptor> stores = this.avmService.getStores();
-        for (AVMStoreDescriptor store : stores)
-        {
-            Map<QName, PropertyValue> storeProperties = this.avmService.getStoreProperties(store.getName());
-
-            switch (StoreType.getStoreType(store.getName(), store, storeProperties))
-            {
-            /* Set permissions in staging */
-            case STAGING:
-                setStagingAreaPermissions(store);
-                setStagingAreaMasks(store);
-                // TODO: mark read only
-                break;
-            /* Clear permissions */
-            case AUTHOR:
-            case AUTHOR_PREVIEW:
-            case AUTHOR_WORKFLOW:
-            case AUTHOR_WORKFLOW_PREVIEW:
-                // TODO: add app access control
-                clearPermissions(store);
-                setSandBoxMasks(store);
-                break;
-            case STAGING_PREVIEW:
-                clearPermissions(store);
-                setStagingAreaMasks(store);
-                // TODO: mark read only
-                break;
-            case WORKFLOW:
-            case WORKFLOW_PREVIEW:
-                clearPermissions(store);
-                break;
-            /* non WCM stores - nothing to do */
-            case UNKNOWN:
-            default:
-            }
-        }
-
-        if (progressThread != null)
-        {
-            progressThread.interrupt();
-            progressThread.join();
-        }
-
-        // build the result message
-        String msg = I18NUtil.getMessage(WCMPermissionPatch.MSG_SUCCESS);
-        // done
-        return msg;
-    }
-
-    private void clearPermissions(AVMStoreDescriptor store)
-    {
-        AVMNodeDescriptor www = this.avmService.lookup(-1, store.getName() + ":/www");
-        if (www.isLayeredDirectory() && www.isPrimary())
-        {
-            // throw away any acl
-            AVMRepository.GetInstance().setACL(store.getName() + ":/www", null);
-            // build the default layer acl
-            this.avmService.retargetLayeredDirectory(store.getName() + ":/www", www.getIndirection());
-        }
-    }
-
-    private void setStagingAreaPermissions(AVMStoreDescriptor store)
-    {
-        QName propQName = QName.createQName(null, ".web_project.noderef");
-
-        NodeRef dirRef = AVMNodeConverter.ToNodeRef(-1, store.getName() + ":/www");
-        this.permissionService.setPermission(dirRef, PermissionService.ALL_AUTHORITIES, PermissionService.READ, true);
-
-        PropertyValue pValue = this.avmService.getStoreProperty(store.getName(), propQName);
-
-        if (pValue != null)
-        {
-            NodeRef webProjectNodeRef = (NodeRef) pValue.getValue(DataTypeDefinition.NODE_REF);
-
-            // Apply sepcific user permissions as set on the web project
-            List<ChildAssociationRef> userInfoRefs = this.nodeService.getChildAssocs(webProjectNodeRef,
-                    WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
-            for (ChildAssociationRef ref : userInfoRefs)
-            {
-                NodeRef userInfoRef = ref.getChildRef();
-                String username = (String) this.nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERNAME);
-                String userrole = (String) this.nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERROLE);
-
-                this.permissionService.setPermission(dirRef, username, userrole, true);
-            }
-        }
-    }
-
-    private void setStagingAreaMasks(AVMStoreDescriptor store)
-    {
-        NodeRef dirRef = AVMNodeConverter.ToNodeRef(-1, store.getName() + ":/www");
-        this.permissionService.setPermission(dirRef.getStoreRef(), PermissionService.ALL_AUTHORITIES,
-                PermissionService.READ, true);
-
-        QName propQName = QName.createQName(null, ".web_project.noderef");
-
-        PropertyValue pValue = this.avmService.getStoreProperty(store.getName(), propQName);
-
-        if (pValue != null)
-        {
-            NodeRef webProjectNodeRef = (NodeRef) pValue.getValue(DataTypeDefinition.NODE_REF);
-
-            // Apply sepcific user permissions as set on the web project
-            List<ChildAssociationRef> userInfoRefs = this.nodeService.getChildAssocs(webProjectNodeRef,
-                    WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
-            for (ChildAssociationRef ref : userInfoRefs)
-            {
-                NodeRef userInfoRef = ref.getChildRef();
-                String username = (String) this.nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERNAME);
-                String userrole = (String) this.nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERROLE);
-
-                if (userrole.equals("ContentManager"))
-                {
-                    this.permissionService.setPermission(dirRef.getStoreRef(), username,
-                            PermissionService.CHANGE_PERMISSIONS, true);
-                    this.permissionService.setPermission(dirRef.getStoreRef(), username,
-                            PermissionService.READ_PERMISSIONS, true);
-                }
-            }
-        }
-
-    }
-
-    private void setSandBoxMasks(AVMStoreDescriptor sandBoxStore)
-    {
-        // get the settings from the staging store ...
-
-        String owner = extractOwner(sandBoxStore.getName());
-        String stagingAreaName = extractStagingAreaName(sandBoxStore.getName());
-
-        QName propQName = QName.createQName(null, ".web_project.noderef");
-
-        NodeRef dirRef = AVMNodeConverter.ToNodeRef(-1, sandBoxStore.getName() + ":/www");
-
-        this.avmService.getStoreProperties(stagingAreaName);
-        PropertyValue pValue = this.avmService.getStoreProperty(stagingAreaName, propQName);
-
-        this.permissionService.setPermission(dirRef.getStoreRef(), PermissionService.ALL_AUTHORITIES,
-                PermissionService.READ, true);
-
-        if (pValue != null)
-        {
-            NodeRef webProjectNodeRef = (NodeRef) pValue.getValue(DataTypeDefinition.NODE_REF);
-
-            // Apply sepcific user permissions as set on the web project
-            List<ChildAssociationRef> userInfoRefs = this.nodeService.getChildAssocs(webProjectNodeRef,
-                    WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
-            for (ChildAssociationRef ref : userInfoRefs)
-            {
-                NodeRef userInfoRef = ref.getChildRef();
-                String username = (String) this.nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERNAME);
-                String userrole = (String) this.nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERROLE);
-
-                if (username.equals(owner))
-                {
-                    this.permissionService.setPermission(dirRef.getStoreRef(), username,
-                            PermissionService.ALL_PERMISSIONS, true);
-                }
-                else if (userrole.equals("ContentManager"))
-                {
-                    this.permissionService.setPermission(dirRef.getStoreRef(), username, userrole, true);
-                }
-            }
-        }
-    }
-
-    private String extractOwner(String name)
-    {
-        int start = name.indexOf("--");
-        if (start == -1)
-        {
-            throw new UnsupportedOperationException(name);
-        }
-        int end = name.indexOf("--", start + 1);
-        if (end == -1)
-        {
-            return name.substring(start + 2);
-        }
-        return name.substring(start + 2, end);
-    }
-
-    private String extractStagingAreaName(String name)
-    {
-        int index = name.indexOf("--");
-        if (index == -1)
-        {
-            throw new UnsupportedOperationException(name);
-        }
-        return name.substring(0, index);
-    }
-
-    private class ProgressWatcher implements Runnable
-    {
-        private boolean running = true;
-
-        Long toDo;
-
-        Long max;
-
-        public void run()
-        {
-            while (this.running)
-            {
-                try
-                {
-                    Thread.sleep(60000);
-                }
-                catch (InterruptedException e)
-                {
-                    this.running = false;
-                }
-
-                if (this.running)
-                {
-                    RetryingTransactionHelper txHelper = WCMPermissionPatch.this.transactionService
-                            .getRetryingTransactionHelper();
-                    txHelper.setMaxRetries(1);
-                    Long done = txHelper.doInTransaction(new RetryingTransactionCallback<Long>()
-                    {
-
-                        public Long execute() throws Throwable
-                        {
-                            if (ProgressWatcher.this.toDo == null)
-                            {
-                                ProgressWatcher.this.toDo = WCMPermissionPatch.this.aclDaoComponent
-                                        .getAVMHeadNodeCount();
-                                ProgressWatcher.this.max = WCMPermissionPatch.this.aclDaoComponent.getMaxAclId();
-                            }
-                            return WCMPermissionPatch.this.aclDaoComponent
-                                    .getAVMNodeCountWithNewACLS(ProgressWatcher.this.max);
-                        }
-                    }, true, true);
-
-                    reportProgress(this.toDo, done);
-                }
-            }
-        }
-
-    }
-}