Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3790 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins/cc plugins/codelines plugins/jira plugins/svn service templates tools
Author: wrzep
Date: 2006-04-19 06:17:19 -0400 (Wed, 19 Apr 2006)
New Revision: 3790
Added:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTags.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTools.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginConf.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -45,7 +45,7 @@
import org.jboss.forge.status.tools.Plugins;
import org.jboss.forge.status.tools.PluginsValues;
import org.jboss.forge.status.tools.ScoresManager;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import org.jboss.portal.common.context.DelegateContext;
@@ -94,13 +94,13 @@
// Get columns to display on the main page
Node mainPageRoot =
XmlTools.getFirstNodeWithName(statusRoot,
- StatusTags.MAIN_PAGE_COLUMNS_TAG);
+ Tags.MAIN_PAGE_COLUMNS_TAG);
mainPageColumns = new Columns(mainPageRoot, pluginsValues, projects);
// Get matrix to display on the project page
Node projectPageRoot =
XmlTools.getFirstNodeWithName(statusRoot,
- StatusTags.PROJECT_PAGE_COLUMNS_TAG);
+ Tags.PROJECT_PAGE_COLUMNS_TAG);
matrixTemplate =
new MatrixTemplate(projectPageRoot, pluginsValues, projects);
@@ -125,7 +125,7 @@
for (int i = 0; i < pluginNodes.getLength(); i++) {
Node pluginNode = pluginNodes.item(i);
- if (pluginNode.getNodeName() != StatusTags.PLUGIN_ELEMENT) {
+ if (pluginNode.getNodeName() != Tags.PLUGIN_ELEMENT) {
continue;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.io.IOException;
-import org.jboss.forge.status.tools.StatusTools;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
@@ -53,10 +53,10 @@
public StatusDescriptor(String portalName, ContentManager cm) {
try {
- String statusPath = StatusTools.getXmlCmPath(portalName);
+ String statusPath = Tools.getXmlCmPath(portalName);
Node statusRoot = getRoot(cm , statusPath);
- String pluginsPath = StatusTools.getXmlStatusPluginsCmPath(portalName);
+ String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName);
Node pluginsRoot = getRoot(cm, pluginsPath);
status = new Status(portalName, statusRoot, pluginsRoot);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -25,7 +25,7 @@
import org.jboss.forge.common.service.NodeWatcher;
import org.jboss.forge.common.service.ResourceWatcher;
-import org.jboss.forge.status.tools.StatusTools;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.shotoku.ContentManager;
@@ -48,15 +48,15 @@
rw = new ResourceWatcher(cm);
/* Watch plugins confuguration files */
- rw.watchResource(StatusTools.getXmlCmPath(portalName));
- rw.watchResource(StatusTools.getXmlStatusPluginsCmPath(portalName));
+ rw.watchResource(Tools.getXmlCmPath(portalName));
+ rw.watchResource(Tools.getXmlStatusPluginsCmPath(portalName));
/* Watch projects.xml file*/
- rw.watchResource(StatusTools.getProjectsXmlPath(portalName));
+ rw.watchResource(Tools.getProjectsXmlPath(portalName));
/* Watch all project.xml files
* We assume that they contain entries used by plugins */
- Set<String> projectXmlPathsSet = StatusTools.getProjectXmlPathsSet(portalName);
+ Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName);
for (String projectXmlPath : projectXmlPathsSet) {
rw.watchResource(projectXmlPath);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -28,7 +28,7 @@
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.status.tools.StatusTools;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
@@ -55,24 +55,24 @@
String action = request.getParameter("action");
String id = request.getParameter("id");
- StatusDescriptor desc = StatusTools.getDesc(portalName);
+ StatusDescriptor desc = Tools.getDesc(portalName);
// Set the JSP to show and get the appropriate context
String jspPath = null;
DelegateContext context = null;
if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) {
- jspPath = StatusTools.getPrjDetailsJspCmPath();
+ jspPath = Tools.getPrjDetailsJspCmPath();
context = desc.getProjectContext(id);
}
if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) {
- jspPath = StatusTools.getColumnDetailsJspCmPath();
+ jspPath = Tools.getColumnDetailsJspCmPath();
context = desc.getColumnContext(id);
}
if (id == null) { // Request for main Matrix page
- jspPath = StatusTools.getJspCmPath();
+ jspPath = Tools.getJspCmPath();
context = desc.getContext();
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -28,7 +28,7 @@
import java.net.MalformedURLException;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
@@ -46,7 +46,7 @@
@Override
protected String getKosmosServiceTag() {
- return StatusTags.CC_SERVICE_PROPERTY;
+ return Tags.CC_SERVICE_PROPERTY;
};
protected Logger log;
@@ -98,7 +98,7 @@
private String getCcURL(String projectId) {
- String ccURL = projects.getProjectProperty(projectId, StatusTags.CC_ADRESS_TAG);
+ String ccURL = projects.getProjectProperty(projectId, Tags.CC_ADRESS_TAG);
return (ccURL == "" ? null : ccURL);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -26,7 +26,7 @@
import java.util.HashMap;
import org.jboss.forge.status.plugins.Plugin;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
/**
* @author Pawel Wrzeszcz
@@ -61,12 +61,12 @@
long cl = 0;
- String url = getProperty(projectId, StatusTags.SVN_REPO_ADRESS_TAG);
+ String url = getProperty(projectId, Tags.SVN_REPO_ADRESS_TAG);
if (url != null) {
- String userName = getProperty(projectId, StatusTags.SVN_USERNAME_TAG);
- String password = getProperty(projectId, StatusTags.SVN_PASSWD_TAG);
+ String userName = getProperty(projectId, Tags.SVN_USERNAME_TAG);
+ String password = getProperty(projectId, Tags.SVN_PASSWD_TAG);
cl = getValue(url, userName, password);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -28,7 +28,7 @@
import java.net.MalformedURLException;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
@@ -45,7 +45,7 @@
private static final String JIRA_LINK_NAME = "JIRA location";
protected String getKosmosServiceTag() {
- return StatusTags.JIRA_SERVICE_PROPERTY;
+ return Tags.JIRA_SERVICE_PROPERTY;
};
protected Logger log;
@@ -96,7 +96,7 @@
private String getJiraURL(String projectId) {
- String jiraURL = projects.getProjectProperty(projectId, StatusTags.JIRA_ADRESS_TAG);
+ String jiraURL = projects.getProjectProperty(projectId, Tags.JIRA_ADRESS_TAG);
return (jiraURL == "" ? null : jiraURL);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -28,7 +28,7 @@
import java.net.MalformedURLException;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
@@ -45,7 +45,7 @@
private static final String SVN_LINK_NAME = "Svn repository location";
protected String getKosmosServiceTag() {
- return StatusTags.SVN_SERVICE_PROPERTY;
+ return Tags.SVN_SERVICE_PROPERTY;
};
protected Logger log;
@@ -96,7 +96,7 @@
}
private String getRepoURL(String projectId) {
- String repoURL = projects.getProjectProperty(projectId, StatusTags.SVN_REPO_ADRESS_TAG);
+ String repoURL = projects.getProjectProperty(projectId, Tags.SVN_REPO_ADRESS_TAG);
return (repoURL == "" ? null : repoURL);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -46,7 +46,7 @@
import org.jboss.forge.status.tools.PluginValues;
import org.jboss.forge.status.tools.Plugins;
import org.jboss.forge.status.tools.PluginsValues;
-import org.jboss.forge.status.tools.StatusTools;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.logging.Logger;
@@ -62,7 +62,7 @@
* @author Pawel Wrzeszcz (paw...@gm...)
*/
-@Service(objectName=StatusTools.STATUS_SERVICE_NAME)
+@Service(objectName=Tools.STATUS_SERVICE_NAME)
@Management(ScoresService.class)
@Local(ScoresServiceLocal.class)
@LocalBinding(jndiBinding="Status/ScoresService")
@@ -90,7 +90,7 @@
// Get directory where we store historical scores
Directory dir = getDir(cm.getRootDirectory(),
- StatusTools.getShotokuStatusPath(portalName));
+ Tools.getShotokuStatusPath(portalName));
if (dir == null) {
return false;
@@ -161,7 +161,7 @@
log.info("3");
Directory dir = getDir(cm.getRootDirectory(),
- StatusTools.getShotokuStatusPath(portalName));
+ Tools.getShotokuStatusPath(portalName));
if (dir != null) {
log.info("4");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -27,7 +27,7 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.status.tools.PluginsValues;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
@@ -49,10 +49,10 @@
public CellTemplate(Node cellNode, PluginsValues pluginsValues) {
name = XmlTools.getChildNodeValue(cellNode,
- StatusTags.CELL_NAME_ELEMENT);
+ Tags.CELL_NAME_ELEMENT);
Node metricsNode = XmlTools.getFirstNodeWithName(cellNode,
- StatusTags.METRICS_ELEMENT);
+ Tags.METRICS_ELEMENT);
metricTemplates = parseMetricTemplates(metricsNode, pluginsValues);
}
@@ -74,7 +74,7 @@
Node metricNode = rowsList.item(i);
- if (metricNode.getNodeName().equals(StatusTags.METRIC_ELEMENT)) {
+ if (metricNode.getNodeName().equals(Tags.METRIC_ELEMENT)) {
MetricTemplate metricTemplate =
new MetricTemplate(metricNode, pluginsValues);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -38,7 +38,7 @@
import org.jboss.forge.status.tools.PluginsValues;
import org.jboss.forge.status.tools.ProjectsByNameComparator;
import org.jboss.forge.status.tools.ProjectsByScoreComparator;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
@@ -76,7 +76,7 @@
// Get the columns
columns = new ArrayList<Column>();
Node columnsRoot = XmlTools.getFirstNodeWithName(pageRoot,
- StatusTags.COLUMNS_ELEMENT);
+ Tags.COLUMNS_ELEMENT);
if (columnsRoot != null) {
addColumns(columnsRoot, pluginsValues);
@@ -84,7 +84,7 @@
// Get id of plugin determining projects order
orderPluginId = XmlTools.getChildNodeValue(pageRoot,
- StatusTags.ORDER_PLUGIN_ELEMENT);
+ Tags.ORDER_PLUGIN_ELEMENT);
}
/**
@@ -110,13 +110,13 @@
Node columnNode = columnsList.item(i);
if ((columnNode.getNodeType() == Node.ELEMENT_NODE) &&
- (columnNode.getNodeName().equals(StatusTags.COLUMN_ELEMENT))) {
+ (columnNode.getNodeName().equals(Tags.COLUMN_ELEMENT))) {
String name = XmlTools.getChildNodeValue(columnNode,
- StatusTags.COLUMN_NAME_ELEMENT);
+ Tags.COLUMN_NAME_ELEMENT);
String pluginId = XmlTools.getChildNodeValue(columnNode,
- StatusTags.COLUMN_PLUGIN_ELEMENT);
+ Tags.COLUMN_PLUGIN_ELEMENT);
PluginValues pluginValues =
pluginsValues.getPluginValues(pluginId);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -28,7 +28,7 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.tools.PluginsValues;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
@@ -57,7 +57,7 @@
this.projects = projects;
Node rowsRoot = XmlTools.getFirstNodeWithName(projectPageRoot,
- StatusTags.ROWS_ELEMENT);
+ Tags.ROWS_ELEMENT);
rowTemplates = parseMatrixTemplate(rowsRoot, pluginsValues);
}
@@ -79,7 +79,7 @@
Node rowNode = rowsList.item(i);
- if (rowNode.getNodeName().equals(StatusTags.ROW_ELEMENT)) {
+ if (rowNode.getNodeName().equals(Tags.ROW_ELEMENT)) {
RowTemplate rowTemplate =
new RowTemplate(rowNode, rowNumber, pluginsValues);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -24,7 +24,7 @@
import org.jboss.forge.status.tools.PluginValues;
import org.jboss.forge.status.tools.PluginsValues;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.forge.common.XmlTools;
import org.jboss.portal.common.context.DelegateContext;
@@ -46,10 +46,10 @@
public MetricTemplate(Node cellNode, PluginsValues pluginsValues) {
name = XmlTools.getChildNodeValue(cellNode,
- StatusTags.METRIC_NAME_ELEMENT);
+ Tags.METRIC_NAME_ELEMENT);
String pluginId = XmlTools.getChildNodeValue(cellNode,
- StatusTags.METRIC_PLUGIN_ELEMENT);
+ Tags.METRIC_PLUGIN_ELEMENT);
pluginValues = pluginsValues.getPluginValues(pluginId);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -27,7 +27,7 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.status.tools.PluginsValues;
-import org.jboss.forge.status.tools.StatusTags;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
@@ -56,11 +56,11 @@
public RowTemplate(Node rowNode, int rowNumber,
PluginsValues pluginsValues) {
- name = XmlTools.getChildNodeValue(rowNode,StatusTags.ROW_NAME_ELEMENT);
+ name = XmlTools.getChildNodeValue(rowNode,Tags.ROW_NAME_ELEMENT);
this.rowNumber = rowNumber;
Node cellsNode = XmlTools.getFirstNodeWithName(rowNode,
- StatusTags.CELLS_ELEMENT);
+ Tags.CELLS_ELEMENT);
cellTemplates = parseRowTemplate(cellsNode, pluginsValues);
}
@@ -82,7 +82,7 @@
Node cellNode = rowsList.item(i);
- if (cellNode.getNodeName().equals(StatusTags.CELL_ELEMENT)) {
+ if (cellNode.getNodeName().equals(Tags.CELL_ELEMENT)) {
CellTemplate cellTemplate =
new CellTemplate(cellNode, pluginsValues);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginConf.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginConf.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginConf.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -46,13 +46,13 @@
throws InvalidPluginsConfigurationException {
// Parse plugin configuration
- parseField(pluginNode, StatusTags.PLUGIN_ID_ELEMENT);
- parseField(pluginNode, StatusTags.PLUGIN_CLASS_ELEMENT);
+ parseField(pluginNode, Tags.PLUGIN_ID_ELEMENT);
+ parseField(pluginNode, Tags.PLUGIN_CLASS_ELEMENT);
// Parse plugin properties
Node pluginPropertiesNode =
XmlTools.getFirstNodeWithName(pluginNode,
- StatusTags.PLUGIN_PROPERTIES_ELEMENT);
+ Tags.PLUGIN_PROPERTIES_ELEMENT);
addPluginProperties(pluginPropertiesNode);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -90,10 +90,10 @@
// Get plugin info from pluginNode
String pluginClassString = pluginConf.getFieldValue(
- StatusTags.PLUGIN_CLASS_ELEMENT);
+ Tags.PLUGIN_CLASS_ELEMENT);
String pluginId = pluginConf.getFieldValue(
- StatusTags.PLUGIN_ID_ELEMENT);
+ Tags.PLUGIN_ID_ELEMENT);
if ((pluginClassString == null) || (pluginId == null))
return null;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -62,7 +62,7 @@
ScoresService service = (ScoresService) MBeanProxyExt.create(
ScoresService.class,
- StatusTools.STATUS_SERVICE_NAME,
+ Tools.STATUS_SERVICE_NAME,
server);
/*
PluginValues x = service.get(portalName, date);
@@ -92,7 +92,7 @@
ScoresService service = (ScoresService) MBeanProxyExt.create(
ScoresService.class,
- StatusTools.STATUS_SERVICE_NAME,
+ Tools.STATUS_SERVICE_NAME,
server);
return service.save(projects, pluginsConf, portalName);
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTags.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTags.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTags.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.forge.status.tools;
-
-/**
-* @author Pawel Wrzeszcz
-* Status Matrix xml tags.
-*/
-public class StatusTags {
-
- /* status.xml file tags */
-
- /* main page */
- public static final String MAIN_PAGE_COLUMNS_TAG = "main-page";
-
- public final static String COLUMN_ELEMENT = "column";
- public final static String COLUMNS_ELEMENT = "columns";
- public static final String COLUMN_NAME_ELEMENT = "name";
- public static final String COLUMN_PLUGIN_ELEMENT = "plugin";
-
- public final static String ORDER_PLUGIN_ELEMENT = "order-plugin";
-
- /* project page */
- public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page";
-
- public static final String ROWS_ELEMENT = "rows";
- public static final String ROW_ELEMENT = "row";
- public static final String ROW_NAME_ELEMENT = "name";
-
- public static final String CELLS_ELEMENT = "cells";
- public static final String CELL_ELEMENT = "cell";
- public static final String CELL_NAME_ELEMENT = "name";
-
- public static final String METRICS_ELEMENT = "metrics";
- public static final String METRIC_ELEMENT = "metric";
- public static final String METRIC_NAME_ELEMENT = "name";
- public static final String METRIC_PLUGIN_ELEMENT = "plugin";
-
-
- /* plugins.xml tags */
- public final static String PLUGIN_ELEMENT = "plugin";
-
- public final static String PLUGIN_ID_ELEMENT = "id";
- public final static String PLUGIN_CLASS_ELEMENT = "class";
- public final static String PLUGIN_PROPERTIES_ELEMENT = "properties";
-
- /* project.xml files tags */
- public static final String JIRA_SERVICE_PROPERTY = "jira-service";
- public static final String JIRA_ADRESS_TAG = "jira-adress";
- public static final String SVN_SERVICE_PROPERTY = "svn-service";
-
- public static final String CC_SERVICE_PROPERTY = "cc-service";
- public static final String CC_ADRESS_TAG = "cc-adress";
-
- public static final String SVN_REPO_ADRESS_TAG = "svn-repo";
- public static final String SVN_USERNAME_TAG = "svn-username";
- public static final String SVN_PASSWD_TAG = "svn-passwd";
-
- /**
- * This class cannot be instatiated.
- */
- private StatusTags() {};
-}
\ No newline at end of file
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTools.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/StatusTools.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -1,124 +0,0 @@
-package org.jboss.forge.status.tools;
-
-import java.util.HashSet;
-import java.util.Set;
-
-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.NullPermissionsChecker;
-import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.forge.status.StatusDescriptor;
-import org.jboss.forge.status.StatusNodeWatcher;
-
-import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.aop.Inject;
-
-/**
- * Common constants and functions.
- * @author Pawel Wrzeszcz
- */
-public class StatusTools {
-
- /** <code>STATUS_XML<code> - file defining the list of watched feeds */
- private final static String STATUS_XML = "status.xml";
- private final static String STATUS_PLUGINS_XML = "plugins.xml";
-
- /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */
- private final static String STATUS_DIR = "status";
-
- private final static String STATUS_JSP = "status.jsp";
- private final static String STATUS_JSP_DIR = "status";
- private final static String PROJECT_DETAILS_JSP = "project_details.jsp";
- private final static String COLUMN_DETAILS_JSP = "column_details.jsp";
-
- /** Shotoku directory to store historical scores */
- private static final String SHOTOKU_STATUS_DIR = "status";
-
- public static final String STATUS_SERVICE_NAME = "status:service=scores";
- //TODO move constans to one place
-
- @Inject
- private static ContentManager cm;
-
- public static synchronized StatusDescriptor getDesc(final String portalName) {
- String cacheKey = StatusDescriptor.class.getName();
-
- StatusDescriptor desc = (StatusDescriptor) ForgeHelper
- .getForgeManagement().getFromCache(portalName, cacheKey);
-
- if (desc == null)
- desc = (StatusDescriptor) ForgeHelper.getForgeManagement()
- .addNodeWatcher(portalName,
- cacheKey,
- new StatusNodeWatcher(cm));
-
- return desc;
- }
-
- /**
- * Path to the xml file with the Status Matrix properties.
- */
- public static String getXmlCmPath(String portalName) {
- return portalName + "/" + STATUS_DIR + "/" + STATUS_XML;
- }
-
- /**
- * Path to the xml file defining Plugins used in the Matrix.
- */
- public static String getXmlStatusPluginsCmPath(String portalName) {
- return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML;
- }
-
- /**
- * Path to the projects.xml file.
- */
- public static String getProjectsXmlPath(String portalName) {
- return portalName + "/" + ProjectsHelper.PROJECTS_DESC;
- }
-
- /**
- * Set containing paths to project.xml files for all projects.
- */
- public static Set<String> getProjectXmlPathsSet(String portalName) {
-
- Set<String> pathsSet = new HashSet<String>();
-
- Projects projects = ProjectsHelper.getProjects(portalName);
- Set<String> projectIdsSet = projects.getProjectIds(
- (PermissionsChecker) new NullPermissionsChecker(), null);
-
- for (String projectId : projectIdsSet) {
-
- String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR
- + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC;
- pathsSet.add(projectXmlPath);
- }
- return pathsSet;
- }
-
- /**
- * Path to the jsp file responsible file displaying the Status Matrix.
- */
- public static String getJspCmPath() {
- return STATUS_JSP_DIR + "/" + STATUS_JSP;
- }
-
- /**
- * Path to the jsp file responsible for displaying project details.
- */
- public static String getPrjDetailsJspCmPath() {
- return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP;
- }
-
- /**
- * Path to the jsp file responsible displaying column details.
- */
- public static String getColumnDetailsJspCmPath() {
- return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP;
- }
-
- public static String getShotokuStatusPath(String portalName) {
- return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR;
- }
-}
Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.forge.status.tools;
+
+/**
+* @author Pawel Wrzeszcz
+* Status Matrix xml tags.
+*/
+public class Tags {
+
+ /* status.xml file tags */
+
+ /* main page */
+ public static final String MAIN_PAGE_COLUMNS_TAG = "main-page";
+
+ public final static String COLUMN_ELEMENT = "column";
+ public final static String COLUMNS_ELEMENT = "columns";
+ public static final String COLUMN_NAME_ELEMENT = "name";
+ public static final String COLUMN_PLUGIN_ELEMENT = "plugin";
+
+ public final static String ORDER_PLUGIN_ELEMENT = "order-plugin";
+
+ /* project page */
+ public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page";
+
+ public static final String ROWS_ELEMENT = "rows";
+ public static final String ROW_ELEMENT = "row";
+ public static final String ROW_NAME_ELEMENT = "name";
+
+ public static final String CELLS_ELEMENT = "cells";
+ public static final String CELL_ELEMENT = "cell";
+ public static final String CELL_NAME_ELEMENT = "name";
+
+ public static final String METRICS_ELEMENT = "metrics";
+ public static final String METRIC_ELEMENT = "metric";
+ public static final String METRIC_NAME_ELEMENT = "name";
+ public static final String METRIC_PLUGIN_ELEMENT = "plugin";
+
+
+ /* plugins.xml tags */
+ public final static String PLUGIN_ELEMENT = "plugin";
+
+ public final static String PLUGIN_ID_ELEMENT = "id";
+ public final static String PLUGIN_CLASS_ELEMENT = "class";
+ public final static String PLUGIN_PROPERTIES_ELEMENT = "properties";
+
+ /* project.xml files tags */
+ public static final String JIRA_SERVICE_PROPERTY = "jira-service";
+ public static final String JIRA_ADRESS_TAG = "jira-adress";
+ public static final String SVN_SERVICE_PROPERTY = "svn-service";
+
+ public static final String CC_SERVICE_PROPERTY = "cc-service";
+ public static final String CC_ADRESS_TAG = "cc-adress";
+
+ public static final String SVN_REPO_ADRESS_TAG = "svn-repo";
+ public static final String SVN_USERNAME_TAG = "svn-username";
+ public static final String SVN_PASSWD_TAG = "svn-passwd";
+
+ /**
+ * This class cannot be instatiated.
+ */
+ private Tags() {};
+}
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-19 09:02:41 UTC (rev 3789)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-19 10:17:19 UTC (rev 3790)
@@ -0,0 +1,124 @@
+package org.jboss.forge.status.tools;
+
+import java.util.HashSet;
+import java.util.Set;
+
+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.NullPermissionsChecker;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
+import org.jboss.forge.status.StatusDescriptor;
+import org.jboss.forge.status.StatusNodeWatcher;
+
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.aop.Inject;
+
+/**
+ * Common constants and functions.
+ * @author Pawel Wrzeszcz
+ */
+public class Tools {
+
+ /** <code>STATUS_XML<code> - file defining the list of watched feeds */
+ private final static String STATUS_XML = "status.xml";
+ private final static String STATUS_PLUGINS_XML = "plugins.xml";
+
+ /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */
+ private final static String STATUS_DIR = "status";
+
+ private final static String STATUS_JSP = "status.jsp";
+ private final static String STATUS_JSP_DIR = "status";
+ private final static String PROJECT_DETAILS_JSP = "project_details.jsp";
+ private final static String COLUMN_DETAILS_JSP = "column_details.jsp";
+
+ /** Shotoku directory to store historical scores */
+ private static final String SHOTOKU_STATUS_DIR = "status";
+
+ public static final String STATUS_SERVICE_NAME = "status:service=scores";
+ //TODO move constans to one place
+
+ @Inject
+ private static ContentManager cm;
+
+ public static synchronized StatusDescriptor getDesc(final String portalName) {
+ String cacheKey = StatusDescriptor.class.getName();
+
+ StatusDescriptor desc = (StatusDescriptor) ForgeHelper
+ .getForgeManagement().getFromCache(portalName, cacheKey);
+
+ if (desc == null)
+ desc = (StatusDescriptor) ForgeHelper.getForgeManagement()
+ .addNodeWatcher(portalName,
+ cacheKey,
+ new StatusNodeWatcher(cm));
+
+ return desc;
+ }
+
+ /**
+ * Path to the xml file with the Status Matrix properties.
+ */
+ public static String getXmlCmPath(String portalName) {
+ return portalName + "/" + STATUS_DIR + "/" + STATUS_XML;
+ }
+
+ /**
+ * Path to the xml file defining Plugins used in the Matrix.
+ */
+ public static String getXmlStatusPluginsCmPath(String portalName) {
+ return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML;
+ }
+
+ /**
+ * Path to the projects.xml file.
+ */
+ public static String getProjectsXmlPath(String portalName) {
+ return portalName + "/" + ProjectsHelper.PROJECTS_DESC;
+ }
+
+ /**
+ * Set containing paths to project.xml files for all projects.
+ */
+ public static Set<String> getProjectXmlPathsSet(String portalName) {
+
+ Set<String> pathsSet = new HashSet<String>();
+
+ Projects projects = ProjectsHelper.getProjects(portalName);
+ Set<String> projectIdsSet = projects.getProjectIds(
+ (PermissionsChecker) new NullPermissionsChecker(), null);
+
+ for (String projectId : projectIdsSet) {
+
+ String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR
+ + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC;
+ pathsSet.add(projectXmlPath);
+ }
+ return pathsSet;
+ }
+
+ /**
+ * Path to the jsp file responsible file displaying the Status Matrix.
+ */
+ public static String getJspCmPath() {
+ return STATUS_JSP_DIR + "/" + STATUS_JSP;
+ }
+
+ /**
+ * Path to the jsp file responsible for displaying project details.
+ */
+ public static String getPrjDetailsJspCmPath() {
+ return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP;
+ }
+
+ /**
+ * Path to the jsp file responsible displaying column details.
+ */
+ public static String getColumnDetailsJspCmPath() {
+ return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP;
+ }
+
+ public static String getShotokuStatusPath(String portalName) {
+ return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR;
+ }
+}
|
