Merge pull request #33 from recena/JENKINS-31162

Support for Item categorization in Jenkins 2
jenkinsci · Mar 22, 2016 · 79490b4 · 79490b4
2 parents 3628523 + 420f904
commit 79490b4
Show file tree

Hide file tree

Showing 48 changed files with 115 additions and 498 deletions.
diff --git a/src/main/java/hudson/matrix/MatrixProject.java b/src/main/java/hudson/matrix/MatrixProject.java
@@ -991,10 +991,44 @@ public DescriptorImpl getDescriptor() {
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
     public static final class DescriptorImpl extends AbstractProjectDescriptor {
+
         public String getDisplayName() {
             return Messages.MatrixProject_DisplayName();
         }
 
+        /**
+         * Needed if it wants Matrix projects are categorized in Jenkins 2.x.
+         *
+         * TODO: After Jenkins 2.0 this should be an @Override
+         *
+         * @return A string it represents a ItemCategory identifier.
+         */
+        public String getCategoryId() {
+            return "standaloneprojects";
+        }
+
+        /**
+         * Needed if it wants Matrix projects are categorized in Jenkins 2.x.
+         *
+         * TODO: After Jenkins 2.0 this should be an @Override
+         *
+         * @return A string with the Item description.
+         */
+        public String getDescription() {
+            return Messages.MatrixProject_Description();
+        }
+
+        /**
+         * Needed if it wants Matrix projects are categorized in Jenkins 2.x.
+         *
+         * TODO: After Jenkins 2.0 this should be an @Override
+         *
+         * @return A string it represents a URL pattern to get the Item icon in different sizes.
+         */
+        public String getIconFilePathPattern() {
+            return "plugin/matrix-project/images/:size/matrixproject.png";
+        }
+
         public MatrixProject newInstance(ItemGroup parent, String name) {
             return new MatrixProject(parent,name);
         }

diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly b/src/main/resources/hudson/matrix/MatrixProject/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/matrix/MatrixProject/newJobDetail.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ar.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ar.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_da.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_da.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_de.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_de.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_es.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_es.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_et.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_et.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fi.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fi.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fr.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fr.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_hi_IN.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_hi_IN.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_it.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_it.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ja.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ja.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ko.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ko.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nb_NO.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nb_NO.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nl.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nl.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pl.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pl.properties
diff --git a/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties b/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties