Fixed failing ML tests

- These worked on the branch a flaw showed up on HEAD
 - Moved ContentReader spoofing up into FileFolderService and ContentService using an interceptor.
Fixed bug when attempting to delete an archived item that was ML.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5768 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/model-specific-services-context.xml

@@ -36,6 +36,18 @@
          <ref bean="multilingualContentService"/>
       </property>
    </bean>
+
+   <bean id="mlContentInterceptor" class="org.alfresco.repo.model.ml.MLContentInterceptor" >
+      <property name="nodeService">
+         <ref bean="nodeService"/>
+      </property>
+      <property name="contentService">
+         <ref bean="contentService"/>
+      </property>
+      <property name="multilingualContentService">
+         <ref bean="multilingualContentService"/>
+      </property>
+   </bean>
     
    
    <bean name="tempFileMarkerInterceptor" class="org.alfresco.repo.model.filefolder.TempFileMarkerInterceptor">

config/alfresco/node-services-context.xml

@@ -5,12 +5,9 @@
 <beans>
    
    <bean id="mlPropertyInterceptor" class="org.alfresco.repo.node.MLPropertyInterceptor">
-      <property name="directNodeService">
+      <property name="nodeService">
          <ref bean="mlAwareNodeService" />
       </property>
-      <property name="directMultilingualContentService">
-         <ref bean="multilingualContentService" />
-      </property>
       <property name="dictionaryService">
          <ref bean="dictionaryService" />
       </property>

config/alfresco/public-services-context.xml

@@ -105,6 +105,7 @@
                 <idref local="ContentService_transaction"/>
                 <idref local="AuditMethodInterceptor"/>
                 <idref local="exceptionTranslator"/>
+                <idref bean="mlContentInterceptor"/>
                 <idref bean="ContentService_security"/>
             </list>
         </property>
@@ -676,20 +677,12 @@
                 <idref local="exceptionTranslator"/>
                 <idref bean="FileFolderService_security"/>
                 <idref bean="mlTranslationInterceptor"/>
+                <idref bean="mlContentInterceptor"/>
                 <idref bean="tempFileMarkerInterceptor"/>
             </list>
         </property>
     </bean>
     
-    <bean id="mlTranslationInterceptor" class="org.alfresco.repo.node.MLTranslationInterceptor">
-        <property name="nodeService">
-            <ref bean="nodeService"/>
-        </property>
-        <property name="multilingualContentService">
-            <ref bean="multilingualContentService"/>
-        </property>
-    </bean>
-    
     <bean id="FileFolderService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
         <property name="transactionManager">
             <ref bean="transactionManager"/>