inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2009-03-10 16:26:40 +00:00
parent 800c11f884
commit 42fa774d76
7 changed files with 180 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/java/org/alfresco/repo/admin/Log4JHierarchyInitTest.java Normal file
View File

@@ -0,0 +1,65 @@
/*
* Copyright (C) 2005-2008 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;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @see Log4JHierarchyInit
*
* @author Derek Hulley
* @since 2.2.3
*/
public class Log4JHierarchyInitTest extends TestCase
{
private static ApplicationContext ctx = new ClassPathXmlApplicationContext(
new String[] {"classpath:log4j/log4j-test-context.xml"}
);
public void setUp() throws Exception
{
}
public void testSetUp() throws Throwable
{
// Check that the bean is present
ctx.getBean("log4JHierarchyInit");
// Make sure that the default log4j.properties is being picked up
Log log = LogFactory.getLog("log4j.logger.org.alfresco");
assertFalse("Expect log level ERROR for 'org.alfresco'.", log.isWarnEnabled());
}
public void testAddingLog4jProperties() throws Throwable
{
Log log = LogFactory.getLog(this.getClass());
// We expect DEBUG to be on
assertTrue("DEBUG was not enabled for logger " + this.getClass(), log.isDebugEnabled());
}
}