[FIXED JENKINS-37392] Added @symbols to Extensions.

jenkinsci · Aug 14, 2016 · 0799987 · 0799987
1 parent 2ef42f1
commit 0799987
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,6 +49,14 @@
         <tag>msbuild-1.26</tag>
     </scm>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>structs</artifactId>
+            <version>1.3</version>
+        </dependency>
+    </dependencies>
+
     <repositories>
         <repository>
             <id>repo.jenkins-ci.org</id>

diff --git a/src/main/java/hudson/plugins/msbuild/MSBuildErrorNote.java b/src/main/java/hudson/plugins/msbuild/MSBuildErrorNote.java
@@ -5,6 +5,8 @@
 import hudson.console.ConsoleAnnotationDescriptor;
 import hudson.console.ConsoleAnnotator;
 import hudson.console.ConsoleNote;
+import org.jenkinsci.Symbol;
+
 import java.util.regex.Pattern;
 
 /**
@@ -23,7 +25,7 @@ public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
         return null;
     }
 
-    @Extension
+    @Extension @Symbol("msbuildError")
     public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
 
         public String getDisplayName() {

diff --git a/src/main/java/hudson/plugins/msbuild/MSBuildWarningNote.java b/src/main/java/hudson/plugins/msbuild/MSBuildWarningNote.java
@@ -5,6 +5,8 @@
 import hudson.console.ConsoleAnnotationDescriptor;
 import hudson.console.ConsoleAnnotator;
 import hudson.console.ConsoleNote;
+import org.jenkinsci.Symbol;
+
 import java.util.regex.Pattern;
 
 /**
@@ -23,7 +25,7 @@ public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
         return null;
     }
 
-    @Extension
+    @Extension @Symbol("msbuildWarning")
     public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
 
         public String getDisplayName() {

diff --git a/src/main/java/hudson/plugins/msbuild/MsBuildBuilder.java b/src/main/java/hudson/plugins/msbuild/MsBuildBuilder.java
@@ -29,6 +29,7 @@
 import hudson.tasks.Builder;
 import hudson.tools.ToolInstallation;
 import hudson.util.ArgumentListBuilder;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.IOException;
@@ -281,7 +282,7 @@ static String[] tokenizeArgs(String args) {
         return tokenize;
     }
 
-    @Extension
+    @Extension @Symbol("msbuild")
     public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
         @CopyOnWrite
         private volatile MsBuildInstallation[] installations = new MsBuildInstallation[0];

diff --git a/src/main/java/hudson/plugins/msbuild/MsBuildInstallation.java b/src/main/java/hudson/plugins/msbuild/MsBuildInstallation.java
@@ -33,6 +33,7 @@
 import hudson.tools.ToolDescriptor;
 import hudson.tools.ToolInstallation;
 import jenkins.model.Jenkins;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.IOException;
@@ -62,7 +63,7 @@ public String getDefaultArgs() {
         return this.defaultArgs;
     }
 
-    @Extension
+    @Extension @Symbol("msbuild")
     public static class DescriptorImpl extends ToolDescriptor<MsBuildInstallation> {
 
         public String getDisplayName() {

diff --git a/src/main/java/hudson/plugins/msbuild/MsBuildKillingVeto.java b/src/main/java/hudson/plugins/msbuild/MsBuildKillingVeto.java
@@ -30,6 +30,7 @@
 import java.util.List;
 
 import org.apache.commons.io.FilenameUtils;
+import org.jenkinsci.Symbol;
 
 /**
  * An extension that avoids mspdbsrv.exe being killed by Jenkins.
@@ -40,7 +41,7 @@
  * 
  * @author Daniel Weber &lt;daniel.weber.dev@gmail.com&gt;
  */
-@Extension(optional = true)
+@Extension(optional = true) @Symbol("msbuildKillingVeto")
 public class MsBuildKillingVeto extends ProcessKillingVeto {
     private static final VetoCause VETO_CAUSE = new VetoCause("MSBuild Plugin vetoes killing mspdbsrv.exe, see JENKINS-9104 for all the details");