Merged V1.3 to HEAD(3161:3179)

svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3161 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3179 .


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

source/java/org/alfresco/repo/node/TemporaryAspect.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.repo.node;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.copy.CopyServicePolicies;
+import org.alfresco.repo.policy.JavaBehaviour;
+import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.repo.policy.PolicyScope;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Registers and contains the behaviour specific to the
+ * {@link org.alfresco.model.ContentModel#ASPECT_TEMPORARY temporary aspect}.
+ * 
+ * @author gavinc
+ */
+public class TemporaryAspect implements CopyServicePolicies.OnCopyNodePolicy
+{
+    // Dependencies
+    private PolicyComponent policyComponent;
+
+    /**
+     * @param policyComponent the policy component to register behaviour with
+     */
+    public void setPolicyComponent(PolicyComponent policyComponent)
+    {
+        this.policyComponent = policyComponent;
+    }
+    
+    /**
+     * Initialise the Temporary Aspect
+     * <p>
+     * Ensures that the {@link ContentModel#ASPECT_TEMPORARY temporary aspect}
+     * copy behaviour is disabled when update copies are performed.
+     */
+    public void init()
+    {
+        // disable copy for referencable aspect
+        this.policyComponent.bindClassBehaviour(
+                QName.createQName(NamespaceService.ALFRESCO_URI, "onCopyNode"),
+                ContentModel.ASPECT_TEMPORARY,
+                new JavaBehaviour(this, "onCopyNode"));
+    }
+
+    /**
+     * Does nothing 
+     */
+    public void onCopyNode(
+            QName classRef,
+            NodeRef sourceNodeRef,
+            StoreRef destinationStoreRef,
+            boolean copyToNewNode,
+            PolicyScope copyDetails)
+    {
+        if (copyToNewNode)
+        {
+           copyDetails.addAspect(ContentModel.ASPECT_TEMPORARY);
+        }
+        else
+        {
+           // don't copy if this is an update operation
+        }
+    }
+}

source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java

@@ -645,10 +645,11 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
 
     public void deleteNode(NodeRef nodeRef)
     {
-    	boolean isArchivedNode = false;
+    	  boolean isArchivedNode = false;
+        boolean requiresDelete = false;
     	
-		// Invoke policy behaviours
-		invokeBeforeDeleteNode(nodeRef);
+		  // Invoke policy behaviours
+		  invokeBeforeDeleteNode(nodeRef);
 		
         // get the node
         Node node = getNodeNotNull(nodeRef);
@@ -659,11 +660,27 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         Set<QName> nodeAspectQNames = node.getAspects();
 
         // check if we need to archive the node
-        StoreRef storeRef = nodeRef.getStoreRef();
-        StoreRef archiveStoreRef = storeArchiveMap.getArchiveMap().get(storeRef);
-        // get the type and check if we need archiving
-        TypeDefinition typeDef = dictionaryService.getType(node.getTypeQName());
-        if (typeDef == null || !typeDef.isArchive() || archiveStoreRef == null)
+        StoreRef archiveStoreRef = null;
+        if (nodeAspectQNames.contains(ContentModel.ASPECT_TEMPORARY))
+        {
+           // the node has the temporary aspect meaning
+           // it can not be archived
+           requiresDelete = true;
+           isArchivedNode = false;
+        }
+        else
+        {
+           StoreRef storeRef = nodeRef.getStoreRef();
+           archiveStoreRef = storeArchiveMap.getArchiveMap().get(storeRef);
+           // get the type and check if we need archiving
+           TypeDefinition typeDef = dictionaryService.getType(node.getTypeQName());
+           if (typeDef == null || !typeDef.isArchive() || archiveStoreRef == null)
+           {
+              requiresDelete = true;
+           }
+        }
+           
+        if (requiresDelete)
         {
             // perform a normal deletion
             nodeDaoService.deleteNode(node, true);