Merged V4.0-BUG-FIX to HEAD

37067: ALF-13294	CIFS: When versionable aspect is active, using the Microsoft Word for Mac 2008 option "always create a backup copy" leads to document versions loss
   37073: ALF-14319 Add a unit test for using the real remote credentials shared container (most use a test one to avoid issues/clashing), and tweak the qname to match other similar ones
   37074: Merged V3.4-BUG-FIX to V4.0-BUG_FIX
      36881: Merged DEV to V3.4-BUG-FIX
         36759: Fix to Checkin failing to distinguish between 'null' and 'unset' properties
         - Some minor ammendments to unit test as well
      36898: Merge HEAD to V3.4-BUG-FIX:
         33668: ALF-12541 / ALF-14254: AMP files need to be able to be pinned to specific "edition(s)" of Alfresco. It is now possible to specify a module.editions property (eg. community) which is checked by the MMT. Also, the version is checked on install. Also, started refactoring some of the code for better reuse.
         33793: ALF-12541 / ALF-14254: Better fix for ALF-12541 - AMP files need to be able to be pinned to specific "edition(s)" of Alfresco Share doesn't have a version.properties file so I need to cater for that scenario. I didn't want to create the LogOutput interface but its a stop-gap until the MMT gets re-worked.
         33695: ALF-12531 / ALF-14255: MMT needs to properly support upgrading of AMP files
         33725: ALF-12532 / ALF-14256: MMT should fail with an error if the target war file doesn't exist
         33735: ALF-12533 / ALF-14257: When run with -directory, MMT should only backup the alfresco.war file once
         33781: ALF-12540 / ALF-14258: AMP - file-mapping.properties: white space at end of line is significant
         33880: ALF-12777 / ALF-14259: MMT should not install AMPs which override pre-existing files in the war file, unless -force is provided. The MMT is moving toward more of a validation phase (checks things, calculate changes) then an execution phase (makes the changes).
         33707: ALF-12541 / ALF-14254: Fix for failing unit tests
      37030: ALF-12511 Allow debugging of the authentication chain at a high level
         - enable with log4j.loggerorg.alfresco.repo.security.authentication.AbstractChainingAuthenticationService=debug
      37066: Merged DEV to V3.4-BUG-FIX (3.4.10)
         37063: ALF-11956: WCM accessibility
            New Tab focus plugin is added for TinyMCE:
            - plugin covers the RTE changes special for 'XForms';
            - configuration for custom appearance has been set in 'web-client-config-wcm.xml'
      37069: ALF-13379: READ_ONLY_LOCK prevents access via deprecated CMIS API
      - Fix by Alex Bykov
   37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
   37076: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      36942: ALF-12081: Cancel Editing button should only be shown for documents that are checked out for offline editing.
      36957: ALF-12081: Reverse-merging r36942 pending UI team review


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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -25,6 +25,8 @@ import java.util.TreeSet;
 
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A base class for chaining authentication services. Where appropriate, methods will 'chain' across multiple
@@ -34,6 +36,8 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService;
  */
 public abstract class AbstractChainingAuthenticationService extends AbstractAuthenticationService implements MutableAuthenticationService
 {
+    private static final Log logger = LogFactory.getLog(AbstractChainingAuthenticationService.class);
+
     /**
      * Instantiates a new abstract chaining authentication service.
      */
@@ -173,15 +177,26 @@ public abstract class AbstractChainingAuthenticationService extends AbstractAuth
     public void authenticate(String userName, char[] password) throws AuthenticationException
     {
         preAuthenticationCheck(userName);
-        for (AuthenticationService authService : getUsableAuthenticationServices())
+        List<AuthenticationService> usableAuthenticationServices = getUsableAuthenticationServices();
+        int counter = usableAuthenticationServices.size();
+        for (AuthenticationService authService : usableAuthenticationServices)
         {
             try
             {
+                counter--;
                 authService.authenticate(userName, password);
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("authenticate "+userName+" with "+getId(authService)+" SUCCEEDED");
+                }
                 return;
             }
             catch (AuthenticationException e)
             {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("authenticate "+userName+" with "+getId(authService)+(counter == 0 ? " FAILED (end of chain)" : " failed (try next in chain)"));
+                }
                 // Ignore and chain
             }
         }
@@ -189,6 +204,17 @@ public abstract class AbstractChainingAuthenticationService extends AbstractAuth
 
     }
 
+    /**
+     * Should be overridden to returns the ID of the authService for use in debug.
+     * @param authService in question.
+     * @return the ID of the authService. This implementation has no way to work 
+     *         this out so returns the simple class name.
+     */
+    protected String getId(AuthenticationService authService)
+    {
+        return authService.getClass().getSimpleName();
+    }
+
     /**
      * {@inheritDoc}
      */

source/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -193,4 +193,24 @@ public class SubsystemChainingAuthenticationService extends AbstractChainingAuth
         }
     }
 
+    @Override
+    protected String getId(AuthenticationService authService)
+    {
+        this.lock.readLock().lock();
+        try
+        {
+            for (String instance : this.instanceIds)
+            {
+                if (authService.equals(this.sourceBeans.get(instance)))
+                {
+                    return instance;
+                }
+            }
+        }
+        finally
+        {
+            this.lock.readLock().unlock();
+        }
+        return super.getId(authService);
+    }
 }