Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
   svn revert root\common\common.xml
   svn resolved root\projects\repository\config\alfresco\script-services-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-18 13:45:11 +00:00
parent 8e0a637886
commit 72bb79696d
48 changed files with 1960 additions and 299 deletions

View File

@@ -3,7 +3,7 @@
<beans>
<bean id="sample.workflowBootstrap" parent="workflowDeployer">
<bean id="parallel.workflowBootstrap" parent="workflowDeployer">
<property name="workflowDefinitions">
<list>
<props>
@@ -19,6 +19,8 @@
<!-- NOTE: The above process definition relies on the default workflowModel.xml -->
<!-- which is already registered during Alfresco startup. -->
<!-- See bootstrap-context.xml (workflowBootstrap). -->
<!-- <value>alfresco/workflow/workflowModel.xml</value> -->
</list>
</property>
<property name="labels">
@@ -26,6 +28,8 @@
<!-- NOTE: The above process definition relies on the default workflow-messages.properties -->
<!-- which is already registered during Alfresco startup -->
<!-- See bootstrap-context.xml (workflowBootstrap). -->
<!-- <value>alfresco/workflow/workflow-messages</value> -->
</list>
</property>
</bean>