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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:13:50 +00:00
parent 63678f2980
commit e94f8f8351
93 changed files with 62 additions and 4426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
View File

@@ -49,15 +49,15 @@ import org.springframework.core.io.support.ResourcePatternResolver;
* Where {module.id} is whatever value is set within the AMP's module.properties file. For details, see: <a
* href='http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module'>Developing an Alfresco Module</a>
* <p>
* For example, if {module.id} is "org.alfresco.module.avmCompare", then within your source code you'll have:
* For example, if {module.id} is "org.alfresco.module.someModule", then within your source code you'll have:
*
* <pre>
* config / alfresco / module / org.alfresco.module.avmCompare / log4j.properties
* config / alfresco / module / org.alfresco.module.someModule / log4j.properties
* </pre>
*
* This would be deployed to:
* <pre>
* WEB - INF / classes / alfresco / module / org.alfresco.module.avmCompare / log4j.properties
* WEB - INF / classes / alfresco / module / org.alfresco.module.someModule / log4j.properties
* </pre>
*/
public class Log4JHierarchyInit implements ApplicationContextAware
@@ -85,29 +85,22 @@ public class Log4JHierarchyInit implements ApplicationContextAware
}
}
/* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.resolver = applicationContext;
}
@SuppressWarnings("unchecked")
public void init()
{
importLogSettings();
}
@SuppressWarnings("unchecked")
private void importLogSettings()
{
try
{
// Get the PropertyConfigurator
Class clazz = Class.forName("org.apache.log4j.PropertyConfigurator");
Class<?> clazz = Class.forName("org.apache.log4j.PropertyConfigurator");
Method method = clazz.getMethod("configure", URL.class);
// Import using this method
for (String url : extraLog4jUrls)