Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository In directory james.mmbase.org:/tmp/cvs-serv19227
Modified Files: RepositoryUtil.java Log Message: CMSC-1298 Clone channel feature See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository See also: http://www.mmbase.org/jira/browse/CMSC-1298 Index: RepositoryUtil.java =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v retrieving revision 1.42 retrieving revision 1.43 diff -u -b -r1.42 -r1.43 --- RepositoryUtil.java 20 Mar 2009 08:24:20 -0000 1.42 +++ RepositoryUtil.java 20 Mar 2009 10:13:20 -0000 1.43 @@ -1476,11 +1476,6 @@ continue; } - if (!isChannel(rel.getDestination()) && !isRelatedWithCurrentChannelTree(rel.getDestination(),channels)) { - output.append("skipped " + relManager.getName() + "; "); - continue; //Skip nodes not in the current channel tree. - } - if (isChannel(rel.getDestination()) || relManager.getName().equalsIgnoreCase("deletionrel") // || relManager.getName().equalsIgnoreCase("creationrel") @@ -1491,7 +1486,12 @@ else if (rel.getNodeManager().getName().equals(ContentElementUtil.OWNERREL)) { CloneUtil.cloneRelations(sourceNode, destNode, ContentElementUtil.OWNERREL, SecurityUtil.USER); output.append(ContentElementUtil.OWNERREL + " copied;"); - } else + } + else if (!isRelatedWithCurrentChannelTree(rel.getDestination(),channels)) { + output.append("skipped " + relManager.getName() + "; "); + continue; //Skip nodes not in the current channel tree. + } + else { //*** Start cloning the node from sourceChild -> destChild //If the related node should be cloned, dive into the node and deepcopy it _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs