From 7eeb79ed439c229a15855f8eb5ac2e6269d17ab5 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 29 Nov 2012 10:17:53 +0100 Subject: [PATCH] support hierarchical ItemGroup on CLI copy --- .../main/java/hudson/cli/CopyJobCommand.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/cli/CopyJobCommand.java b/core/src/main/java/hudson/cli/CopyJobCommand.java index f3136f3b07..a8049bdf28 100644 --- a/core/src/main/java/hudson/cli/CopyJobCommand.java +++ b/core/src/main/java/hudson/cli/CopyJobCommand.java @@ -27,6 +27,7 @@ import jenkins.model.Jenkins; import hudson.model.TopLevelItem; import hudson.Extension; import hudson.model.Item; +import jenkins.model.ModifiableTopLevelItemGroup; import org.kohsuke.args4j.Argument; @@ -49,15 +50,32 @@ public class CopyJobCommand extends CLICommand { public String dst; protected int run() throws Exception { - Jenkins h = Jenkins.getInstance(); - h.checkPermission(Item.CREATE); + Jenkins jenkins = Jenkins.getInstance(); + jenkins.checkPermission(Item.CREATE); - if (h.getItem(dst)!=null) { + if (jenkins.getItemByFullName(dst)!=null) { stderr.println("Job '"+dst+"' already exists"); return -1; } - - h.copy(src,dst); + + ModifiableTopLevelItemGroup ig = jenkins; + int i = dst.lastIndexOf('/'); + if (i > 0) { + String group = dst.substring(0, i); + Item item = jenkins.getItemByFullName(group); + if (item == null) { + throw new IllegalArgumentException("Unknown ItemGroup " + group); + } + + if (item instanceof ModifiableTopLevelItemGroup) { + ig = (ModifiableTopLevelItemGroup) item; + } else { + throw new IllegalArgumentException("Can't create job from CLI in " + group); + } + dst = dst.substring(i + 1); + } + + ig.copy(src,dst); return 0; } }