diff --git a/scm-web-api/src/main/java/sonia/scm/web/plugin/ClasspathWebResource.java b/scm-web-api/src/main/java/sonia/scm/web/plugin/ClasspathWebResource.java index d80d8246b5..5bfcc840cb 100644 --- a/scm-web-api/src/main/java/sonia/scm/web/plugin/ClasspathWebResource.java +++ b/scm-web-api/src/main/java/sonia/scm/web/plugin/ClasspathWebResource.java @@ -29,6 +29,8 @@ * */ + + package sonia.scm.web.plugin; //~--- JDK imports ------------------------------------------------------------ @@ -67,6 +69,18 @@ public class ClasspathWebResource implements WebResource return ClasspathWebResource.class.getResourceAsStream(contentPath); } + /** + * Method description + * + * + * @return + */ + @Override + public String getId() + { + return contentPath; + } + //~--- fields --------------------------------------------------------------- /** Field description */ diff --git a/scm-web-api/src/main/java/sonia/scm/web/plugin/WebResource.java b/scm-web-api/src/main/java/sonia/scm/web/plugin/WebResource.java index b4fbdb7cb2..a0e4f501cf 100644 --- a/scm-web-api/src/main/java/sonia/scm/web/plugin/WebResource.java +++ b/scm-web-api/src/main/java/sonia/scm/web/plugin/WebResource.java @@ -29,6 +29,8 @@ * */ + + package sonia.scm.web.plugin; //~--- JDK imports ------------------------------------------------------------ @@ -52,4 +54,12 @@ public interface WebResource * @throws IOException */ public InputStream getContent() throws IOException; + + /** + * Method description + * + * + * @return + */ + public String getId(); } diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java index 320e483147..bbd8c7b54f 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java @@ -29,6 +29,8 @@ * */ + + package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- @@ -47,7 +49,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.List; import javax.servlet.ServletException; @@ -89,7 +94,12 @@ public class ScriptResourceServlet extends AbstractResourceServlet if (Util.isNotEmpty(scriptResources)) { - for (WebResource scriptResource : scriptResources) + List resourceList = + new ArrayList(scriptResources); + + Collections.sort(resourceList, new WebResourceComparator()); + + for (WebResource scriptResource : resourceList) { appendResource(stream, scriptResource); } diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/WebResourceComparator.java b/scm-webapp/src/main/java/sonia/scm/plugin/WebResourceComparator.java new file mode 100644 index 0000000000..671d5d406c --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/plugin/WebResourceComparator.java @@ -0,0 +1,65 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.plugin; + +//~--- non-JDK imports -------------------------------------------------------- + +import sonia.scm.web.plugin.WebResource; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.Comparator; + +/** + * + * @author Sebastian Sdorra + */ +public class WebResourceComparator implements Comparator +{ + + /** + * Method description + * + * + * @param resource + * @param resource1 + * + * @return + */ + @Override + public int compare(WebResource resource, WebResource resource1) + { + return resource.getId().compareTo(resource1.getId()); + } +}