From: <jbo...@li...> - 2005-11-24 12:56:18
|
Author: wrzep Date: 2005-11-24 07:56:03 -0500 (Thu, 24 Nov 2005) New Revision: 1640 Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/CommitsTotalStatusPlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JiraStatusPlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/OneStatusPlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ResolvedIssuesStatusPlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java Log: added plugins initialization (StatusPlugin.init(Projects)) http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-11-24 12:35:24 UTC (rev 1639) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-11-24 12:56:03 UTC (rev 1640) @@ -22,43 +22,27 @@ package org.jboss.forge.status; -import java.net.MalformedURLException; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.HashMap; import java.util.Set; import java.util.HashSet; -import java.util.List; import java.util.ArrayList; -import java.util.concurrent.Delayed; import org.jboss.forge.common.projects.Projects; import org.jboss.forge.common.projects.ProjectsHelper; -import org.jboss.forge.common.ForgeHelper; - import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; import org.jboss.forge.common.projects.permissions.PermissionsChecker; import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.AbstractDescriptor; -import org.jboss.forge.common.projects.permissions.PermissionsChecker; -import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker; -import org.jboss.forge.common.projects.DomToXmlTransformer; - import org.jboss.portal.common.context.DelegateContext; -import org.jboss.shotoku.ContentManager; -import org.apache.xerces.parsers.DOMParser; -import org.xml.sax.InputSource; - -import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.NamedNodeMap; import org.jboss.forge.status.plugins.StatusPlugin; -import org.jboss.forge.status.plugins.OneStatusPlugin; import org.jboss.forge.status.plugins.CommitsTotalStatusPlugin; import org.jboss.logging.Logger; @@ -87,6 +71,8 @@ this.portalName = portalName; this.scoreAlgorithm = scoreAlgorithm; + log = Logger.getLogger(this.getClass()); + // Get the projects projects = ProjectsHelper.getProjects(portalName); @@ -163,9 +149,9 @@ } List<StatusPlugin> getPlugins(Set<Node> pluginsNodes) { - ArrayList<StatusPlugin> p = new ArrayList<StatusPlugin>(); + ArrayList<StatusPlugin> plugins = new ArrayList<StatusPlugin>(); - HashSet pluginsElements = new HashSet<String>(); + HashSet<String> pluginsElements = new HashSet<String>(); pluginsElements.add(PLUGIN_ID_ELEMENT); pluginsElements.add(PLUGIN_NAME_ELEMENT); pluginsElements.add(PLUGIN_CLASS_ELEMENT); @@ -175,23 +161,26 @@ Node pluginNode = (Node) iter.next(); Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements); - /* - try { + + try { + // Get plugin name String pluginClassString = XmlTools.unmarshallText(pluginProperties.get("class")); System.out.println("pluginClassString " + pluginClassString); Class pluginClass = Class.forName(pluginClassString); - p.add((StatusPlugin) pluginClass.newInstance()); + + // Get plugin instance and initialize it + StatusPlugin plugin = (StatusPlugin) pluginClass.newInstance(); + plugin.init(projects); + + // Add plugin to plugins set + plugins.add(plugin); } catch (Exception e) { e.printStackTrace(); - }*/ + } - //TODO (IMPORTANT) allow instantionatino but... also passing project argument - - Projects projects = ProjectsHelper.getProjects(portalName); - p.add(new CommitsTotalStatusPlugin(projects)); } - return p; + return plugins; } private int calculateScore(String projectId) { Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/CommitsTotalStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/CommitsTotalStatusPlugin.java 2005-11-24 12:35:24 UTC (rev 1639) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/CommitsTotalStatusPlugin.java 2005-11-24 12:56:03 UTC (rev 1640) @@ -23,7 +23,6 @@ package org.jboss.forge.status.plugins; import java.util.Map; -import org.jboss.forge.common.projects.Projects; /** * @author Pawel Wrzeszcz @@ -37,8 +36,8 @@ public String getId() { return PLUGIN_ID; } public String getName() { return PLUGIN_NAME; } - public CommitsTotalStatusPlugin(Projects projects) { - super(projects); + public CommitsTotalStatusPlugin() { + super(); } @Override protected int getPluginSpecyficValue(Map projectMap) { Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JiraStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JiraStatusPlugin.java 2005-11-24 12:35:24 UTC (rev 1639) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JiraStatusPlugin.java 2005-11-24 12:56:03 UTC (rev 1640) @@ -41,8 +41,8 @@ public abstract class JiraStatusPlugin extends StatusPlugin { - public JiraStatusPlugin(Projects projects) { - super(projects); + public JiraStatusPlugin() { + super(); } protected Collection<JiraProject> getJiraProjects() { Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/OneStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/OneStatusPlugin.java 2005-11-24 12:35:24 UTC (rev 1639) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/OneStatusPlugin.java 2005-11-24 12:56:03 UTC (rev 1640) @@ -22,8 +22,6 @@ package org.jboss.forge.status.plugins; -import org.jboss.forge.common.projects.Projects; - /** * @author Pawel Wrzeszcz */ @@ -33,8 +31,8 @@ protected static String PLUGIN_NAME = "One"; protected static String PLUGIN_ID = "one"; - public OneStatusPlugin(Projects projects) { - super(projects); + public OneStatusPlugin() { + super(); }; public String getId() { return PLUGIN_ID; }; Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ResolvedIssuesStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ResolvedIssuesStatusPlugin.java 2005-11-24 12:35:24 UTC (rev 1639) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ResolvedIssuesStatusPlugin.java 2005-11-24 12:56:03 UTC (rev 1640) @@ -22,10 +22,6 @@ package org.jboss.forge.status.plugins; -import java.util.List; - -import org.jboss.forge.common.projects.Projects; - /** * @author Pawel Wrzeszcz */ @@ -38,8 +34,8 @@ public String getId() { return PLUGIN_ID; }; public String getName() { return PLUGIN_NAME; }; - public ResolvedIssuesStatusPlugin(Projects projects) { - super(projects); + public ResolvedIssuesStatusPlugin() { + super(); getJiraProjects(); } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-11-24 12:35:24 UTC (rev 1639) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-11-24 12:56:03 UTC (rev 1640) @@ -32,14 +32,12 @@ protected Projects projects; - public StatusPlugin(Projects projects) { + public void init(Projects projects) { this.projects = projects; - }; + } public abstract String getId(); - public abstract String getName(); - public abstract int getValue(String projectId); } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java 2005-11-24 12:35:24 UTC (rev 1639) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java 2005-11-24 12:56:03 UTC (rev 1640) @@ -28,13 +28,12 @@ import java.util.List; import java.util.Map; -import org.jboss.forge.common.projects.Projects; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; import hu.midori.kosmos.protocol.SvnService; -import hu.midori.kosmos.model.SvnRepository; +//import hu.midori.kosmos.model.SvnRepository; /** * @author Pawel Wrzeszcz @@ -50,8 +49,8 @@ "http://localhost:8080/kosmos-server/kosmos-services/svn-service"; //TODO shoud be parameter in xml config file - public SvnStatusPlugin(Projects projects) { - super(projects); + public SvnStatusPlugin() { + super(); projectsMaps = new HashMap<String,Map>(); log = Logger.getLogger(this.getClass()); @@ -64,7 +63,7 @@ // Get project repository URL String repoURL = getRepoURL(projectId); - System.out.println("repo for project " + projectId + " " + repoURL); + //System.out.println("repo for project " + projectId + " " + repoURL); if (repoURL == null) { return null; |