Merged V2.2 to HEAD

7650: Merged V2.1 to V2.2
     7542: ML contribution fixes
     7545: Merged V2.0 to V2.1
        7544: Merged V1.4 to V2.0
           7338: Fix for potential time-based GUID issues
     7554: Fixed imports after library package change
     7582: WCM-967
     7584: Fixed dependecy list for SDK for jug-lgpl-2.0.0.jar
     7642: Fix for WCM-949

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-03-07 10:32:22 +00:00
parent f8d2a5d084
commit af5fd511b7
6 changed files with 328 additions and 392 deletions

View File

@@ -91,13 +91,13 @@
<!-- Edition service -->
<bean name="editionService" class="org.alfresco.repo.model.ml.EditionServiceImpl" >
<property name="nodeService">
<ref bean="NodeService" />
<ref bean="nodeService" />
</property>
<property name="versionService">
<ref bean="VersionService" />
<ref bean="versionService" />
</property>
<property name="multilingualContentService">
<ref bean="MultilingualContentService" />
<ref bean="multilingualContentService" />
</property>
<property name="versionNodeService">
<ref bean="versionNodeService" />
@@ -109,7 +109,7 @@
<ref bean="nodeArchiveService" />
</property>
<property name="fileFolderService">
<ref bean="FileFolderService" />
<ref bean="fileFolderService" />
</property>
</bean>