[JENKINS-22888] Use adjuncts, and prepare for compatibility with summ…

…ary_report-plugin
jenkinsci · Sep 16, 2015 · d7da1ca · d7da1ca
1 parent 8128c33
commit d7da1ca
Show file tree

Hide file tree

Showing 45 changed files with 38 additions and 155 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.424</version><!-- which version of Jenkins is this plugin built against? -->
+    <version>1.580.3</version><!-- which version of Jenkins is this plugin built against? -->
   </parent>
 
   <groupId>com.tupilabs.image_gallery</groupId>
@@ -38,6 +38,12 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+
+  <scm>
+    <url>http://github.com/jenkinsci/image-gallery-plugin</url>
+    <connection>scm:git:git://github.com/jenkinsci/image-gallery-plugin.git</connection>
+    <developerConnection>scm:git:git@github.com:jenkinsci/image-gallery-plugin.git</developerConnection>
+  </scm>
 
   <licenses>
     <license>
@@ -62,144 +68,13 @@
     </pluginRepository>
   </pluginRepositories>
 
-  <build>
-    <pluginManagement>
-        <plugins>
-            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-            <plugin>
-                <groupId>org.eclipse.m2e</groupId>
-                <artifactId>lifecycle-mapping</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <lifecycleMappingMetadata>
-                        <pluginExecutions>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>com.cloudbees</groupId>
-                                    <artifactId>
-                                        maven-license-plugin
-                                    </artifactId>
-                                    <versionRange>
-                                        [1.6,)
-                                    </versionRange>
-                                    <goals>
-                                        <goal>process</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore />
-                                </action>
-                            </pluginExecution>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>
-                                        org.apache.maven.plugins
-                                    </groupId>
-                                    <artifactId>
-                                        maven-enforcer-plugin
-                                    </artifactId>
-                                    <versionRange>
-                                        [1.0,)
-                                    </versionRange>
-                                    <goals>
-                                        <goal>display-info</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore />
-                                </action>
-                            </pluginExecution>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>
-                                        org.codehaus.gmaven
-                                    </groupId>
-                                    <artifactId>
-                                        gmaven-plugin
-                                    </artifactId>
-                                    <versionRange>
-                                        [1.3,)
-                                    </versionRange>
-                                    <goals>
-                                        <goal>generateTestStubs</goal>
-                                        <goal>testCompile</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore />
-                                </action>
-                            </pluginExecution>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>
-                                        org.jenkins-ci.tools
-                                    </groupId>
-                                    <artifactId>
-                                        maven-hpi-plugin
-                                    </artifactId>
-                                    <versionRange>
-                                        [1.74,)
-                                    </versionRange>
-                                    <goals>
-                                        <goal>insert-test</goal>
-                                        <goal>
-                                            resolve-test-dependencies
-                                        </goal>
-                                        <goal>test-hpl</goal>
-                                        <goal>validate</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore />
-                                </action>
-                            </pluginExecution>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>
-                                        org.jvnet.localizer
-                                    </groupId>
-                                    <artifactId>
-                                        maven-localizer-plugin
-                                    </artifactId>
-                                    <versionRange>
-                                        [1.12,)
-                                    </versionRange>
-                                    <goals>
-                                        <goal>generate</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore />
-                                </action>
-                            </pluginExecution>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>org.kohsuke</groupId>
-                                    <artifactId>
-                                        access-modifier-checker
-                                    </artifactId>
-                                    <versionRange>
-                                        [1.0,)
-                                    </versionRange>
-                                    <goals>
-                                        <goal>enforce</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore />
-                                </action>
-                            </pluginExecution>
-                        </pluginExecutions>
-                    </lifecycleMappingMetadata>
-                </configuration>
-            </plugin>
-        </plugins>
-    </pluginManagement>
-  </build>
+  <dependencies>
+    <!-- JQuery is included only once -->
+    <dependency>
+        <groupId>org.kohsuke.stapler</groupId>
+        <artifactId>stapler-adjunct-jquery</artifactId>
+        <version>1.8.3-0</version>
+    </dependency>
+  </dependencies>
 
-  <scm>
-  	<url>http://github.com/jenkinsci/image-gallery-plugin</url>
-  	<connection>scm:git:git://github.com/jenkinsci/image-gallery-plugin.git</connection>
-  	<developerConnection>scm:git:git@github.com:jenkinsci/image-gallery-plugin.git</developerConnection>
-  </scm>
 </project>
diff --git a/...java/org/jenkinsci/plugins/imagegallery/comparative/ComparativeArchivedImagesGallery.java b/...java/org/jenkinsci/plugins/imagegallery/comparative/ComparativeArchivedImagesGallery.java
@@ -28,7 +28,6 @@
 
 import org.jenkinsci.plugins.imagegallery.AbstractArchivedImagesGallery;
 import org.jenkinsci.plugins.imagegallery.ImageGalleryDescriptor;
-import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -97,7 +96,6 @@ public ComparativeArchivedImagesGallery(String title, String baseRootFolder, Int
      * @param imageInnerWidth
      * @param markBuildAsUnstableIfNoArchivesFound
      */
-	@DataBoundConstructor
     public ComparativeArchivedImagesGallery(String title, String baseRootFolder, String imageWidth, String imageInnerWidth,
                                                     boolean markBuildAsUnstableIfNoArchivesFound) {
         super(title, imageWidth, markBuildAsUnstableIfNoArchivesFound);

diff --git a/...kinsci/plugins/imagegallery/comparative/ComparativeImagesGalleryBuildAction/summary.jelly b/...kinsci/plugins/imagegallery/comparative/ComparativeImagesGalleryBuildAction/summary.jelly
@@ -1,7 +1,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:local="local">
-    <script type="text/javascript" src="${rootURL}/plugin/image-gallery/js/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="${rootURL}/plugin/image-gallery/js/jquery.colorbox.js"></script>
-    <script type="text/javascript" src="${rootURL}/plugin/image-gallery/js/jquery.jstree.js"></script>
+    <st:adjunct includes="org.kohsuke.stapler.jquery"/>
+    <st:adjunct includes="org.jenkinsci.plugins.imagegallery.stapler.colorbox"/>
+    <st:adjunct includes="org.jenkinsci.plugins.imagegallery.stapler.jstree"/>
     <script type="text/javascript">
     jQuery.noConflict();
     jQuery(document).ready(function(){
@@ -29,8 +29,6 @@
 
         });
     </script>
-    <link href="${rootURL}/plugin/image-gallery/css/colorbox.css" type="text/css" rel="stylesheet" />
-    <link href="${rootURL}/plugin/image-gallery/css/plugin.css" type="text/css" rel="stylesheet" />
     <h3>${from.title}</h3>
     <div class="comparative-gallery-tree">
         <ul>

diff --git a/...enkinsci/plugins/imagegallery/imagegallery/ArchivedImagesGalleryBuildAction/summary.jelly b/...enkinsci/plugins/imagegallery/imagegallery/ArchivedImagesGalleryBuildAction/summary.jelly
@@ -1,6 +1,6 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:local="local">
-    <script type="text/javascript" src="${rootURL}/plugin/image-gallery/js/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="${rootURL}/plugin/image-gallery/js/jquery.colorbox.js"></script>
+    <st:adjunct includes="org.kohsuke.stapler.jquery"/>
+    <st:adjunct includes="org.jenkinsci.plugins.imagegallery.stapler.colorbox"/>
     <script type="text/javascript">
     jQuery.noConflict();
     jQuery(document).ready(function(){
@@ -13,8 +13,6 @@
       });
     });
     </script>
-    <link href="${rootURL}/plugin/image-gallery/css/colorbox.css" type="text/css" rel="stylesheet" />
-    <link href="${rootURL}/plugin/image-gallery/css/plugin.css" type="text/css" rel="stylesheet" />
     <h2>${from.title}</h2>
     <j:forEach items="${from.images}" var="i" varStatus="st">
         <a class='gallery' href="artifact/${i}" title="${i}">

diff --git a/...ugins/imagegallery/imagegallery/ComparativeArchivedImagesGalleryBuildAction/summary.jelly b/...ugins/imagegallery/imagegallery/ComparativeArchivedImagesGalleryBuildAction/summary.jelly
@@ -1,6 +1,6 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:local="local">
-    <script type="text/javascript" src="${rootURL}/plugin/image-gallery/js/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="${rootURL}/plugin/image-gallery/js/jquery.colorbox.js"></script>
+    <st:adjunct includes="org.kohsuke.stapler.jquery"/>
+    <st:adjunct includes="org.jenkinsci.plugins.imagegallery.stapler.colorbox"/>
     <script type="text/javascript">
     jQuery.noConflict();
     jQuery(document).ready(function(){
@@ -21,8 +21,6 @@
       });
     });
     </script>
-    <link href="${rootURL}/plugin/image-gallery/css/colorbox.css" type="text/css" rel="stylesheet" />
-    <link href="${rootURL}/plugin/image-gallery/css/plugin.css" type="text/css" rel="stylesheet" />
     <h2>${from.title}</h2>
     <j:forEach items="${from.images}" var="i" varStatus="st">
     	<div><h4>Compared images : ${i.key}</h4>

diff --git a/src/main/resources/org/jenkinsci/plugins/imagegallery/stapler/colorbox.jelly b/src/main/resources/org/jenkinsci/plugins/imagegallery/stapler/colorbox.jelly
@@ -0,0 +1,8 @@
+<!--
+Use it like <st:adjunct includes="org.jenkinsci.plugins.imagegallery.stapler.colorbox"/>
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+  <st:adjunct includes="org.kohsuke.stapler.jquery"/>
+  <script src="${it.packageUrl}/colorbox/js/jquery.colorbox.js" type="text/javascript"></script>
+  <link href="${it.packageUrl}/colorbox/css/colorbox.css" type="text/css" rel="stylesheet" />
+</j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/imagegallery/stapler/colorbox/css/.Rhistory b/src/main/resources/org/jenkinsci/plugins/imagegallery/stapler/colorbox/css/.Rhistory
diff --git a/src/main/webapp/css/colorbox.css → ...gallery/stapler/colorbox/css/colorbox.css b/src/main/webapp/css/colorbox.css → ...gallery/stapler/colorbox/css/colorbox.css
diff --git a/src/main/webapp/css/images/border.png → ...ry/stapler/colorbox/css/images/border.png b/src/main/webapp/css/images/border.png → ...ry/stapler/colorbox/css/images/border.png
diff --git a/src/main/webapp/css/images/controls.png → .../stapler/colorbox/css/images/controls.png b/src/main/webapp/css/images/controls.png → .../stapler/colorbox/css/images/controls.png
diff --git a/...app/css/images/ie6/borderBottomCenter.png → ...box/css/images/ie6/borderBottomCenter.png b/...app/css/images/ie6/borderBottomCenter.png → ...box/css/images/ie6/borderBottomCenter.png
diff --git a/...ebapp/css/images/ie6/borderBottomLeft.png → ...orbox/css/images/ie6/borderBottomLeft.png b/...ebapp/css/images/ie6/borderBottomLeft.png → ...orbox/css/images/ie6/borderBottomLeft.png
diff --git a/...bapp/css/images/ie6/borderBottomRight.png → ...rbox/css/images/ie6/borderBottomRight.png b/...bapp/css/images/ie6/borderBottomRight.png → ...rbox/css/images/ie6/borderBottomRight.png
diff --git a/...ebapp/css/images/ie6/borderMiddleLeft.png → ...orbox/css/images/ie6/borderMiddleLeft.png b/...ebapp/css/images/ie6/borderMiddleLeft.png → ...orbox/css/images/ie6/borderMiddleLeft.png
diff --git a/...bapp/css/images/ie6/borderMiddleRight.png → ...rbox/css/images/ie6/borderMiddleRight.png b/...bapp/css/images/ie6/borderMiddleRight.png → ...rbox/css/images/ie6/borderMiddleRight.png
diff --git a/...webapp/css/images/ie6/borderTopCenter.png → ...lorbox/css/images/ie6/borderTopCenter.png b/...webapp/css/images/ie6/borderTopCenter.png → ...lorbox/css/images/ie6/borderTopCenter.png
diff --git a/...n/webapp/css/images/ie6/borderTopLeft.png → ...colorbox/css/images/ie6/borderTopLeft.png b/...n/webapp/css/images/ie6/borderTopLeft.png → ...colorbox/css/images/ie6/borderTopLeft.png
diff --git a/.../webapp/css/images/ie6/borderTopRight.png → ...olorbox/css/images/ie6/borderTopRight.png b/.../webapp/css/images/ie6/borderTopRight.png → ...olorbox/css/images/ie6/borderTopRight.png
diff --git a/src/main/webapp/css/images/loading.gif → ...y/stapler/colorbox/css/images/loading.gif b/src/main/webapp/css/images/loading.gif → ...y/stapler/colorbox/css/images/loading.gif
diff --git a/.../webapp/css/images/loading_background.png → ...olorbox/css/images/loading_background.png b/.../webapp/css/images/loading_background.png → ...olorbox/css/images/loading_background.png
diff --git a/src/main/webapp/css/images/overlay.png → ...y/stapler/colorbox/css/images/overlay.png b/src/main/webapp/css/images/overlay.png → ...y/stapler/colorbox/css/images/overlay.png
diff --git a/src/main/webapp/js/jquery-1.7.2.min.js → ...y/stapler/colorbox/js/jquery-1.7.2.min.js b/src/main/webapp/js/jquery-1.7.2.min.js → ...y/stapler/colorbox/js/jquery-1.7.2.min.js
diff --git a/src/main/webapp/js/jquery.colorbox.js → ...ry/stapler/colorbox/js/jquery.colorbox.js b/src/main/webapp/js/jquery.colorbox.js → ...ry/stapler/colorbox/js/jquery.colorbox.js
diff --git a/src/main/resources/org/jenkinsci/plugins/imagegallery/stapler/jstree.jelly b/src/main/resources/org/jenkinsci/plugins/imagegallery/stapler/jstree.jelly
@@ -0,0 +1,8 @@
+<!--
+Use it like <st:adjunct includes="org.jenkinsci.plugins.imagegallery.stapler.jstree"/>
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+  <st:adjunct includes="org.kohsuke.stapler.jquery"/>
+  <script src="${it.packageUrl}/jstree/js/jquery.jstree.js" type="text/javascript"></script>
+  <link href="${it.packageUrl}/jstree/css/plugin.css" type="text/css" rel="stylesheet" />
+</j:jelly>
diff --git a/src/main/webapp/css/plugin.css → ...magegallery/stapler/jstree/css/plugin.css b/src/main/webapp/css/plugin.css → ...magegallery/stapler/jstree/css/plugin.css
diff --git a/src/main/webapp/js/jquery.jstree.js → ...allery/stapler/jstree/js/jquery.jstree.js b/src/main/webapp/js/jquery.jstree.js → ...allery/stapler/jstree/js/jquery.jstree.js
diff --git a/src/main/webapp/js/themes/apple/bg.jpg → ...ery/stapler/jstree/js/themes/apple/bg.jpg b/src/main/webapp/js/themes/apple/bg.jpg → ...ery/stapler/jstree/js/themes/apple/bg.jpg
diff --git a/src/main/webapp/js/themes/apple/d.png → ...lery/stapler/jstree/js/themes/apple/d.png b/src/main/webapp/js/themes/apple/d.png → ...lery/stapler/jstree/js/themes/apple/d.png
diff --git a/...ain/webapp/js/themes/apple/dot_for_ie.gif → ...ler/jstree/js/themes/apple/dot_for_ie.gif b/...ain/webapp/js/themes/apple/dot_for_ie.gif → ...ler/jstree/js/themes/apple/dot_for_ie.gif
diff --git a/src/main/webapp/js/themes/apple/style.css → .../stapler/jstree/js/themes/apple/style.css b/src/main/webapp/js/themes/apple/style.css → .../stapler/jstree/js/themes/apple/style.css
diff --git a/src/main/webapp/js/themes/apple/throbber.gif → ...apler/jstree/js/themes/apple/throbber.gif b/src/main/webapp/js/themes/apple/throbber.gif → ...apler/jstree/js/themes/apple/throbber.gif
diff --git a/src/main/webapp/js/themes/classic/d.gif → ...ry/stapler/jstree/js/themes/classic/d.gif b/src/main/webapp/js/themes/classic/d.gif → ...ry/stapler/jstree/js/themes/classic/d.gif
diff --git a/src/main/webapp/js/themes/classic/d.png → ...ry/stapler/jstree/js/themes/classic/d.png b/src/main/webapp/js/themes/classic/d.png → ...ry/stapler/jstree/js/themes/classic/d.png
diff --git a/...n/webapp/js/themes/classic/dot_for_ie.gif → ...r/jstree/js/themes/classic/dot_for_ie.gif b/...n/webapp/js/themes/classic/dot_for_ie.gif → ...r/jstree/js/themes/classic/dot_for_ie.gif
diff --git a/src/main/webapp/js/themes/classic/style.css → ...tapler/jstree/js/themes/classic/style.css b/src/main/webapp/js/themes/classic/style.css → ...tapler/jstree/js/themes/classic/style.css
diff --git a/...ain/webapp/js/themes/classic/throbber.gif → ...ler/jstree/js/themes/classic/throbber.gif b/...ain/webapp/js/themes/classic/throbber.gif → ...ler/jstree/js/themes/classic/throbber.gif
diff --git a/src/main/webapp/js/themes/default-rtl/d.gif → ...tapler/jstree/js/themes/default-rtl/d.gif b/src/main/webapp/js/themes/default-rtl/d.gif → ...tapler/jstree/js/themes/default-rtl/d.gif
diff --git a/src/main/webapp/js/themes/default-rtl/d.png → ...tapler/jstree/js/themes/default-rtl/d.png b/src/main/webapp/js/themes/default-rtl/d.png → ...tapler/jstree/js/themes/default-rtl/d.png
diff --git a/...ain/webapp/js/themes/default-rtl/dots.gif → ...ler/jstree/js/themes/default-rtl/dots.gif b/...ain/webapp/js/themes/default-rtl/dots.gif → ...ler/jstree/js/themes/default-rtl/dots.gif
diff --git a/...in/webapp/js/themes/default-rtl/style.css → ...er/jstree/js/themes/default-rtl/style.css b/...in/webapp/js/themes/default-rtl/style.css → ...er/jstree/js/themes/default-rtl/style.css
diff --git a/...webapp/js/themes/default-rtl/throbber.gif → ...jstree/js/themes/default-rtl/throbber.gif b/...webapp/js/themes/default-rtl/throbber.gif → ...jstree/js/themes/default-rtl/throbber.gif
diff --git a/src/main/webapp/js/themes/default/d.gif → ...ry/stapler/jstree/js/themes/default/d.gif b/src/main/webapp/js/themes/default/d.gif → ...ry/stapler/jstree/js/themes/default/d.gif
diff --git a/src/main/webapp/js/themes/default/d.png → ...ry/stapler/jstree/js/themes/default/d.png b/src/main/webapp/js/themes/default/d.png → ...ry/stapler/jstree/js/themes/default/d.png
diff --git a/src/main/webapp/js/themes/default/style.css → ...tapler/jstree/js/themes/default/style.css b/src/main/webapp/js/themes/default/style.css → ...tapler/jstree/js/themes/default/style.css
diff --git a/...ain/webapp/js/themes/default/throbber.gif → ...ler/jstree/js/themes/default/throbber.gif b/...ain/webapp/js/themes/default/throbber.gif → ...ler/jstree/js/themes/default/throbber.gif