Merged V3.2 to HEAD

17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
      - Forces transaction retry if worker thread reaches child authority before a parent authority
      - Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
      - Now completes in 5 minutes as opposed to 45
   17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
   17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
   17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
   17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
      - Working copy aspect already removed the working copy aspect on copy
      - Now derives a new name from the node checked out from and a UUID, preserving the extension
   17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
      - declared dependency between internalEHCacheManager and jgroupsPropertySetter
   17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
      - authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
      - multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
      - BatchProcessor now promoted to its own package
   17394: Fix for license issue in local enterprise builds.
      - Replace Community with Enterprise in version.properties during enterprise war building
   17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
   17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
   17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
   17316: Merged V3.1 to V3.2
      17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
      17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
         - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
      17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
      17299: Merged V3.2 to V3.1 (Record only)
         17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
         17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
      - thanks Kev!
   17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
      - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
   17269: Fix failing unit test
      - reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
   17268: Fix InvitationService
      - Runs as system to do privileged AuthenticationService actions


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

source/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java

@@ -24,6 +24,7 @@
 *----------------------------------------------------------------------------*/
 package org.alfresco.util;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,7 +33,10 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.Ordered;
+import org.springframework.core.io.support.ResourcePatternResolver;
 
 /**
  * Sets runtime JVM system properties for Spring Framework. 
@@ -46,13 +50,15 @@ import org.springframework.core.Ordered;
  * @author Jon Cox
  * @see #setProperties(Map)
 */
-public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor, Ordered
+public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor, ApplicationContextAware, Ordered
 {
     private static Log logger = LogFactory.getLog(RuntimeSystemPropertiesSetter.class );
 
     /** default: just before PropertyPlaceholderConfigurer */
     private int order = Integer.MAX_VALUE - 1;
     
+    private ResourcePatternResolver resolver;
+    
     /**
      * @see #setProperties(Map)
      */
@@ -75,6 +81,12 @@ public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor,
         this.jvmProperties = jvmProperties;
     }
 
+    
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.resolver  = applicationContext;
+    }
+
     public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException 
     {
         // Push any mapped properties into the JVM
@@ -94,8 +106,7 @@ public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor,
             }
         }
         
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        String path=null;
+        File path=null;
         try 
         {
             // Typically, the value of 'path' will be something like:
@@ -109,9 +120,8 @@ public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor,
             // will be disabled later when org.alfresco.mbeans.VirtServerRegistry
             // refuses to bring up the serverConnector bean.
 
-            path = loader.getResource("alfresco/alfresco-jmxrmi.password").toURI().getPath();
+            path = this.resolver.getResource("classpath:alfresco/alfresco-jmxrmi.password").getFile().getCanonicalFile();
         }
-        catch (java.net.URISyntaxException e ) { e.printStackTrace(); }
         catch (Exception e ) 
         { 
             if ( logger.isWarnEnabled() )
@@ -121,8 +131,7 @@ public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor,
         if ( path == null ) { System.setProperty("alfresco.jmx.dir", ""); }
         else
         {
-            String alfresco_jmx_dir =   
-                   path.substring(0,path.lastIndexOf("/alfresco-jmxrmi.password"));
+            String alfresco_jmx_dir = path.getParent();
 
             // The value of 'alfresco.jmx.dir' will be something like:
             // $TOMCAT_HOME/webapps/alfresco/WEB-INF/classes/alfresco