Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4412 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . common service/impl templates tools
|
From: <jbo...@li...> - 2006-05-24 22:34:55
|
Author: wrzep
Date: 2006-05-24 18:34:45 -0400 (Wed, 24 May 2006)
New Revision: 4412
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/common/Constants.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/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/Column.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/RecordManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.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-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -214,8 +214,13 @@
return false;
}
- //TODO refresh scores
+ log.info("Refreshing scores...");
+ mainPageColumns.update(pluginsValues);
+ matrixTemplate.update(pluginsValues);
+
+ log.info("Finished refreshing scores.");
+
return true;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -5,10 +5,6 @@
*/
public class Constants {
-
- /* The length of time to sleep (in milliseconds)
- * if requested scores are not available */
- public static final long SLEEP_TIME = 2000;
public static final int MAX_ATTEMPTS = 10;
public static final String QUEUE_NAME = "queue/jmm";
@@ -18,7 +14,9 @@
public static final String GET_SCORES_MESSAGE = "get";
public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService";
- public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService";
+ public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService";
+
+ public static final long CACHE_INTERVAL = 10*60*1000; /* milliseconds */
/**
* This class cannot be instatiated.
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -63,7 +63,6 @@
private static Logger log = Logger.getLogger(ScoresMDB.class);
-
public void onMessage(Message msg) {
ObjectMessage message = (ObjectMessage) msg;
@@ -71,8 +70,9 @@
try {
String requestName =
message.getStringProperty(Constants.NAME_PROPERTY);
- System.out.println("request name: " + requestName);
+ log.info("Request name: " + requestName);
+
if (requestName.equals(Constants.SAVE_MESSAGE)) {
SaveRequest saveRequest = (SaveRequest) message.getObject();
@@ -85,7 +85,8 @@
(GetScoresRequest) message.getObject();
handleRequest(getScoresRequest);
}
-
+
+ log.info("Finished processing request: " + requestName);
} catch (JMSException e) {
log.error(e); //TODO
@@ -101,10 +102,7 @@
ScoresManagerSync.save(projects, pluginsConf);
} catch (ScoresSaveException e) {
log.error(e); //TODO
- }
-
- System.out.println("SAVED");
-
+ }
}
private static void handleRequest(GetScoresRequest getScoresRequest) {
@@ -121,7 +119,6 @@
}
RecordManager.add(timestamp, pluginsValues);
- System.out.println("added! " + pluginsValues);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -125,6 +125,8 @@
// Save values and store then in cache
values.put(getCurrentNodeName(), pluginsValues);
save(node, pluginsValues);
+
+ log.info("Saved succesfully");
}
/**
@@ -143,7 +145,7 @@
oos.writeObject((PluginsValuesImpl) pluginsValues);
oos.close();
node.save("update"); /* os is closed inside save() */
- log.info("Saved succesfully");
+
} catch (Exception e) {
log.error("Error while saving shotoku node: " +
node.getFullName(), e);
@@ -191,6 +193,8 @@
log.info("Finished.");
values.put(key,v);
}
+ } else {
+ log.info("Returned cached value.");
}
return v;
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-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -56,6 +56,14 @@
metricTemplates = parseMetricTemplates(metricsNode, pluginsValues);
}
+ public void update(PluginsValues pluginsValues) {
+
+ for (MetricTemplate metric : metricTemplates) {
+
+ metric.update(pluginsValues);
+ }
+ }
+
/**
* Gets metrics information from the given Node.
*
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Column.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Column.java 2006-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Column.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -59,6 +59,11 @@
log = Logger.getLogger(this.getClass());
}
+ public void update(PluginValues pluginValues) {
+
+ this.pluginValues = pluginValues;
+ }
+
/**
* Fills the given context with information appropriate for
* the Status Matrix cell, located in the project row and this column.
@@ -166,4 +171,5 @@
public String getName() {
return name;
}
+
}
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-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -87,6 +87,16 @@
Tags.ORDER_PLUGIN_ELEMENT);
}
+ public void update(PluginsValues pluginsValues) {
+
+ for (Column column : columns) {
+
+ PluginValues pluginValues =
+ pluginsValues.getPluginValues(column.getId());
+ column.update(pluginValues);
+ }
+ }
+
/**
* Adds to the columns list columns defined in columnsRoot.
*
@@ -122,27 +132,7 @@
}
}
- /**
- * Retruns Plugin determining project order in the Status Matrix.
- *
- * @param pageRoot Node specfying Columns properties
- * @param plugins Plugins used by Columns
- * @return Plugin determining projects order
- * or null if it is not specified in the properties
- */ /*
- private Plugin getOrderPlugin(Node pageRoot, PluginsValues pluginsValues) {
-
- String orderPluginId = XmlTools.getChildNodeValue(pageRoot,
- StatusTags.ORDER_PLUGIN_ELEMENT);
-
- if (orderPluginId != null) {
- return pluginsValues.get(orderPluginId);
- }
-
- return null;
- }*/
-
/**
* Fills the given context with the columns information.
*
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-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -61,6 +61,14 @@
rowTemplates = parseMatrixTemplate(rowsRoot, pluginsValues);
}
+ public void update(PluginsValues pluginsValues) {
+
+ for (RowTemplate row : rowTemplates) {
+
+ row.update(pluginsValues);
+ }
+ }
+
/**
* Gets rows information from the given Node.
*
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-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -36,8 +36,9 @@
*/
public class MetricTemplate {
- String name;
- PluginValues pluginValues;
+ private String name;
+ private String pluginId;
+ private PluginValues pluginValues;
/**
* @param cellNode root Node specfying cell properties
@@ -48,11 +49,16 @@
name = XmlTools.getChildNodeValue(cellNode,
Tags.METRIC_NAME_ELEMENT);
- String pluginId = XmlTools.getChildNodeValue(cellNode,
+ pluginId = XmlTools.getChildNodeValue(cellNode,
Tags.METRIC_PLUGIN_ELEMENT);
pluginValues = pluginsValues.getPluginValues(pluginId);
}
+
+ public void update(PluginsValues pluginsValues) {
+
+ pluginValues = pluginsValues.getPluginValues(pluginId);
+ }
/**
* Fills the given context with metric information for specified project.
@@ -72,6 +78,5 @@
Integer.toString(pluginValues.getRate(projectId)));
}
}
-
}
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-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -64,6 +64,14 @@
cellTemplates = parseRowTemplate(cellsNode, pluginsValues);
}
+ public void update(PluginsValues pluginsValues) {
+
+ for (CellTemplate cell : cellTemplates) {
+
+ cell.update(pluginsValues);
+ }
+ }
+
/**
* Gets cells information from the given Node.
*
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java 2006-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -23,19 +23,17 @@
}
buff.add(new TimestampedScore(sent, pluginsValues));
-
- System.out.println("added " + sent + " " + buff.size());
}
public static PluginsValues get(Timestamp sent) {
- System.out.println("get " + sent + " size=" + buff.size());
-
for (int i = 0; i < buff.size (); i++) {
- TimestampedScore ts = buff.get(i); System.out.print("get " + ts + " ");
+ TimestampedScore ts = buff.get(i);
if (ts.getTimestamp().equals(sent)) {
+
+ buff.remove(i);
return ts.getPluginsValues();
}
}
Modified: 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-05-24 22:34:09 UTC (rev 4411)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-05-24 22:34:45 UTC (rev 4412)
@@ -2,6 +2,7 @@
import org.jboss.forge.status.StatusDescriptor;
import org.jboss.forge.status.StatusConfWatcher;
+import org.jboss.forge.status.common.Constants;
import org.jboss.shotoku.aop.CacheItem;
@@ -11,7 +12,7 @@
*/
public class Tools {
- @CacheItem(interval=10000)
+ @CacheItem(interval=Constants.CACHE_INTERVAL)
private static StatusConfWatcher conf;
public static synchronized StatusDescriptor getDesc(final String portalName) {
|
