Merged DEV/SWIFT to HEAD

25960: RepoBM: improve configurability
          - add option to configure base folder path
          - enable params (base urls, threads, base folder path, ...) to be configured via ant build.properties
   25961: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24568: WebDAV - use fileInfo props (instead of nodeRef + getProp(s)) - resolve conflict
      24727: SPP/WebDAV - compile fix (follow-on to r24568)
      24855: BM - WebDAV - fix litmus -> locks -> 7. discover FAIL (fallout from r24568)
             + ran litmus 0.12.1
   25963: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24784: Log stack trace when reporting exception
   25966: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24725: BM - tweak validate (to use read-only txn)
   25968: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24736: BM - getChildByName optimisation (add reverse-lookup for parentAssocs)
   25992: RepoBM: add TPS
          - extend default ant-jmeter report to show approx/rounded test Time & TPS (note: not done for detailed report)
          - comment out detailed report
          - also expose "duration" param in ant build.xml / build.properties
   26035: RepoBM: ALF-6796 - fix perf of report generation (switch from xalan to saxon)
          - also do not fail on error
   26042: RepoBM: update readme (for ALF-6796) + add zip target
   26045: (RECORD ONLY) Merged DEV/BM to DEV/SWIFT (RECORD ONLY) - already resolved for V3.4 & SWIFT
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23613: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
              23601: ALF-5447: It's impossible to save the MS Office 2010 document via webdav.
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23618: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
              23617: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
                 23602: ALF-5517: Webdav "supportedlock" propfind request fails if locking enabled
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23997: Fix ALF-5731: Saving a doc from Office 2003 via WebDAV fails
   26049: RepoBM: add "folder create" unit test
          - ALF-7309 (WebDAV)
          - ALF-7310 (CMIS)
   26147: RepoBM: update WebDAV test
          - add patched sardine (thanks Florian) 
          - adds "getResources(String url, int depth, boolean allProps)"
   26219: RepoBM: test additions & improvements
          - add "itemRename" (document or folder) - for CMIS (ALF-7362) and WebDAV (ALF-7630)
          - update mixed scenario (add "folderCreate" & "itemRename") - for CMIS (ALF-7546) and WebDAV (ALF-7545)
          - cleanup of common code
   26269: RepoBM: fix mixed scenarios (# of threads & weighted distribution)
          - use single thread group and interleave controllers
          - for CMIS (ALF-7546) and WebDAV (ALF-7545)
   26271: (RECORD ONLY) Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT (RECORD-ONLY)
          - NOTE: verified w/ florian
          - NOTE: OpenCMIS and cmis-client-api are already on SWIFT
          - NOTE: cmis-bm has been superceded by repository-bm
   26273: (RECORD ONLY) Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT (RECORD-ONLY)
      24326: OpenCMIS update
   26395: ALF-7755: add "system-build-test" project (and related RepoBM updates)
          - add ability to run "remote" tests (ie. selected *SystemTest)  against embedded Jetty
          - initially run sanity builds test for RepoBM (RepositoryBenchmarkWebDAVSystemTest + RepositoryBenchmarkCMISSystemTest) & also SiteActivitySystemTest
          - RepoBM enhanced to import test data if not present (also added additional testItemDelete unit test)
          - using local copy of Spring 3.0.5 (requires at least 3.0.2) - can be rationalised once rest of Alfresco (ie. 3rd-party libs) moves up to a higher Spring version
   26420: ALF-7755: tweak "system-build-test" for build box
          - also includes minor fixes to RepoBM (+ readme)
   26448: ALF-7755: tweak "system-build-test"
          - for ant scripts (eg. running on build box)
   26457: ALF-7898 - Alfresco Web Services: fix-up broken/regressed tests (WebServiceSuiteSystemTest)
          - revert default url context ... from "contentspaces" -> "alfresco" (broken during merge from ADB LC branch)
          - fix AuthoringServiceSystemTest.testVersionMethods() - when deleting version history
          - fix RepositoryServiceSystemTest.testPropertySetGet() - when creating dynamic model
   26462: ALF-7898 / ALF-7755: add additional 'system' tests
          - effectively runs Alf Web Service build sanity tests (~= WebServiceSuiteSystemTest)
   26478: ALF-7898 / ALF-7755: additional classpath fiddling (to get around limitation on Windows)
          - see also r26093
   26487: Build fix: cut-and-paste formatting issue
   26502: RepoBM: add "itemUpdate" (update props for doc or folder)
          - for CMIS (ALF-7633) - use Alfresco OpenCMIS Extension to update aspect props
          - for WebDAV (ALF-7631) - patch Sardine to allow custom namespaces
   26526: ALF-7755: use temp classpaths
   26528: ALF-7755: comment out for now
          - seems to work locally and on build boxes when run separately, but fails during full build
          - pending further investigation and testing (eg. when bamboo agents become free)
   26567: ALF-7755: remove test-repository-bm since not used
          - was breaking the test classpath (for following tests)
   26571: ALF-7755: re-enable RepoBenchmarkSystemTestSuite
   26600: ALF-7755: test-system-build-test
          - add user.home (for build box env)
          - re-enable MiscSystemTestSuite (includes Alf WS* tests)
   26609: ALF-7755: fix build/test (RepositoryServiceSystemTest.testPropertySetGet)
          - due to earlier MT test

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

config/alfresco/public-services-context.xml

@@ -633,6 +633,7 @@
                 <prop key="getCurrentUserName">PROPAGATION_NOT_SUPPORTED, readOnly</prop>
                 <prop key="invalidateUserSession">PROPAGATION_NOT_SUPPORTED, readOnly</prop>
                 <prop key="invalidateTicket">PROPAGATION_NOT_SUPPORTED, readOnly</prop>
+                <prop key="validate">PROPAGATION_NOT_SUPPORTED, readOnly</prop>
                 <prop key="getCurrentTicket">PROPAGATION_NOT_SUPPORTED, readOnly</prop>
                 <prop key="clearCurrentSecurityContext">PROPAGATION_NOT_SUPPORTED, readOnly</prop>
                 <prop key="isCurrentUserTheSystemUser">PROPAGATION_NOT_SUPPORTED, readOnly</prop>

source/java/org/alfresco/repo/dictionary/DictionaryModelType.java

@@ -65,6 +65,7 @@ import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.workflow.WorkflowDefinition;
 import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.cmr.workflow.WorkflowTaskDefinition;
+import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
@@ -806,7 +807,18 @@ public class DictionaryModelType implements ContentServicePolicies.OnContentUpda
                 for (WorkflowDefinition workflowDef : workflowDefs)
                 {
                     String workflowDefName = workflowDef.getName();
-                    String workflowNamespaceURI = QName.createQName(BPMEngineRegistry.getLocalId(workflowDefName), namespaceService).getNamespaceURI();
+                    
+                    String workflowNamespaceURI = null;
+                    try
+                    {
+                        workflowNamespaceURI = QName.createQName(BPMEngineRegistry.getLocalId(workflowDefName), namespaceService).getNamespaceURI();
+                    }
+                    catch (NamespaceException ne)
+                    {
+                        logger.warn("Skipped workflow when validating model delete - unknown namespace: "+ne);
+                        continue;
+                    }
+                    
                     for (NamespaceDefinition namespaceDef : namespaceDefs)
                     {
                         if (workflowNamespaceURI.equals(namespaceDef.getUri()))

source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java

@@ -165,9 +165,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
      * Cache for the Node parent assocs:<br/>
      * KEY: ID<br/>
      * VALUE: ParentAssocs<br/>
-     * VALUE KEY: None<br/s>
+     * VALUE KEY: ChildByNameKey<br/s>
      */
-    private EntityLookupCache<Long, ParentAssocsInfo, Serializable> parentAssocsCache;
+    private EntityLookupCache<Long, ParentAssocsInfo, ChildByNameKey> parentAssocsCache;
     
     /**
      * Constructor.  Set up various instance-specific members such as caches and locks.
@@ -182,7 +182,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         nodesCache = new EntityLookupCache<Long, Node, NodeRef>(new NodesCacheCallbackDAO());
         aspectsCache = new EntityLookupCache<Long, Set<QName>, Serializable>(new AspectsCallbackDAO());
         propertiesCache = new EntityLookupCache<Long, Map<QName, Serializable>, Serializable>(new PropertiesCallbackDAO());
-        parentAssocsCache = new EntityLookupCache<Long, ParentAssocsInfo, Serializable>(new ParentAssocsCallbackDAO());
+        parentAssocsCache = new EntityLookupCache<Long, ParentAssocsInfo, ChildByNameKey>(new ParentAssocsCallbackDAO());
     }
 
     /**
@@ -338,7 +338,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
      */
     public void setParentAssocsCache(SimpleCache<Long, ParentAssocsInfo> parentAssocsCache)
     {
-        this.parentAssocsCache = new EntityLookupCache<Long, ParentAssocsInfo, Serializable>(
+        this.parentAssocsCache = new EntityLookupCache<Long, ParentAssocsInfo, ChildByNameKey>(
                 parentAssocsCache,
                 CACHE_REGION_PARENT_ASSOCS,
                 new ParentAssocsCallbackDAO());
@@ -2733,7 +2733,37 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
 
     public Pair<Long, ChildAssociationRef> getChildAssoc(Long parentNodeId, QName assocTypeQName, String childName)
     {
+        ChildByNameKey valueKey = new ChildByNameKey(parentNodeId, assocTypeQName, childName);
+        
+        // cache-only operation: try reverse lookup on parentAssocs (note: for primary assoc only)
+        Long childNodeId = parentAssocsCache.getKey(valueKey);
+        if (childNodeId != null)
+        {
+            Pair<Long, ParentAssocsInfo> value = parentAssocsCache.getByKey(childNodeId);
+            if (value != null)
+            {
+                ChildAssocEntity assoc = value.getSecond().getPrimaryParentAssoc();
+                if (assoc == null)
+                {
+                    return null;
+                }
+                
+                Pair<Long, ChildAssociationRef> result = assoc.getPair(qnameDAO);
+                if (result.getSecond().getTypeQName().equals(assocTypeQName))
+                {
+                    return result;
+                }
+            }
+        }
+        
+        // TODO could refactor as single select to get parent assocs by child name
         ChildAssocEntity assoc = selectChildAssoc(parentNodeId, assocTypeQName, childName);
+        if (assoc != null)
+        {
+            // additional lookup to populate cache - note: also pulls in 2ndary assocs
+            parentAssocsCache.getByKey(assoc.getChildNode().getId());
+        }
+        
         return assoc == null ? null : assoc.getPair(qnameDAO);
     }
 
@@ -3072,7 +3102,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
      * @author Derek Hulley
      * @since 3.4
      */
-    private class ParentAssocsCallbackDAO extends EntityLookupCallbackDAOAdaptor<Long, ParentAssocsInfo, Serializable>
+    private class ParentAssocsCallbackDAO extends EntityLookupCallbackDAOAdaptor<Long, ParentAssocsInfo, ChildByNameKey>
     {
         public Pair<Long, ParentAssocsInfo> createValue(ParentAssocsInfo value)
         {
@@ -3093,6 +3123,24 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             // Done
             return new Pair<Long, ParentAssocsInfo>(nodeId, value);
         }
+        
+        @Override
+        public ChildByNameKey getValueKey(ParentAssocsInfo value)
+        {
+            ChildAssocEntity entity = value.getPrimaryParentAssoc();
+            
+            if (entity != null)
+            {
+                return new ChildByNameKey(entity.getParentNode().getId(), qnameDAO.getQName(entity.getTypeQNameId()).getSecond(), entity.getChildNodeName());
+            }
+            
+            return null;
+        }
+        
+        public Pair<Long, ParentAssocsInfo> findByValue(ParentAssocsInfo value)
+        {
+            return findByKey(value.getPrimaryParentAssoc().getChildNode().getId());
+        }
     }
     
     /*

source/java/org/alfresco/repo/domain/node/ChildByNameKey.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2005-2010 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.domain.node;
+
+import java.io.Serializable;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author janv
+ * @since 4.0
+ */
+/* package */ class ChildByNameKey implements Serializable
+{
+    private static final long serialVersionUID = -2167221525380802365L;
+    
+    private final Long parentNodeId;
+    private QName assocTypeQName;
+    private String childNodeName;
+    
+    ChildByNameKey(Long parentNodeId, QName assocTypeQName, String childNodeName)
+    {
+        this.parentNodeId = parentNodeId;
+        this.assocTypeQName = assocTypeQName;
+        this.childNodeName = childNodeName;
+    }
+    
+    public Long getParentNodeId()
+    {
+        return parentNodeId;
+    }
+    
+    public QName getAssocTypeQName()
+    {
+        return assocTypeQName;
+    }
+    
+    public String getChildNodeName()
+    {
+        return childNodeName;
+    }
+    
+    
+    @Override
+    public boolean equals(Object other)
+    {
+        if (this == other)
+        {
+            return true;
+        }
+        if (!(other instanceof ChildByNameKey))
+        {
+            return false;
+        }
+        ChildByNameKey o = (ChildByNameKey)other;
+        return parentNodeId.equals(o.getParentNodeId()) &&
+               assocTypeQName.equals(o.getAssocTypeQName()) &&
+               childNodeName.equalsIgnoreCase(o.getChildNodeName());
+    }
+    
+    @Override
+    public int hashCode()
+    {
+        return parentNodeId.hashCode() + assocTypeQName.hashCode() + childNodeName.toLowerCase().hashCode();
+    }
+    
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ChildByNameInfo ")
+               .append("[parentNodeId=").append(parentNodeId)
+               .append(", assocTypeQName=").append(assocTypeQName)
+               .append(", childNodeName=").append(childNodeName)
+               .append("]");
+        return builder.toString();
+    }
+}

source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java

@@ -209,12 +209,16 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
                 authentication = transactionService.getRetryingTransactionHelper().doInTransaction(callback, true,
                         false);
             }
-            // Otherwise, we want a writeable transaction, so if the current transaction is read only we set the
+            // Otherwise,
+            // - for check-only mode we want a readable txn or
+            // - for check-and-fix mode we want a writeable transaction, so if the current transaction is read only we set the
             // requiresNew flag to true
             else
             {
-                authentication = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false,
+                boolean readOnly = (validationMode ==  UserNameValidationMode.CHECK);
-                        AlfrescoTransactionSupport.getTransactionReadState() == TxnReadState.TXN_READ_ONLY);
+                boolean requiresNew = ((!readOnly) && (AlfrescoTransactionSupport.getTransactionReadState() == TxnReadState.TXN_READ_ONLY));
+                        
+                authentication = transactionService.getRetryingTransactionHelper().doInTransaction(callback, readOnly, requiresNew);
             }
             if ((authentication == null) || (callback.ae != null))
             {

source/java/org/alfresco/repo/tenant/MultiTDemoTest.java

@@ -38,6 +38,7 @@ import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.security.permissions.impl.AccessPermissionImpl;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.admin.RepoAdminService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
@@ -63,6 +64,7 @@ import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.cmr.usage.UsageService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -92,6 +94,7 @@ public class MultiTDemoTest extends TestCase
     private RepoAdminService repoAdminService;
     private DictionaryService dictionaryService;
     private UsageService usageService;
+    private TransactionService transactionService;
     
     public static int NUM_TENANTS = 2;
     
@@ -152,6 +155,7 @@ public class MultiTDemoTest extends TestCase
         repoAdminService = (RepoAdminService) ctx.getBean("RepoAdminService");
         dictionaryService = (DictionaryService) ctx.getBean("DictionaryService");
         usageService = (UsageService) ctx.getBean("usageService");
+        transactionService = (TransactionService) ctx.getBean("TransactionService");
         
         createTenants();
     }
@@ -270,6 +274,8 @@ public class MultiTDemoTest extends TestCase
         final String tenantDomain1 = TEST_RUN+".groupdel1";
         final String tenantDomain2 = TEST_RUN+".groupdel2";
         
+        try
+        {
             final String[] tenantUniqueGroupNames = new String[10];
             final String[] superadminUniqueGroupNames = new String[10];
             for (int i = 0; i < tenantUniqueGroupNames.length; i++)
@@ -323,12 +329,20 @@ public class MultiTDemoTest extends TestCase
             // Check that super-admin's authorities are not visible to super-admin
             checkTestAuthoritiesPresence(superadminUniqueGroupNames, superAdmin, false);
         }
+        finally
+        {
+            deleteTenant(tenantDomain1);
+            deleteTenant(tenantDomain2);
+        }
+    }
     
     public void testSharedGroupDeletion()
     {
         final String tenantDomain1 = TEST_RUN+".groupdel3";
         final String tenantDomain2 = TEST_RUN+".groupdel4";
         
+        try
+        {
             final String[] commonTenantUniqueGroupNames = new String[10];
             for (int i = 0; i < commonTenantUniqueGroupNames.length; i++)
             {
@@ -403,6 +417,14 @@ public class MultiTDemoTest extends TestCase
             // Check that authorities are not visible to super-admin
             checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, superAdmin, false);
         }
+        finally
+        {
+            AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+            
+            deleteTenant(tenantDomain1);
+            deleteTenant(tenantDomain2);
+        }
+    }
     
     
     private void createTenant(final String tenantDomain)
@@ -425,6 +447,32 @@ public class MultiTDemoTest extends TestCase
         }, AuthenticationUtil.getSystemUserName());
     }
     
+    private void deleteTenant(final String tenantDomain)
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            public Object execute() throws Throwable
+            {
+                // delete tenant (if it exists)
+                AuthenticationUtil.runAs(new RunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        if (tenantAdminService.existsTenant(tenantDomain))
+                        {
+                            tenantAdminService.deleteTenant(tenantDomain);
+                            
+                            logger.info("Deleted tenant " + tenantDomain);
+                        }
+                        
+                        return null;
+                    }
+                }, AuthenticationUtil.getSystemUserName());
+                return null;
+            }
+        });
+    }
+    
     public void test_ETHREEOH_2015()
     {
         final String tenantDomain1 = TEST_RUN+".one.ethreeoh2015";
@@ -1130,6 +1178,19 @@ public class MultiTDemoTest extends TestCase
         }
     }
     
+    // pseudo cleanup - if this test runs last
+    public void testDeleteTenants()
+    {
+        logger.info("test delete tenant");
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        for (final String tenantDomain : tenants)
+        {    
+            deleteTenant(tenantDomain);
+        }
+    }
+    
     private void createGroup(String shortName, String parentShortName)
     {
         // create new Group using authority Service

source/java/org/alfresco/repo/version/Version2ServiceImpl.java

@@ -1324,15 +1324,28 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
             
             if (versionHistoryNodeRef != null)
             {
+                try
+                {
+                    // Disable auto-version behaviour
+                    this.policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_VERSIONABLE);
+                    
                     // Delete the version history node
                     this.dbNodeService.deleteNode(versionHistoryNodeRef);
                     
                     if (this.nodeService.exists(nodeRef) == true && this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) == true)
                     {
+                        
                             // Reset the version label property on the versionable node
                             this.nodeService.setProperty(nodeRef, ContentModel.PROP_VERSION_LABEL, null);
                     }
+                    
                 }
+                finally
+                {
+                    this.policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);
+                }
+            }
+
         }
     }