[jboss-svn-commits] JBL Code SVN: r17040 - in labs/jbosslabs/trunk/stats-server/sources: metrics/common/src/java/org/jboss/labs/metrics/common/protocol and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 5 11:44:42 EST 2007
Author: wrzep
Date: 2007-12-05 11:44:42 -0500 (Wed, 05 Dec 2007)
New Revision: 17040
Added:
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/assignee.xhtml
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/priority.xhtml
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/status.xhtml
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/stylesheet/labs.css
Removed:
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.page.xml
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.xhtml
Modified:
labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java
labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/ScoresService.java
labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java
labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresDailyUpdater.java
labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java
labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJob.java
labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJobListener.java
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/menu.xhtml
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/template.xhtml
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/project.xhtml
Log:
jira metrics: portlets -> seam
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -7,17 +7,13 @@
public static final int MAX_ATTEMPTS = 10;
- public static final int SCORES_UPDATE_INTERVAL_DEFAULT
- = 24*60; /* minutes */
- /* By default perform update every 24 hours */
-
- public static final int FIRST_UPDATE_INTERVAL_DEFAULT = 1;/* minutes */
+ public static final int FIRST_UPDATE_INTERVAL = 1;/* minutes */
/* By default perform first update after 1 minute */
- /* By default start at midnight */
- public static final int UPDATE_START_HOUR_DEFAULT = 0;
+ /* By default start at 1:30 AM */
+ public static final int UPDATE_START_HOUR = 1;
- public static final int UPDATE_START_MINUTE_DEFAULT = 0;
+ public static final int UPDATE_START_MINUTE = 30;
public static final long CACHE_INTERVAL = 3*60*1000; /* milliseconds */
/* Check for new scores every 3 minutes */
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/ScoresService.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/ScoresService.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/ScoresService.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -24,8 +24,7 @@
import java.io.Serializable;
-import javax.naming.NamingException;
-
+import org.jboss.labs.metrics.common.exceptions.ScoresException;
import org.jboss.labs.metrics.common.protocol.conf.Configuration;
@@ -35,11 +34,11 @@
public interface ScoresService extends Serializable {
- public void init(Configuration conf) throws NamingException;
+ public void init(Configuration conf) throws ScoresException;
public void ping();
- public void update();
+ public void update() throws ScoresException;
public Object invoke(org.jboss.invocation.Invocation mi) throws Exception;
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -1,31 +1,22 @@
package org.jboss.labs.metrics.common.tools;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.StringTokenizer;
-
import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
-import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-
import org.jboss.forge.common.ejb3.MetricsProjectsService;
import org.jboss.labs.metrics.common.Constants;
-import org.jboss.labs.metrics.common.protocol.ScoresService;
+import org.jboss.labs.metrics.common.exceptions.ScoresException;
import org.jboss.labs.metrics.common.protocol.conf.ScoresUpdater;
import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.MBeanServerLocator;
/**
@@ -43,16 +34,6 @@
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
}
-
- public static String formatDate(Calendar cal) {
-
- Date date = cal.getTime();
-
- DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
- String dateString = dateFormat.format(date) + " GMT";
-
- return dateString;
- }
public static Calendar nextDay(Calendar date) {
@@ -97,48 +78,23 @@
}
}
- public static MetricsProjectsService getProjectsService(Properties properties) throws NamingException {
+ public static MetricsProjectsService getProjectsService(Properties properties) throws ScoresException {
- InitialContext ic = new InitialContext(properties);
- return (MetricsProjectsService)ic.lookup("MetricsProjectsService");
- }
-
- public static ScoresService getScoresService(Properties properties) throws NamingException {
-
- log.debug("Looking up ScoresService. " +
- "(Security Manager: " + System.getSecurityManager() + ")");
-
- InitialContext ic = new InitialContext(properties);
-
- ScoresService service = (ScoresService)ic.lookup("JMMService");
-
- return service;
- }
-
- public static ScoresUpdater getScoresUpdater() {
-
- ScoresUpdater updater;
-
try {
- Context context = new InitialContext();
-
- // Perform look up using JNDI name of ejb object
- String serviceBinding = Constants.DAILY_SCORES_UPDATER;
-
- Object ref = context.lookup(serviceBinding);
-
- // Narrow the reference of the object returned by lookup() method
- updater = (ScoresUpdater) PortableRemoteObject.narrow( ref,
- ScoresUpdater.class);
-
- } catch (NamingException e) {
-
- log.warn("Unable to schedule updates." +
- "\nCause: " + e.getMessage());
- return null;
+ InitialContext ic = new InitialContext(properties);
+ return (MetricsProjectsService)ic.lookup("MetricsProjectsService");
+ } catch (Exception e) {
+ throw new ScoresException(e);
}
-
+ }
- return updater;
+ public static ScoresUpdater getScoresUpdater() throws MalformedObjectNameException {
+
+ MBeanServer server = MBeanServerLocator.locate();
+
+ return (ScoresUpdater) MBeanProxyExt.create(
+ ScoresUpdater.class,
+ Constants.DAILY_SCORES_UPDATER,
+ server);
}
}
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresDailyUpdater.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresDailyUpdater.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresDailyUpdater.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -86,7 +86,8 @@
scheduler.addJobListener(jobListener);
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.MINUTE, 1);
+ //cal.add(Calendar.MINUTE, Constants.FIRST_UPDATE_INTERVAL); DEBUG
+ cal.add(Calendar.SECOND, 20);
Trigger trigger = TriggerUtils.makeImmediateTrigger("metricsInitTrigger", SimpleTrigger.REPEAT_INDEFINITELY, 60*1000);
trigger.setStartTime(cal.getTime());
@@ -101,12 +102,12 @@
scheduler = StdSchedulerFactory.getDefaultScheduler();
}
- System.out.println("schedule update");
-
JobDetail jobDetail = new JobDetail("meticsUpdateJob",
null,
MetricsUpdateJob.class);
- Trigger trigger = TriggerUtils.makeDailyTrigger("metricsUpdateTrigger", 18, 18);
+ Trigger trigger = TriggerUtils.makeDailyTrigger("metricsUpdateTrigger",
+ Constants.UPDATE_START_HOUR,
+ Constants.UPDATE_START_MINUTE);
scheduler.scheduleJob(jobDetail, trigger);
}
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -31,6 +31,7 @@
import org.jboss.annotation.ejb.Service;
import org.jboss.labs.metrics.common.Constants;
+import org.jboss.labs.metrics.common.exceptions.ScoresException;
import org.jboss.labs.metrics.common.protocol.ScoresService;
import org.jboss.labs.metrics.common.protocol.conf.Configuration;
import org.jboss.labs.metrics.common.tools.Tools;
@@ -56,7 +57,7 @@
private boolean initialized = false;
- public void init(Configuration conf) throws NamingException {
+ public void init(Configuration conf) throws ScoresException {
if (initialized) {
return;
@@ -75,11 +76,18 @@
service.ping();
initialized = true;
+
+ update(); // debug
}
- public void update() {
+ public void update() throws ScoresException {
- log.debug("upate");
+ log.debug("Perfoming update...");
+
+ MetricsProjectsService service = Tools.getProjectsService(projectsServiceProperties);
+
+
+
}
public void ping() {
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -28,7 +28,7 @@
import org.jboss.labs.metrics.common.exceptions.GetPluginValueException;
import org.jboss.labs.metrics.common.exceptions.UnableToGetPluginValueException;
import org.jboss.labs.metrics.common.protocol.conf.Plugin;
-import org.jboss.labs.metrics.common.tools.ProjectTools;
+import org.jboss.labs.metrics.web.action.common.tools.ProjectTools;
/**
* @author Pawel Wrzeszcz
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJob.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJob.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJob.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -26,7 +26,6 @@
import org.jboss.labs.metrics.common.Constants;
import org.jboss.labs.metrics.common.protocol.ScoresService;
import org.jboss.labs.metrics.service.DefaultConfiguration;
-import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.MBeanServerLocator;
import org.quartz.Job;
@@ -39,12 +38,8 @@
public class MetricsInitJob implements Job {
- private static Logger log = Logger.getLogger(MetricsInitJob.class);
-
public void execute(JobExecutionContext context) throws JobExecutionException {
- log.info("execute");
-
try {
MBeanServer server = MBeanServerLocator.locate();
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJobListener.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJobListener.java 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/quartz/MetricsInitJobListener.java 2007-12-05 16:44:42 UTC (rev 17040)
@@ -31,7 +31,6 @@
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.quartz.JobListener;
-import org.quartz.SchedulerException;
public class MetricsInitJobListener implements JobListener {
@@ -54,7 +53,7 @@
Tools.getScoresUpdater().scheduleUpdate();
- } catch (SchedulerException e) {
+ } catch (Exception e) {
log.warn("Unable to unschedule job", e);
}
return;
Added: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/assignee.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/assignee.xhtml (rev 0)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/assignee.xhtml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -0,0 +1,32 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:c="http://java.sun.com/jsf/core">
+ <h3>Open Issues By Assignee</h3><hr class="greyHR"/><br/>
+ <img src="#{jira.openIssuesPerAssigneeChartLocator.hiresUrl}" border="0" />
+ <br/><br/>
+ <rich:dataTable value="#{jira.openIssuesPerAssignee}" var="i" rowKeyVar="row">
+ <rich:column>
+ <f:facet name="header">
+ Rank
+ </f:facet>
+ #{row}
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ Assignee
+ </f:facet>
+ #{i.key}
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ Issues
+ </f:facet>
+ #{i.value}
+ </rich:column>
+ </rich:dataTable>
+</div>
Added: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/priority.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/priority.xhtml (rev 0)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/priority.xhtml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -0,0 +1,45 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <h3>Open Issues by Priority</h3><hr class="greyHR"/><br/>
+
+ <img src="#{jira.openIssuesPerPriorityChartLocator.hiresUrl}" border="0"/>
+ <br/><br/>
+
+ <table border="0" cellpadding="4" cellspacing="0" class="basetablestyle">
+ <tr class="header">
+ <th class="tableheaderfirst">Priority</th>
+ <th class="tableheader">#</th>
+ </tr>
+ <tr class="oddRow portlet-section-body">
+ <td class="rowlinefirst"><strong>Blocker</strong></td>
+ <td class="rowline">#{jira.blockerOpenIssues}</td>
+ </tr>
+ <tr class="evenRow portlet-section-alternate">
+ <td class="rowlinefirst"><strong>Critical</strong></td>
+ <td class="rowline">#{jira.criticalOpenIssues}</td>
+ </tr>
+ <tr class="oddRow portlet-section-body">
+ <td class="rowlinefirst"><strong>Major</strong></td>
+ <td class="rowline">#{jira.criticalOpenIssues}</td>
+ </tr>
+ <tr class="evenRow portlet-section-alternate">
+ <td class="rowlinefirst"><strong>Minor</strong></td>
+ <td class="rowline">#{jira.minorOpenIssues}</td>
+ </tr>
+ <tr class="oddRow portlet-section-body">
+ <td class="rowlinefirst"><strong>Optional</strong></td>
+ <td class="rowline">#{jira.optionalOpenIssues}</td>
+ </tr>
+ <tr class="evenRow portlet-section-body">
+ <td class="bottomline rowlinefirst"><strong>Trivial</strong></td>
+ <td class="bottomline rowline">#{jira.trivialOpenIssues}</td>
+ </tr>
+</table>
+<br/><br/>
+</div>
Added: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/status.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/status.xhtml (rev 0)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/jira/status.xhtml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -0,0 +1,37 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.org/rich">
+ <h3>Issues by Status</h3><hr class="greyHR"/><br/>
+ <img src="#{jira.issuesPerStatusChartLocator.hiresUrl}" border="0" />
+ <br/><br/>
+ <table border="0" cellpadding="4" cellspacing="0" class="basetablestyle">
+ <tr class="header">
+ <th class="tableheaderfirst">Status</th>
+ <th class="tableheader">#</th>
+ </tr>
+ <tr class="oddRow portlet-section-body">
+ <td class="rowlinefirst"><strong>Open</strong></td>
+ <td class="rowline">#{jira.openIssues}</td>
+ </tr>
+ <tr class="evenRow portlet-section-alternate">
+ <td class="rowlinefirst"><strong>Coding In Progress</strong></td>
+ <td class="rowline">#{jira.codingInProgressIssues}</td>
+ </tr>
+ <tr class="oddRow portlet-section-body">
+ <td class="rowlinefirst"><strong>Reopened</strong></td>
+ <td class="rowline">#{jira.reopenedIssues}</td>
+ </tr>
+ <tr class="evenRow portlet-section-alternate">
+ <td class="rowlinefirst"><strong>Resolved</strong></td>
+ <td class="rowline">#{jira.resolvedIssues}</td>
+ </tr>
+ <tr class="oddRow portlet-section-body">
+ <td class="bottomline rowlinefirst"><strong>Closed</strong></td>
+ <td class="bottomline rowline">#{jira.closedIssues}</td>
+ </tr>
+ </table>
+</div>
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/menu.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/menu.xhtml 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/menu.xhtml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -9,10 +9,4 @@
<h:outputText value="#{projectName}:"/>
<s:link view="/home.xhtml" value="Home"/>
</rich:toolBarGroup>
- <!-- @newMenuItem@ -->
- <rich:toolBarGroup location="right">
- <h:outputText value="Welcome, #{identity.username}!" rendered="#{identity.loggedIn}"/>
- <s:link view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}"/>
- <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
- </rich:toolBarGroup>
</rich:toolBar>
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/template.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/template.xhtml 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/layout/template.xhtml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -8,7 +8,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>metrics_web</title>
- <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
+ <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
+ <link href="stylesheet/labs.css" rel="stylesheet" type="text/css" />
</head>
<body>
@@ -23,7 +24,6 @@
<div class="footer">
Powered by <a href="http://jboss.com/products/seam">Seam</a>.
- Generated by seam-gen.
</div>
</body>
Deleted: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.page.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.page.xml 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.page.xml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<page xmlns="http://jboss.com/products/seam/pages"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
-
- <navigation from-action="#{identity.login}">
- <rule if="#{identity.loggedIn}">
- <redirect view-id="/home.xhtml"/>
- </rule>
- </navigation>
-
-</page>
Deleted: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.xhtml 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/login.xhtml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -1,45 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:s="http://jboss.com/products/seam/taglib"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:rich="http://richfaces.org/rich"
- template="layout/template.xhtml">
-
-<ui:define name="body">
-
- <h:messages styleClass="message"/>
-
- <h:form id="login">
-
- <rich:panel>
- <f:facet name="header">Login</f:facet>
-
- <p>Please login using any username and password</p>
-
- <div class="dialog">
- <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
- <h:outputLabel for="username">Username</h:outputLabel>
- <h:inputText id="username"
- value="#{identity.username}"/>
- <h:outputLabel for="password">Password</h:outputLabel>
- <h:inputSecret id="password"
- value="#{identity.password}"/>
- <h:outputLabel for="rememberMe">Remember me</h:outputLabel>
- <h:selectBooleanCheckbox id="rememberMe"
- value="#{identity.rememberMe}"/>
- </h:panelGrid>
- </div>
-
- </rich:panel>
-
- <div class="actionButtons">
- <h:commandButton value="Login" action="#{identity.login}"/>
- </div>
-
- </h:form>
-
- </ui:define>
-</ui:composition>
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/project.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/project.xhtml 2007-12-05 15:28:02 UTC (rev 17039)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/project.xhtml 2007-12-05 16:44:42 UTC (rev 17040)
@@ -13,7 +13,7 @@
<h:messages globalOnly="true" styleClass="message"/>
<rich:panel>
- <f:facet name="header">Project Metrics</f:facet>
+ <f:facet name="header">#{project.name}</f:facet>
<rich:panelMenu style="width:200px" mode="ajax"
iconExpandedGroup="disc" iconCollapsedGroup="disc"
@@ -27,37 +27,11 @@
</rich:panelMenuItem>
</rich:panelMenu>
-
- <p>#{project.name}</p>
-
- <img src="${jira.issuesPerStatusChartLocator.hiresUrl}" border="0" />
- <table border="0" cellpadding="4" cellspacing="0"
- class="basetablestyle">
- <tr class="header">
- <th class="tableheaderfirst">Status</th>
- <th class="tableheader">#</th>
- </tr>
- <tr class="oddRow portlet-section-body">
- <td class="rowlinefirst"><strong>Open</strong></td>
- <td class="rowline">${jira.openIssues}</td>
- </tr>
- <tr class="evenRow portlet-section-alternate">
- <td class="rowlinefirst"><strong>Coding In Progress</strong></td>
- <td class="rowline">${jira.codingInProgressIssues}</td>
- </tr>
- <tr class="oddRow portlet-section-body">
- <td class="rowlinefirst"><strong>Reopened</strong></td>
- <td class="rowline">${jira.reopenedIssues}</td>
- </tr>
- <tr class="evenRow portlet-section-alternate">
- <td class="rowlinefirst"><strong>Resolved</strong></td>
- <td class="rowline">${jira.resolvedIssues}</td>
- </tr>
- <tr class="oddRow portlet-section-body">
- <td class="bottomline rowlinefirst"><strong>Closed</strong></td>
- <td class="bottomline rowline">${jira.closedIssues}</td>
- </tr>
- </table>
+
+ <ui:include src="jira/status.xhtml" />
+ <ui:include src="jira/assignee.xhtml" />
+ <ui:include src="jira/priority.xhtml" />
+
</rich:panel>
</ui:define>
Added: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/stylesheet/labs.css
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/stylesheet/labs.css (rev 0)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/stylesheet/labs.css 2007-12-05 16:44:42 UTC (rev 17040)
@@ -0,0 +1,96 @@
+/* -------------------- Info table Style --------------------------------------- */
+
+.basetablestyle, .bodyTable {
+ margin:0px;
+}
+
+.basetablestyle img {
+ border:0px;
+}
+
+.basetablestyle td {
+ height:3em;
+ padding-left: 6px;
+ padding-right: 30px;
+}
+
+.basetablestyle .header {
+ background-color: #233345;
+ font-size:10px;
+ font-weight:bold;
+ color:#94aebd;
+ text-align:left;
+}
+
+.basetablestyle .header a {
+ color:#94aebd;
+}
+
+.basetablestyle .tableheaderfirst {
+ border-bottom:1px solid #233345;
+ height:2em;
+}
+
+.basetablestyle .tableheader {
+ border-left:1px solid #94aebd;
+ border-bottom:1px solid #233345;
+ height:2em;
+}
+
+.basetablestyle .subheader {
+ background-color: #e6e7e8;
+ font-size:10px;
+ font-weight:bold;
+ color:#000000;
+ text-align:left;
+}
+
+.basetablestyle .subheader .tableheaderfirst {
+ height:2em;
+ border-bottom: 0px;
+}
+
+.basetablestyle .subheader .tableheader {
+ height:2em;
+ border-left:1px solid #e6e7e8;
+ border-bottom:0px;
+}
+
+
+
+
+.basetablestyle .rowlinefirst {
+ border-bottom:1px solid #e6e7e8;
+}
+
+.basetablestyle .rowline {
+ border-left:1px solid #e6e7e8;
+ border-bottom:1px solid #e6e7e8;
+}
+
+.basetablestyle .categoryRow {
+ background-color: #dcdedf;
+ font-weight:bold;
+ padding-left: 6px;
+}
+
+.basetablestyle .oddRow, .a {
+ background-color: #f4f3f3;
+ padding-left: 6px;
+}
+
+.basetablestyle .evenRow, .b {
+ background-color: #ffffff;
+}
+
+.basetablestyle .footerrow {
+ background-color:#656565;
+}
+
+.basetablestyle .bottomline {
+ border-bottom:1px solid #656565;
+}
+
+.basetablestyle .topline {
+ border-top:1px solid #656565;
+}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list