Merged up to HEAD.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-06-16 19:18:30 +00:00
parent 936f6d7021
commit 7f79a2a498
118 changed files with 14354 additions and 843 deletions

View File

@@ -915,6 +915,7 @@
<list>
<idref local="FileFolderService_transaction" />
<idref local="exceptionTranslator" />
<idref bean="FileFolderService_security" />
</list>
</property>
</bean>