rebuild plugin system

scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java

@@ -40,8 +40,6 @@ import com.google.inject.Singleton;
 
 import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
-import sonia.scm.web.plugin.ScmWebPluginContext;
-import sonia.scm.web.plugin.WebResource;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -49,10 +47,9 @@ 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 java.util.Set;
+import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 
@@ -70,6 +67,20 @@ public class ScriptResourceServlet extends AbstractResourceServlet
   /** Field description */
   private static final long serialVersionUID = -5769146163848821050L;
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param manager
+   */
+  @Inject
+  public ScriptResourceServlet(PluginManager manager)
+  {
+    this.manager = manager;
+  }
+
   //~--- methods --------------------------------------------------------------
 
   /**
@@ -89,19 +100,13 @@ public class ScriptResourceServlet extends AbstractResourceServlet
         "function sayPluginHello(){ alert('Plugin Hello !'); }".concat(
           System.getProperty("line.separator")).getBytes());
 
-    Collection<WebResource> scriptResources =
-      webPluginContext.getScriptResources();
+    Collection<String> scriptResources = getScriptResources();
 
     if (Util.isNotEmpty(scriptResources))
     {
-      List<WebResource> resourceList =
-        new ArrayList<WebResource>(scriptResources);
-
-      Collections.sort(resourceList, new WebResourceComparator());
-
-      for (WebResource scriptResource : resourceList)
+      for (String resource : scriptResources)
       {
-        appendResource(stream, scriptResource);
+        appendResource(stream, resource);
       }
     }
   }
@@ -132,10 +137,10 @@ public class ScriptResourceServlet extends AbstractResourceServlet
    * @throws IOException
    * @throws ServletException
    */
-  private void appendResource(OutputStream stream, WebResource script)
+  private void appendResource(OutputStream stream, String script)
           throws ServletException, IOException
   {
-    InputStream input = script.getContent();
+    InputStream input = ScriptResourceServlet.class.getResourceAsStream(script);
 
     if (input != null)
     {
@@ -150,9 +155,54 @@ public class ScriptResourceServlet extends AbstractResourceServlet
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param resources
+   * @param plugin
+   */
+  private void processPlugin(Set<String> resources, Plugin plugin)
+  {
+    PluginResources pluginResources = plugin.getResources();
+
+    if (pluginResources != null)
+    {
+      Set<String> scriptResources = pluginResources.getScriptResources();
+
+      if (scriptResources != null)
+      {
+        resources.addAll(scriptResources);
+      }
+    }
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private Collection<String> getScriptResources()
+  {
+    Set<String> resources = new TreeSet<String>();
+    Collection<Plugin> plugins = manager.getPlugins();
+
+    if (plugins != null)
+    {
+      for (Plugin plugin : plugins)
+      {
+        processPlugin(resources, plugin);
+      }
+    }
+
+    return resources;
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  @Inject
-  private ScmWebPluginContext webPluginContext;
+  private PluginManager manager;
 }

scm-webapp/src/main/java/sonia/scm/plugin/WebResourceComparator.java

@@ -1,73 +0,0 @@
-/**
- * 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.io.Serializable;
-
-import java.util.Comparator;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class WebResourceComparator
-        implements Comparator<WebResource>, Serializable
-{
-
-  /** Field description */
-  private static final long serialVersionUID = -5916499507958881372L;
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param resource
-   * @param resource1
-   *
-   * @return
-   */
-  @Override
-  public int compare(WebResource resource, WebResource resource1)
-  {
-    return resource.getId().compareTo(resource1.getId());
-  }
-}