[FIXED JENKINS-12692] Choose the Artifact Archiver as the default pub…

…lisher to play (a little) nicer with Warnings
jenkinsci · Feb 14, 2012 · e1ba67f · e1ba67f
1 parent 224ddae
commit e1ba67f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java b/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java
@@ -34,6 +34,7 @@
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.Hudson;
+import hudson.tasks.ArtifactArchiver;
 import hudson.tasks.BuildStep;
 import org.jenkins_ci.plugins.run_condition.BuildStepRunner;
 import org.jenkins_ci.plugins.run_condition.RunCondition;
@@ -123,6 +124,10 @@ public List<? extends Descriptor<? extends BuildStep>> getAllowedPublishers() {
                                                                                                             .getAllowedPublishers(project);
         }
 
+        public Descriptor<? extends BuildStep> getDefaultPublisher() {
+            return Hudson.getInstance().getDescriptorByType(ArtifactArchiver.DescriptorImpl.class);
+        }
+
     }
 
 }
diff --git a/src/main/resources/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher/config.jelly b/src/main/resources/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher/config.jelly
@@ -37,7 +37,8 @@
     </f:entry>
     </f:advanced>
     <f:entry>
-        <f:dropdownDescriptorSelector title="${%publisher}" field="publisher" descriptors="${descriptor.allowedPublishers}"/>
+        <f:dropdownDescriptorSelector title="${%publisher}" field="publisher" descriptors="${descriptor.allowedPublishers}"
+                default="${descriptor.defaultPublisher}"/>
     </f:entry>
 
 </j:jelly>