Merged V3.1 to HEAD

12898: Cleaned up svn:mergeinfo
   12905: Added 'js' to svn:ignore
   12916: Divorced repositories [sic] Log4J extension point from Log4J imports
   12939: Build/test fix (follow on from r12899)
   12945: Merged V2.1-A to V3.1
      7720: (record-only) Customer-specific request to allow domains to be case-sensitive
   12946: fix for ETHREEOH-1227 (bunch of FTL and JS files by Lawrence)
   12949: Merged V2.1-A to V3.1
      8123: (record-only) Allow authorities that are identical ignoring case (as we do in 2.2)
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r7720,8123
      Merged /alfresco/BRANCHES/V3.1:r12898,12905,12916,12939,12945-12946,12949


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

source/test-resources/log4j/log4j-test-context.xml

@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<!-- Sample context to test Log4J hierarchy overrides --> 
+<beans>
+   
+    <bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init">
+        <property name="extraLog4jUrls">
+            <list>
+                <!-- Uses 'test-resources' folder, which is on the classpath -->
+                <value>classpath*:log4j/log4j.properties</value>
+            </list>
+        </property>
+    </bean>
+   
+</beans>

source/test-resources/log4j/log4j.properties

@@ -0,0 +1,2 @@
+## Test to see that Log4J additions are picked up
+log4j.logger.org.alfresco.repo.admin.Log4JHierarchyInitTest=DEBUG