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>
<!-- Content Metadata Extracters -->
<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.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.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.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" 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.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.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.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter" >
<property name="connection">
<ref bean="openOfficeConnection" />
</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">
<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>
@@ -876,7 +897,7 @@
<ref bean="nodeService" />
</property>
<property name="targetLocation">
<value>${dir.root}/backup-lucene-indexes</value>
<value>${dir.indexes}/backup-lucene-indexes</value>
</property>
</bean>