improve plugin api

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

@@ -69,6 +69,10 @@ public class DefaultPluginLoader implements PluginLoader
   /** Field description */
   public static final String PATH_PLUGINCONFIG = "META-INF/scm/plugin.xml";
 
+  /** Field description */
+  public static final String REGE_COREPLUGIN =
+    "^.*(?:/|\\\\)WEB-INF(?:/|\\\\)lib(?:/|\\\\).*\\.jar$";
+
   /** the logger for DefaultPluginLoader */
   private static final Logger logger =
     LoggerFactory.getLogger(DefaultPluginLoader.class);
@@ -196,12 +200,24 @@ public class DefaultPluginLoader implements PluginLoader
 
       path = path.substring("jar:file:".length(), path.lastIndexOf("!"));
 
+      boolean corePlugin = path.matches(REGE_COREPLUGIN);
+
       if (logger.isInfoEnabled())
       {
-        logger.info("load plugin {}", path);
+        logger.info("load {}plugin {}", corePlugin
+                                        ? "core "
+                                        : " ", path);
       }
 
       Plugin plugin = JAXB.unmarshal(url, Plugin.class);
+      PluginInformation info = plugin.getInformation();
+
+      if (info != null)
+      {
+        info.setState(corePlugin
+                      ? PluginState.CORE
+                      : PluginState.INSTALLED);
+      }
 
       plugin.setPath(path);
       installedPlugins.add(plugin);

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

@@ -48,6 +48,7 @@ import sonia.scm.cache.CacheManager;
 import sonia.scm.cache.SimpleCache;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.security.SecurityContext;
+import sonia.scm.util.AssertUtil;
 import sonia.scm.util.SecurityUtil;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -79,6 +80,10 @@ public class DefaultPluginManager implements PluginManager
   private static final Logger logger =
     LoggerFactory.getLogger(DefaultPluginManager.class);
 
+  /** Field description */
+  public static final PluginFilter FILTER_UPDATES =
+    new StatePluginFilter(PluginState.UPDATE_AVAILABLE);
+
   //~--- constructors ---------------------------------------------------------
 
   /**
@@ -160,6 +165,20 @@ public class DefaultPluginManager implements PluginManager
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param id
+   */
+  @Override
+  public void update(String id)
+  {
+    SecurityUtil.assertIsAdmin(securityContextProvicer);
+
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
@@ -190,6 +209,52 @@ public class DefaultPluginManager implements PluginManager
     return result;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param filter
+   *
+   * @return
+   */
+  @Override
+  public Set<PluginInformation> get(PluginFilter filter)
+  {
+    AssertUtil.assertIsNotNull(filter);
+    SecurityUtil.assertIsAdmin(securityContextProvicer);
+
+    Set<PluginInformation> infoSet = new HashSet<PluginInformation>();
+
+    filter(infoSet, installedPlugins.values(), filter);
+    filter(infoSet, getPluginCenter().getPlugins(), filter);
+
+    return infoSet;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public Collection<PluginInformation> getAll()
+  {
+    SecurityUtil.assertIsAdmin(securityContextProvicer);
+
+    Set<PluginInformation> infoSet = new HashSet<PluginInformation>();
+
+    infoSet.addAll(installedPlugins.values());
+    infoSet.addAll(getPluginCenter().getPlugins());
+
+    for ( PluginInformation pi : infoSet )
+    {
+      System.out.println( pi.getName() + ": " + pi.hashCode() );
+    }
+
+    return infoSet;
+  }
+
   /**
    * Method description
    *
@@ -215,6 +280,20 @@ public class DefaultPluginManager implements PluginManager
     return availablePlugins;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public Collection<PluginInformation> getAvailableUpdates()
+  {
+    SecurityUtil.assertIsAdmin(securityContextProvicer);
+
+    return get(FILTER_UPDATES);
+  }
+
   /**
    * Method description
    *
@@ -229,6 +308,77 @@ public class DefaultPluginManager implements PluginManager
     return installedPlugins.values();
   }
 
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param target
+   * @param source
+   * @param filter
+   */
+  private void filter(Set<PluginInformation> target,
+                      Collection<PluginInformation> source, PluginFilter filter)
+  {
+    for (PluginInformation info : source)
+    {
+      if (filter.accept(info))
+      {
+        target.add(info);
+      }
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param available
+   */
+  private void preparePlugin(PluginInformation available)
+  {
+    PluginState state = PluginState.AVAILABLE;
+
+    for (PluginInformation installed : installedPlugins.values())
+    {
+      if (isSamePlugin(available, installed))
+      {
+        if (installed.getVersion().equals(available.getVersion()))
+        {
+          available.setState(PluginState.INSTALLED);
+        }
+        else
+        {
+          available.setState(PluginState.UPDATE_AVAILABLE);
+        }
+      }
+    }
+
+    available.setState(state);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param pc
+   */
+  private void preparePlugins(PluginCenter pc)
+  {
+    Set<PluginInformation> infoSet = pc.getPlugins();
+
+    if (infoSet != null)
+    {
+      for (PluginInformation available : infoSet)
+      {
+        preparePlugin(available);
+      }
+    }
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
   /**
    * Method description
    *
@@ -253,6 +403,7 @@ public class DefaultPluginManager implements PluginManager
         {
           center = (PluginCenter) unmarshaller.unmarshal(
             new URL(configuration.getPluginUrl()));
+          preparePlugins(center);
           cache.put(PluginCenter.class.getName(), center);
 
           if (pluginHandler == null)
@@ -272,6 +423,21 @@ public class DefaultPluginManager implements PluginManager
     return center;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param p1
+   * @param p2
+   *
+   * @return
+   */
+  private boolean isSamePlugin(PluginInformation p1, PluginInformation p2)
+  {
+    return p1.getGroupId().equals(p2.getGroupId())
+           && p1.getArtifactId().equals(p2.getArtifactId());
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */