Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/action/Action.java

@@ -29,6 +29,14 @@ import org.alfresco.service.cmr.repository.NodeRef;
  */
 public interface Action extends ParameterizedItem
 {
+    /**
+     * Gets the node ref that represents the saved action node.
+     * Returns null id unsaved.
+     * 
+     * @return  the action node reference
+     */
+    NodeRef getNodeRef();
+    
 	/**
 	 * Get the name of the action definition that relates to this action
 	 * 
@@ -63,16 +71,6 @@ public interface Action extends ParameterizedItem
 	 * @param description  the description of the action
 	 */
 	void setDescription(String description);
-    
-    /**
-     * Get the node reference of the node that 'owns' this action.
-     * <p>
-     * The node that 'owns' the action is th one that stores it via its
-     * actionable aspect association.
-     * 
-     * @return  node reference
-     */
-    NodeRef getOwningNodeRef();
 	
 	/**
 	 * Gets a value indicating whether the action should be executed asychronously or not.