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
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions

View File

@@ -46,9 +46,9 @@ public class CompositeActionImpl extends ActionImpl implements CompositeAction
*
* @param id the action id
*/
public CompositeActionImpl(String id, NodeRef owningNodeRef)
public CompositeActionImpl(NodeRef nodeRef, String id)
{
super(id, CompositeActionExecuter.NAME, owningNodeRef);
super(nodeRef, id, CompositeActionExecuter.NAME);
}
/**