|
From: <jbo...@li...> - 2006-06-15 15:31:44
|
Author: wrzep
Date: 2006-06-15 11:31:16 -0400 (Thu, 15 Jun 2006)
New Revision: 4769
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/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-06-15 13:42:31 UTC (rev 4768)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-15 15:31:16 UTC (rev 4769)
@@ -39,7 +39,6 @@
import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.impl.protocol.PluginConfImpl;
import org.jboss.forge.status.service.impl.protocol.ServiceConfImpl;
@@ -86,7 +85,7 @@
*/
public Status(String portalName, Node statusRoot, Node pluginsRoot,
org.jboss.shotoku.Node serviceNode)
- throws ScoresException {
+ throws GetScoresException {
log = Logger.getLogger(this.getClass());
@@ -99,18 +98,18 @@
PluginsValues pluginsValues;
- try {
- // Get latest available scores
- ScoresManager.init(portalName, serviceConf);
- pluginsValues = ScoresManager.getLatestScores();
- updateDate = pluginsValues.getDate();
-
- // Compute and save current scores
+ // Compute and save current scores
+ try {
ScoresManager.save(projects, pluginsConf);
-
} catch (ScoresSaveException e) {
log.error("Saving scores failed ", e);
- throw e;
+ }
+
+ // Get latest available scores
+ try {
+ ScoresManager.init(portalName, serviceConf);
+ pluginsValues = ScoresManager.getLatestScores();
+ updateDate = pluginsValues.getDate();
} catch (GetScoresException e) {
log.error("Getting computed scores failed ", e);
throw e;
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-06-15 13:42:31 UTC (rev 4768)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-15 15:31:16 UTC (rev 4769)
@@ -16,8 +16,7 @@
public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService";
public static final long CACHE_INTERVAL = 5*60*1000; /* milliseconds */
- //TODO conf via cms?
-
+
/**
* This class cannot be instatiated.
*/
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-06-15 13:42:31 UTC (rev 4768)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-15 15:31:16 UTC (rev 4769)
@@ -92,7 +92,7 @@
return ScoresManagerSync.getScores(cal);
}
- if ((attempts++) == Constants.MAX_ATTEMPTS) {
+ if ((++attempts) == Constants.MAX_ATTEMPTS) {
throw new GetScoresException(
"Can not find any recently saved scores. " +
"Gave up after " + attempts + " attempts.");
|