Merge pull request #95 from stephenc/jenkins-34691

[JENKINS-34691] Adopt proposed veto mechanism
jenkinsci · Mar 15, 2017 · f4ffb3e · f4ffb3e
2 parents d7f50ea + 7b2dafd
commit f4ffb3e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -44,6 +44,7 @@
 import hudson.model.Cause;
 import hudson.model.CauseAction;
 import hudson.model.Descriptor;
+import hudson.model.Failure;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
 import hudson.model.Items;
@@ -54,6 +55,7 @@
 import hudson.model.TaskListener;
 import hudson.model.TopLevelItem;
 import hudson.model.View;
+import hudson.model.listeners.ItemListener;
 import hudson.model.listeners.SaveableListener;
 import hudson.scm.PollingResult;
 import hudson.security.ACL;
@@ -2229,4 +2231,18 @@ public final XmlFile getStateFile() {
             return new XmlFile(Items.XSTREAM, new File(owner.getRootDir(), "state.xml"));
         }
     }
+
+    /**
+     * Veto attempts to copy branch projects outside of their multibranch container. Only works on Jenkins core
+     * versions with JENKINS-34691 merged.
+     */
+    @Extension
+    public static class CopyItemVeto extends ItemListener {
+        //@Override // TODO once Jenkins 2.51+ which has JENKINS-34691 merged
+        public void onCheckCopy(Item item, ItemGroup parent) throws Failure {
+            if (item.getParent() instanceof MultiBranchProject) {
+                throw new Failure(Messages.MultiBranchProject_CopyItemVeto_reason());
+            }
+        }
+    }
 }
diff --git a/src/main/resources/jenkins/branch/Messages.properties b/src/main/resources/jenkins/branch/Messages.properties
@@ -41,6 +41,7 @@ RateLimitBranchProperty.duration.week=Week
 RateLimitBranchProperty.duration.month=Month
 RateLimitBranchProperty.duration.year=Year
 MultiBranchProject.BranchIndexing.displayName=Scan {0}
+MultiBranchProject.CopyItemVeto.reason=Copying branch projects outside of their multi-branch container is not supported.
 OrganizationFolder.OrganizationScan.displayName=Scan {0}
 OrganizationFolder.DefaultPronoun=Organization
 OrganizationFolder.DefaultProject=Multibranch