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

Merged V2.2 to HEAD

Browse Source 
8071: Fix for AR-1694
   8072: XFormsNode attributes incorrectly added with all lower case names
   8073: Fix for WCM-959
   8074: AMP's modularity now extends to the log4j configuration of modules.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-07 15:15:18 +00:00
parent a55663b452
commit 397e20065b
3 changed files with 212 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/alfresco/content-services-context.xml
View File

@@ -148,13 +148,13 @@
</bean> </bean>
<!-- Content Metadata Extracters --> <!-- Content Metadata Extracters -->
<bean id="extracter.PDFBox" class="org.alfresco.repo.content.metadata.PdfBoxMetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.PDFBox" class="org.alfresco.repo.content.metadata.PdfBoxMetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.Office" class="org.alfresco.repo.content.metadata.OfficeMetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.Office" class="org.alfresco.repo.content.metadata.OfficeMetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.Mail" class="org.alfresco.repo.content.metadata.MailMetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.Mail" class="org.alfresco.repo.content.metadata.MailMetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.Html" class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.Html" class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.MP3" class="org.alfresco.repo.content.metadata.MP3MetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.MP3" class="org.alfresco.repo.content.metadata.MP3MetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.OpenDocument" class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.OpenDocument" class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter" > <bean id="extracter.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter" >
<property name="connection"> <property name="connection">
<ref bean="openOfficeConnection" /> <ref bean="openOfficeConnection" />
</property> </property>

23
config/alfresco/core-services-context.xml
View File

@@ -133,6 +133,27 @@
<bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init"> <bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init">
<property name="log4jHierarchy" ref="log4jHierarchy"/> <property name="log4jHierarchy" ref="log4jHierarchy"/>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Incorporate supplementary log4j.properties files -->
<!-- -->
<!-- Properties in these files will augment/override -->
<!-- those within WEB-INF/classes/log4j.properties -->
<!-- -->
<!-- This mechanism allows modules to have their own local -->
<!-- log4j.properties file within: -->
<!-- -->
<!-- WEB-INF/classes/alfresco/module/{module.id}/log4j.properties -->
<!-- -->
<!-- Where: module.id is whatever value is set within the AMP's -->
<!-- 'module.properties' file. -->
<!-- -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<property name="overriding_log4j_properties">
<list>
<value>classpath*:alfresco/module/*/log4j.properties</value>
</list>
</property>
</bean> </bean>
@@ -876,7 +897,7 @@
<ref bean="nodeService" /> <ref bean="nodeService" />
</property> </property>
<property name="targetLocation"> <property name="targetLocation">
<value>${dir.root}/backup-lucene-indexes</value> <value>${dir.indexes}/backup-lucene-indexes</value>
</property> </property>
</bean> </bean>

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

@@ -24,42 +24,196 @@
*/ */
package org.alfresco.repo.admin; package org.alfresco.repo.admin;
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List;
import org.apache.log4j.LogManager; import java.util.Properties;
import org.apache.log4j.Logger;
import org.apache.log4j.jmx.HierarchyDynamicMBean; import org.apache.log4j.jmx.HierarchyDynamicMBean;
import org.apache.log4j.Logger;
import org.apache.log4j.LogManager;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.spi.LoggerRepository; import org.apache.log4j.spi.LoggerRepository;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
/** /**
* Initialises Log4j's HierarchyDynamicMBean (refer to core-services-context.xml) * Initialises Log4j's HierarchyDynamicMBean (refer to core-services-context.xml)
* * and any overriding log4.properties files.
* <p>
* Alfresco modules can provide their own log4j.properties file,
* which augments/overrides the global log4j.properties within
* the Alfresco webapp. Within the module's source tree, suppose
* you create:<pre>
* config/alfresco/module/{module.id}/log4j.properties</pre>
* At deployment time, this log4j.properties file will be placed in:<pre>
* WEB-INF/classes/alfresco/module/{module.id}/log4j.properties</pre>
* 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:<pre>
* config/alfresco/module/org.alfresco.module.avmCompare/log4j.properties</pre>
* This would be deployed to:<pre>
* WEB-INF/classes/alfresco/module/org.alfresco.module.avmCompare/log4j.properties</pre>
* By default the 'overriding_log4j_properties' property of the
* 'log4JHierarchyInit' bean within core-services-context.xml is:<pre>
* classpath&#042;:alfresco/module/&#042;/log4j.properties</pre>
* Therefore, Log4JHierarchyInit will discover this supplimentary log4j.properties
* file, and merge it with the main log4j.file (WEB-INF/classes/log4j.properties).
* For example, the org.alfresco.module.avmCompare log4j.properties file might look like this:
* <pre>
* #-----------------------------------------------------------------------
* # webscript module log4j.properties
* #
* # NOTE
* # ----
* #
* # Log4j uses the following logging levels:
* # debug,info,warn,error,fatal
* #
* # To set the logging level of {fullClassName} to {loglevel},
* # add a line to this file of the following form:
* #
* # log4j.logger.{fullClassName}={loglevel}
* #
* # For example, to make 'com.example.MyExample' produce 'debug'
* # logs, add a line like this:
* #
* # log4j.logger.com.example.MyExample=debug
* #
* #
* # WARNING
* # -------
* # Log properties in this log4j.properties file override/augment
* # those in the webapp's main log4j.properties.
* #
* #-----------------------------------------------------------------------
*
* log4j.logger.org.alfresco.module.avmCompare.AvmCompare=info
* </pre>
*
* This system allows the author of any module to provide rich logging control
* without concern for corrupting the central log4j.properties file during
* AMP installation/deinstallation. For details, see:
* <a href='http://wiki.alfresco.com/wiki/Module_Management_Tool'>Module Management Tool</a>
*/ */
public class Log4JHierarchyInit public class Log4JHierarchyInit
{ {
private HierarchyDynamicMBean log4jHierarchy; private HierarchyDynamicMBean log4jHierarchy;
private List<String> extra_log4j_urls;
public void setLog4jHierarchy(HierarchyDynamicMBean log4jHierarchy)
{ public Log4JHierarchyInit()
this.log4jHierarchy = log4jHierarchy; {
} extra_log4j_urls = new ArrayList<String>();
}
@SuppressWarnings("unchecked")
public void init()
{ /**
// Add each logger (that has a level set) from the Log4J Repository to the Hierarchy MBean * Loads a set of augmenting/overriding log4j.properties files
LoggerRepository r = LogManager.getLoggerRepository(); * from locations specified via an array of 'spring_urls'
* (typically provided by a core-services-context.xml).
Enumeration loggers = r.getCurrentLoggers(); *
Logger logger = null; * This function supports Spring's syntax for retrieving
* multiple class path resources with the same name,
while (loggers.hasMoreElements()) * via the "classpath&#042;:" prefix. For details, see:
{ * <a href='http://www.jdocs.com/spring/1.2.8/org/springframework/core/io/support/PathMatchingResourcePatternResolver.html'>PathMatchingResourcePatternResolver</a>.
logger = (Logger)loggers.nextElement(); */
if (logger.getLevel() != null) public void setOverriding_log4j_properties(List<String> spring_urls)
{ {
log4jHierarchy.addLoggerMBean(logger.getName()); for ( String url : spring_urls ) { extra_log4j_urls.add( url ); }
} }
}
} public void setLog4jHierarchy(HierarchyDynamicMBean log4jHierarchy)
{
this.log4jHierarchy = log4jHierarchy;
}
@SuppressWarnings("unchecked")
public void init()
{
// Add each logger (that has a level set) from
// the Log4J Repository to the Hierarchy MBean
LoggerRepository r = LogManager.getLoggerRepository();
// Include overriding loggers
//
// Typically, extra loggers come from AMP modules, but you
// could add others by augmenting core-services-context.xml
// This mechanism allows modules to have their own local
// log4j.properties file within:
//
// WEB-INF/classes/alfresco/module/{module.id}/log4j.properties
//
// Where: module.id is whatever value is set within the AMP's
// 'module.properties' file.
//
// See also:
// http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module
// (the module.properties section)
//
// And:
// core-services-context.xml
set_overriding_loggers( r );
Enumeration loggers = r.getCurrentLoggers();
Logger logger = null;
while (loggers.hasMoreElements())
{
logger = (Logger)loggers.nextElement();
if (logger.getLevel() != null)
{
log4jHierarchy.addLoggerMBean(logger.getName());
}
}
}
void set_overriding_loggers( LoggerRepository hierarchy )
{
for ( String spring_url : extra_log4j_urls )
{
set_overriding_logger( spring_url, hierarchy );
}
}
void set_overriding_logger( String spring_url,
LoggerRepository hierarchy )
{
PathMatchingResourcePatternResolver resolver;
PropertyConfigurator prop_config;
prop_config = new PropertyConfigurator();
resolver = new PathMatchingResourcePatternResolver();
Resource[] resources = null;
try
{
resources = resolver.getResources( spring_url );
}
catch (Exception e) { return ; }
// Read each resource
for (Resource resource : resources )
{
try
{
InputStream istream = new BufferedInputStream(resource.getInputStream());
Properties properties = new Properties();
properties.load(istream);
prop_config.doConfigure(properties, hierarchy);
}
catch (Throwable e) { /* do nothing */ }
}
}
} }