Merged V1.3 to HEAD (3106:3116)

svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3106 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3116 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-07-26 09:41:53 +00:00
parent 50ae7908ae
commit 133c4bc2f3
13 changed files with 163 additions and 66 deletions

View File

@@ -1,26 +1,32 @@
<alfresco-config area="file-servers">
<config evaluator="string-compare" condition="Filesystems">
<!-- Default share -->
<filesystem name="Alfresco">
<store>workspace://SpacesStore</store>
<rootPath>/app:company_home</rootPath>
<!-- Enable Web client launch shortcut in all folders -->
<urlFile>
<!-- Change the filename as required, keeping the .url extension -->
<filename>_Alfresco.url</filename>
<!-- Change 'localhost' to the name or IP of the Alfresco server -->
<webpath>http://localhost:8080/alfresco/</webpath>
</urlFile>
</filesystem>
<!-- To override the default Alfresco filesystem use replace="true", to -->
<!-- add additional filesystems remove the replace="true" attribute -->
<config evaluator="string-compare" condition="Filesystems" replace="true">
<filesystems>
<!-- Default share -->
<filesystem name="Alfresco">
<store>workspace://SpacesStore</store>
<rootPath>/app:company_home</rootPath>
<!-- Enable Web client launch shortcut in all folders -->
<urlFile>
<!-- Change the filename as required, keeping the .url extension -->
<filename>_Alfresco.url</filename>
<!-- Change 'localhost' to the name or IP of the Alfresco server -->
<webpath>http://localhost:8080/alfresco/</webpath>
</urlFile>
</filesystem>
</filesystems>
</config>
<!-- Allow guest access to file systems -->

View File

@@ -126,15 +126,6 @@
<bean id="on-property-update-trigger" class="org.alfresco.repo.rule.ruletrigger.OnPropertyUpdateRuleTrigger" parent="rule-trigger-base">
</bean>
<bean id="on-delete-node-trigger" class="org.alfresco.repo.rule.ruletrigger.SingleChildAssocRefPolicyRuleTrigger" parent="rule-trigger-base">
<property name="policyName">
<value>onDeleteNode</value>
</property>
<property name="isClassBehaviour">
<value>true</value>
</property>
</bean>
<bean id="on-create-child-association-trigger" class="org.alfresco.repo.rule.ruletrigger.SingleChildAssocRefPolicyRuleTrigger" parent="rule-trigger-base">
<property name="policyName">
<value>onCreateChildAssociation</value>