Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-11 17:01:57 +00:00
parent 6418bb6d23
commit a22ddfb666
74 changed files with 905 additions and 1190 deletions

View File

@@ -14,6 +14,9 @@
</property>
<property name="authenticationComponent">
<ref bean="authenticationComponent" />
</property>
<property name="dictionaryService">
<ref bean="DictionaryService" />
</property>
<property name="asynchronousActionExecutionQueue">
<ref bean="asynchronousActionExecutionQueue"/>
@@ -203,6 +206,11 @@
<property name="mimetypeService">
<ref bean="mimetypeService" />
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="transform-image" class="org.alfresco.repo.action.executer.ImageTransformActionExecuter"
@@ -234,6 +242,11 @@
<property name="cociService">
<ref bean="checkOutCheckInService"></ref>
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="check-out" class="org.alfresco.repo.action.executer.CheckOutActionExecuter" parent="action-executer">
@@ -243,6 +256,11 @@
<property name="cociService">
<ref bean="checkOutCheckInService"></ref>
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="mail" class="org.alfresco.repo.action.executer.MailActionExecuter" parent="action-executer">
@@ -291,6 +309,11 @@
<property name="metadataExtracterRegistry">
<ref bean="metadataExtracterRegistry" />
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="import" class="org.alfresco.repo.action.executer.ImporterActionExecuter" parent="action-executer">