Heinous merge from HEAD. Seems to basically work. Be on guard however.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-10-18 02:24:36 +00:00
parent 6441f470f5
commit 111296d4dc
156 changed files with 18940 additions and 14167 deletions

View File

@@ -57,7 +57,7 @@
<property name="contentService"><ref bean="ContentService" /></property>
<property name="permissionService"><ref bean="permissionService"/></property>
<property name="authenticationComponent"><ref bean="authenticationComponent"/></property>
<property name="checkInOutService"><ref bean="checkOutCheckInService"/></property>
<property name="serviceRegistry"><ref bean="ServiceRegistry"/></property>
</bean>
<bean id="cifsHelper" class="org.alfresco.filesys.smb.server.repo.CifsHelper">