Merge pull request #62 from recena/JENKINS-31162

Support for Item categorization in Jenkins 2
jenkinsci · Mar 22, 2016 · cc6027c · cc6027c
2 parents 7f69af5 + 6d6212d
commit cc6027c
Show file tree

Hide file tree

Showing 43 changed files with 214 additions and 628 deletions.
diff --git a/src/main/java/hudson/maven/MavenModuleSet.java b/src/main/java/hudson/maven/MavenModuleSet.java
@@ -1365,6 +1365,39 @@ public String getDisplayName() {
             return Messages.MavenModuleSet_DiplayName();
         }
 
+        /**
+         * Needed if it wants Maven projects are categorized in Jenkins 2.x.
+         *
+         * TODO: Override when the baseline is upgraded to 2.x
+         *
+         * @return A string it represents a ItemCategory identifier.
+         */
+        public String getCategoryId() {
+            return "standaloneprojects";
+        }
+
+        /**
+         * Needed if it wants Maven projects are categorized in Jenkins 2.x.
+         *
+         * TODO: Override when the baseline is upgraded to 2.x
+         *
+         * @return A string with the Item description.
+         */
+        public String getDescription() {
+            return Messages.MavenModuleSet_Description();
+        }
+
+        /**
+         * Needed if it wants Maven projects are categorized in Jenkins 2.x.
+         *
+         * TODO: Override when the baseline is upgraded to 2.x
+         *
+         * @return A string it represents a URL pattern to get the Item icon in different sizes.
+         */
+        public String getIconFilePathPattern() {
+            return "plugin/maven-plugin/images/:size/mavenmoduleset.png";
+        }
+
         public MavenModuleSet newInstance(ItemGroup parent, String name) {
             MavenModuleSet mms = new MavenModuleSet(parent,name);
             mms.setSettings(GlobalMavenConfig.get().getSettingsProvider());

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly
@@ -24,5 +24,5 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <div>
-  ${%body}
+  ${it.description}
 </div>
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_da.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_da.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_de.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_de.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_el.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_el.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_es.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_es.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fi.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fi.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fr.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fr.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_it.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_it.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ja.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ja.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ko.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ko.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_lv.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_lv.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nb_NO.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nb_NO.properties
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nl.properties b/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nl.properties