Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1628 - in trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins
|
From: <jbo...@li...> - 2005-11-23 01:35:14
|
Author: wrzep Date: 2005-11-22 20:35:07 -0500 (Tue, 22 Nov 2005) New Revision: 1628 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: plugin getting #of svn repo commits 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-23 01:33:51 UTC (rev 1627) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-11-23 01:35:07 UTC (rev 1628) @@ -35,6 +35,7 @@ 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; @@ -58,7 +59,7 @@ import org.jboss.forge.status.plugins.StatusPlugin; import org.jboss.forge.status.plugins.OneStatusPlugin; -import org.jboss.forge.status.plugins.SvnStatusPlugin; +import org.jboss.forge.status.plugins.CommitsTotalStatusPlugin; import org.jboss.logging.Logger; @@ -174,7 +175,7 @@ Node pluginNode = (Node) iter.next(); Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements); - + /* try { String pluginClassString = XmlTools.unmarshallText(pluginProperties.get("class")); System.out.println("pluginClassString " + pluginClassString); @@ -182,7 +183,12 @@ p.add((StatusPlugin) pluginClass.newInstance()); } 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; 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-23 01:33:51 UTC (rev 1627) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/CommitsTotalStatusPlugin.java 2005-11-23 01:35:07 UTC (rev 1628) @@ -25,6 +25,8 @@ import java.util.Map; import java.util.HashMap; +import org.jboss.forge.common.projects.Projects; + /** * @author Pawel Wrzeszcz */ @@ -34,32 +36,30 @@ protected static String PLUGIN_NAME = "Commits total"; protected static String PLUGIN_ID = "commitstotal"; - private Map<String,Map> projects; + private Map<String,Map> projectsMaps; public String getId() { return PLUGIN_ID; } public String getName() { return PLUGIN_NAME; } - public CommitsTotalStatusPlugin() { - projects = new HashMap<String,Map>(); + public CommitsTotalStatusPlugin(Projects projects) { + super(projects); + projectsMaps = new HashMap<String,Map>(); } public int getValue(String projectId) { - if (!projects.containsKey(projectId)) { - projects.put(projectId, getProjectMap(projectId)); + if (!projectsMaps.containsKey(projectId)) { + projectsMaps.put(projectId, getProjectMap(projectId)); } - Map projectMap = projects.get(projectId); + Map projectMap = projectsMaps.get(projectId); - System.out.println("commits class " + projectMap.get("commitsTotal").getClass()); return ((Integer)projectMap.get("commitsTotal")).intValue(); } private Map getProjectMap(String projectId) { - String repoUrl = "http://anonsvn.labs.jboss.com/trunk/labs/demo"; // DEBUG ;-) - - return getSvnRepository(repoUrl); + return getSvnRepository(projectId); } } \ No newline at end of file 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-23 01:33:51 UTC (rev 1627) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JiraStatusPlugin.java 2005-11-23 01:35:07 UTC (rev 1628) @@ -26,6 +26,8 @@ import java.util.Collection; import java.util.List; +import org.jboss.forge.common.projects.Projects; + import com.caucho.hessian.client.HessianProxyFactory; import hu.midori.kosmos.protocol.JiraService; @@ -39,6 +41,10 @@ public abstract class JiraStatusPlugin extends StatusPlugin { + public JiraStatusPlugin(Projects projects) { + super(projects); + } + protected Collection<JiraProject> getJiraProjects() { //Get the projects from kosmo server 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-23 01:33:51 UTC (rev 1627) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/OneStatusPlugin.java 2005-11-23 01:35:07 UTC (rev 1628) @@ -22,6 +22,8 @@ package org.jboss.forge.status.plugins; +import org.jboss.forge.common.projects.Projects; + /** * @author Pawel Wrzeszcz */ @@ -31,7 +33,9 @@ protected static String PLUGIN_NAME = "One"; protected static String PLUGIN_ID = "one"; - public OneStatusPlugin() {}; + public OneStatusPlugin(Projects projects) { + super(projects); + }; public String getId() { return PLUGIN_ID; }; public String getName() { return PLUGIN_NAME; }; 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-23 01:33:51 UTC (rev 1627) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ResolvedIssuesStatusPlugin.java 2005-11-23 01:35:07 UTC (rev 1628) @@ -24,6 +24,8 @@ import java.util.List; +import org.jboss.forge.common.projects.Projects; + /** * @author Pawel Wrzeszcz */ @@ -36,7 +38,10 @@ public String getId() { return PLUGIN_ID; }; public String getName() { return PLUGIN_NAME; }; - public ResolvedIssuesStatusPlugin() { getJiraProjects(); }; + public ResolvedIssuesStatusPlugin(Projects projects) { + super(projects); + getJiraProjects(); + } public int getValue(String projectId) { return 0;} ; 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-23 01:33:51 UTC (rev 1627) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-11-23 01:35:07 UTC (rev 1628) @@ -22,12 +22,20 @@ package org.jboss.forge.status.plugins; +import org.jboss.forge.common.projects.Projects; + /** * @author Pawel Wrzeszcz */ public abstract class StatusPlugin { + protected Projects projects; + + public StatusPlugin(Projects projects) { + this.projects = projects; + }; + public abstract String getId(); public abstract String getName(); 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-23 01:33:51 UTC (rev 1627) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java 2005-11-23 01:35:07 UTC (rev 1628) @@ -26,6 +26,8 @@ import java.util.List; import java.util.Map; +import org.jboss.forge.common.projects.Projects; + import com.caucho.hessian.client.HessianProxyFactory; import hu.midori.kosmos.protocol.SvnService; @@ -37,7 +39,11 @@ public abstract class SvnStatusPlugin extends StatusPlugin { - protected Map getSvnRepository(String repoUrl) { + public SvnStatusPlugin(Projects projects) { + super(projects); + } + + protected Map getSvnRepository(String projectId) { SvnService service = null; HessianProxyFactory factory = new HessianProxyFactory(); @@ -49,12 +55,18 @@ service = (SvnService) factory.create(SvnService.class, serviceUrl); - //repoUrl = "http://anonsvn.labs.jboss.com/trunk/labs/demo"; + String repoURL = getRepoURL(projectId); + System.out.println("repo for project " + projectId + " " + repoURL); - List repositories = service.getRepositories(repoUrl); + if (repoURL == null) { + repoURL = "http://anonsvn.labs.jboss.com/trunk/labs/demo"; //DEBUG + } + + List repositories = service.getRepositories(repoURL); - m = (Map) repositories.get(0); + m = (Map) repositories.get(0); if (m != null) { + for (Iterator iter = m.keySet().iterator(); iter.hasNext();) { Object obj = (Object) iter.next(); System.out.println("object: " + obj + " binding: " + m.get(obj)); @@ -68,4 +80,10 @@ return m; } + + private String getRepoURL(String projectId) { + String repoURL = projects.getProjectProperty(projectId, "svn-repo"); + return (repoURL == "" ? null : repoURL); + } + } |
