mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -72,6 +72,9 @@
|
||||
<property name="avmService">
|
||||
<ref bean="AVMService"/>
|
||||
</property>
|
||||
<property name="imageMagickContentTransformer">
|
||||
<ref bean="transformer.ImageMagick" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="mimetypeConfigService" class="org.alfresco.config.xml.XMLConfigService" init-method="init">
|
||||
@@ -96,11 +99,7 @@
|
||||
<bean id="openOfficeConnection" class="net.sf.jooreports.openoffice.connection.SocketOpenOfficeConnection" />
|
||||
|
||||
<!-- Metadata Extraction Regisitry -->
|
||||
<bean id="metadataExtracterRegistry" class="org.alfresco.repo.content.metadata.MetadataExtracterRegistry" >
|
||||
<property name="mimetypeMap">
|
||||
<ref bean="mimetypeService" />
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="metadataExtracterRegistry" class="org.alfresco.repo.content.metadata.MetadataExtracterRegistry" />
|
||||
|
||||
<!-- Abstract bean definition defining base definition for all metadata extracters -->
|
||||
<bean id="baseMetadataExtracter"
|
||||
@@ -130,11 +129,7 @@
|
||||
|
||||
|
||||
<!-- Content Transformation Regisitry -->
|
||||
<bean id="contentTransformerRegistry" class="org.alfresco.repo.content.transform.ContentTransformerRegistry" >
|
||||
<constructor-arg>
|
||||
<ref bean="mimetypeService" />
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
<bean id="contentTransformerRegistry" class="org.alfresco.repo.content.transform.ContentTransformerRegistry" />
|
||||
|
||||
<!-- Abstract bean definition defining base definition for all transformers -->
|
||||
<bean id="baseContentTransformer"
|
||||
|
Reference in New Issue
Block a user