RM-978 (Unable to navigate to copied folder from a collaboration site to RM site)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@94453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml

@@ -57,7 +57,7 @@
    </bean>
 
    <!-- dm model type -->
-   <bean id="dm.object" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.ObjectType" parent="rm.baseBehaviour"/>
+   <bean id="cm.object" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.CmObjectType" parent="rm.baseBehaviour"/>
 
    <!--  rma model types -->
 

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-version-context.xml

@@ -19,6 +19,7 @@
       <property name="relationshipService" ref="RelationshipService" />
       <property name="recordService" ref="RecordService" />
       <property name="modelSecurityService" ref="ModelSecurityService" />
+      <property name="cmObjectType" ref="cm.object" />
    </bean>
    <bean class="org.alfresco.util.BeanExtender">
       <property name="beanName" value="versionService" />

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/CmObjectType.java

@@ -42,15 +42,58 @@ import org.alfresco.service.namespace.QName;
 (
    defaultType = "cm:cmobject"
 )
-public class ObjectType extends BaseBehaviourBean implements NodeServicePolicies.OnMoveNodePolicy, CopyServicePolicies.BeforeCopyPolicy
+public class CmObjectType extends BaseBehaviourBean implements NodeServicePolicies.OnMoveNodePolicy, CopyServicePolicies.BeforeCopyPolicy
 {
+    /** Move behaviour name */
+    private static final String MOVE_BEHAVIOUR_NAME = "onMoveCmObjectType";
+
+    /** Copy behaviour name */
+    private static final String COPY_BEHAVIOUR_NAME = "onCopyCmObjectType";
+
+    /**
+     * Disable the move behaviour for this transaction
+     *
+     */
+    public void disableMove()
+    {
+        getBehaviour(MOVE_BEHAVIOUR_NAME).disable();
+    }
+
+    /**
+     * Enable the move behaviour for this transaction
+     *
+     */
+    public void enableMove()
+    {
+        getBehaviour(MOVE_BEHAVIOUR_NAME).enable();
+    }
+
+    /**
+     * Disable the copy behaviour for this transaction
+     *
+     */
+    public void disableCopy()
+    {
+        getBehaviour(COPY_BEHAVIOUR_NAME).disable();
+    }
+
+    /**
+     * Enable the copy behaviour for this transaction
+     *
+     */
+    public void enableCopy()
+    {
+        getBehaviour(COPY_BEHAVIOUR_NAME).enable();
+    }
+
     /**
      * @see org.alfresco.repo.node.NodeServicePolicies.OnMoveNodePolicy#onMoveNode(org.alfresco.service.cmr.repository.ChildAssociationRef, org.alfresco.service.cmr.repository.ChildAssociationRef)
      */
     @Override
     @Behaviour
     (
-       kind = BehaviourKind.CLASS
+       kind = BehaviourKind.CLASS,
+       name = MOVE_BEHAVIOUR_NAME
     )
     public void onMoveNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef)
     {
@@ -92,11 +135,11 @@ public class ObjectType extends BaseBehaviourBean implements NodeServicePolicies
     @Override
     @Behaviour
     (
-       kind = BehaviourKind.CLASS
+       kind = BehaviourKind.CLASS,
+       name = COPY_BEHAVIOUR_NAME
     )
     public void beforeCopy(QName classRef, NodeRef sourceNodeRef, NodeRef targetNodeRef)
     {
-        /*
         mandatory("sourceNodeRef", sourceNodeRef);
         mandatory("targetNodeRef", targetNodeRef);
 
@@ -118,6 +161,5 @@ public class ObjectType extends BaseBehaviourBean implements NodeServicePolicies
         {
             throw new AlfrescoRuntimeException("Nothing can be copied from a collaboration site into a RM site.");
         }
-        */
     }
 }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java

@@ -29,6 +29,7 @@ import java.util.Map;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
+import org.alfresco.module.org_alfresco_module_rm.model.rma.type.CmObjectType;
 import org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
 import org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipService;
@@ -83,6 +84,9 @@ public class RecordableVersionServiceImpl extends    Version2ServiceImpl
     /** model security service */
     private ModelSecurityService modelSecurityService;
 
+    /** cm object type */
+    private CmObjectType cmObjectType;
+
     /**
      * @param filePlanService   file plan service
      */
@@ -123,6 +127,14 @@ public class RecordableVersionServiceImpl extends    Version2ServiceImpl
         this.modelSecurityService = modelSecurityService;
     }
 
+    /**
+     * @param cmObjectType the cmObjectType to set
+     */
+    public void setCmObjectType(CmObjectType cmObjectType)
+    {
+        this.cmObjectType = cmObjectType;
+    }
+
     /**
      * @see org.alfresco.repo.version.Version2ServiceImpl#createVersion(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, int)
      */
@@ -304,6 +316,9 @@ public class RecordableVersionServiceImpl extends    Version2ServiceImpl
             // create a copy of the source node and place in the file plan
             final NodeRef nodeRef = (NodeRef)standardVersionProperties.get(Version2Model.PROP_QNAME_FROZEN_NODE_REF);
 
+            cmObjectType.disableCopy();
+            try
+            {
                 // create record
                 final NodeRef record = recordService.createRecordFromCopy(filePlan, nodeRef);
 
@@ -342,6 +357,11 @@ public class RecordableVersionServiceImpl extends    Version2ServiceImpl
                 freezeAuditableAspect(nodeRef, versionNodeRef);
             }
             finally
+            {
+                cmObjectType.enableCopy();
+            }
+        }
+        finally
         {
             // enable model security check
             modelSecurityService.enable();

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java

@@ -43,8 +43,8 @@ import org.junit.runners.Suite.SuiteClasses;
     RM994Test.class,
     RM1039Test.class,
     RM1799Test.class,
-    RM1814Test.class/*,
+    RM1814Test.class,
-    RM978Test.class*/
+    RM978Test.class
 })
 public class IssueTestSuite
 {

rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java

@@ -38,6 +38,7 @@ import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.hold.HoldService;
 import org.alfresco.module.org_alfresco_module_rm.identifier.IdentifierService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
+import org.alfresco.module.org_alfresco_module_rm.model.rma.type.CmObjectType;
 import org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
 import org.alfresco.module.org_alfresco_module_rm.recordableversion.RecordableVersionConfigService;
@@ -124,6 +125,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
     @Mock(name="extendedPermissionService")      protected ExtendedPermissionService    mockedExtendedPermissionService;
     @Mock(name="extendedSecurityService")        protected ExtendedSecurityService      mockedExtendedSecurityService;
     @Mock(name="recordableVersionConfigService") protected RecordableVersionConfigService mockedRecordableVersionConfigService;
+    @Mock(name="cmObjectType")                   protected CmObjectType                 cmObjectType;
 
     /** application context mock */
     @Mock(name="applicationContext")             protected ApplicationContext           mockedApplicationContext;