Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1721 - in trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins/svn
|
From: <jbo...@li...> - 2005-12-07 16:06:38
|
Author: wrzep Date: 2005-12-07 11:06:26 -0500 (Wed, 07 Dec 2005) New Revision: 1721 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/StatusDescriptor.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java Log: - cleanup afer finding out what was wrong with kosmos service - fixed one bug in plugin instantination 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-12-06 22:33:48 UTC (rev 1720) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-07 16:06:26 UTC (rev 1721) @@ -202,9 +202,13 @@ } // Get plugin properies node + Map<String,String> pluginSpecificPropertiesMap = null; Node pluginSpecificPropertiesNode = pluginProperties.get("properties"); - Map<String,String> pluginSpecificPropertiesMap = getChildNodesStringMap(pluginSpecificPropertiesNode); + if (pluginSpecificPropertiesNode != null) { + pluginSpecificPropertiesMap = getChildNodesStringMap(pluginSpecificPropertiesNode); + } + // Initialize plugin plugin.init(projects, pluginSpecificPropertiesMap); Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2005-12-06 22:33:48 UTC (rev 1720) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2005-12-07 16:06:26 UTC (rev 1721) @@ -23,25 +23,16 @@ package org.jboss.forge.status; import java.io.IOException; -import java.util.Set; -import java.util.HashSet; - import org.apache.xerces.parsers.DOMParser; -import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.common.projects.ProjectsHelper; import org.jboss.portal.common.context.DelegateContext; import org.jboss.portlet.JBossRenderRequest; import org.jboss.shotoku.ContentManager; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; -import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.jboss.logging.Logger; /** * @author Pawel Wrzeszcz @@ -49,14 +40,12 @@ */ public class StatusDescriptor { - private static final Logger log = Logger.getLogger(StatusDescriptor.class); - private DelegateContext context; private Status status; public StatusDescriptor(String portalName, ContentManager cm) { try { - String pluginsPath = StatusTools.getXmlCmPath(portalName,"status.xml"); + String pluginsPath = StatusTools.getXmlCmPath(portalName); Node pluginsRoot = getRoot(cm, pluginsPath); /* Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java 2005-12-06 22:33:48 UTC (rev 1720) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java 2005-12-07 16:06:26 UTC (rev 1721) @@ -22,7 +22,6 @@ package org.jboss.forge.status; import org.jboss.forge.common.service.NodeWatcher; -import org.jboss.forge.common.service.ResourceWatcher; import org.jboss.shotoku.ContentManager; public class StatusNodeWatcher implements NodeWatcher { Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2005-12-06 22:33:48 UTC (rev 1720) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2005-12-07 16:06:26 UTC (rev 1721) @@ -28,11 +28,6 @@ import javax.portlet.PortletRequestDispatcher; import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.common.projects.Projects; -import org.jboss.forge.common.projects.ProjectsHelper; -import org.jboss.forge.common.projects.permissions.PermissionsChecker; -import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker; - import org.jboss.portal.common.context.DelegateContext; import org.jboss.portal.core.servlet.jsp.PortalJsp; Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java 2005-12-06 22:33:48 UTC (rev 1720) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java 2005-12-07 16:06:26 UTC (rev 1721) @@ -24,19 +24,13 @@ private final static String STATUS_JSP = "status.jsp"; private final static String STATUS_JSP_DIR = "status"; - private final static String MEMBERS_DIR = "members"; - private final static String PROJECTS_XML = "projects.xml"; - @Inject private static ContentManager cm; - /** - * Path to the xml file defining list of watched feeds. - */ - public static String getPrjXmlCmPath(String portalName) { - return portalName + "/" + MEMBERS_DIR + "/" + PROJECTS_XML; + public static String getXmlCmPath(String portalName) { + return portalName + "/" + STATUS_DIR + "/" + STATUS_XML; } - + public static String getXmlCmPath(String portalName, String filename) { return portalName + "/" + STATUS_DIR + "/" + filename; } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java 2005-12-06 22:33:48 UTC (rev 1720) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java 2005-12-07 16:06:26 UTC (rev 1721) @@ -24,12 +24,6 @@ import java.util.Collection; import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; - -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.jboss.forge.status.plugins.StatusPlugin; /** Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2005-12-06 22:33:48 UTC (rev 1720) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2005-12-07 16:06:26 UTC (rev 1721) @@ -61,7 +61,6 @@ public void init(Projects projects, Map<String,String> properties) { super.init(projects,properties); serviceURL = properties.get("svn-service"); - System.out.println("service-url " + serviceURL); } protected abstract int getPluginSpecyficValue(Map projectMap); @@ -71,7 +70,6 @@ // Get project repository URL String repoURL = getRepoURL(projectId); - //System.out.println("repo for project " + projectId + " " + repoURL); if (repoURL == null) { return null; |
