[jboss-svn-commits] JBL Code SVN: r7776 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: common/protocol portlet portlet/conf service/plugins/math
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 22 07:39:54 EST 2006
Author: wrzep
Date: 2006-11-22 07:39:49 -0500 (Wed, 22 Nov 2006)
New Revision: 7776
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/Status.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/StatusDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java
Log:
JBLAB-599
After restarting AS with JMM service, JMM portlet on the labs side threw exception due to the fact that service object
was changed.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresManager.java 2006-11-22 11:11:45 UTC (rev 7775)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresManager.java 2006-11-22 12:39:49 UTC (rev 7776)
@@ -27,8 +27,7 @@
import javax.naming.NamingException;
-import org.jboss.forge.status.common.exceptions.GetScoresException;
-import org.jboss.forge.status.common.exceptions.ScoresSaveException;
+import org.jboss.forge.status.common.exceptions.ScoresException;
import org.jboss.forge.status.common.protocol.conf.PluginsValues;
@@ -38,20 +37,20 @@
public interface ScoresManager extends Serializable {
- public boolean hasScores(Calendar cal) throws NamingException;
+ public boolean hasScores(Calendar cal) throws NamingException, ScoresException;
public PluginsValues getScores(Calendar cal)
- throws GetScoresException;
+ throws ScoresException;
public PluginsValues getLatestScores()
- throws GetScoresException;
+ throws ScoresException;
public long getValue(String pluginId, String projectId,
Calendar cal)
- throws GetScoresException;
+ throws ScoresException;
public long getValue(String id, String projectId,
- Calendar start, Calendar end) throws GetScoresException;
+ Calendar start, Calendar end) throws ScoresException;
- public void save() throws ScoresSaveException;
+ public void save() throws ScoresException;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/Status.java 2006-11-22 11:11:45 UTC (rev 7775)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/Status.java 2006-11-22 12:39:49 UTC (rev 7776)
@@ -35,11 +35,9 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.status.common.Tags;
-import org.jboss.forge.status.common.exceptions.GetScoresException;
import org.jboss.forge.status.common.exceptions.ScoresException;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.protocol.conf.PluginsValues;
-import org.jboss.forge.status.common.tools.ProjectTools;
import org.jboss.forge.status.common.tools.Tools;
import org.jboss.forge.status.portlet.templates.Column;
import org.jboss.forge.status.portlet.templates.Columns;
@@ -199,7 +197,7 @@
try {
pluginsValues = scoresManager.getLatestScores();
- } catch (GetScoresException e) {
+ } catch (ScoresException e) {
log.warn("Failed to get latest scores.", e);
return;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/StatusDescriptor.java 2006-11-22 11:11:45 UTC (rev 7775)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/StatusDescriptor.java 2006-11-22 12:39:49 UTC (rev 7776)
@@ -23,24 +23,15 @@
package org.jboss.forge.status.portlet;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.ProjectsHelper;
-
import org.jboss.forge.status.common.Locations;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.protocol.conf.Configuration;
-import org.jboss.forge.status.common.protocol.conf.PluginConf;
-import org.jboss.forge.status.common.protocol.conf.ServiceConf;
-import org.jboss.forge.status.common.protocol.conf.UpdatesConf;
import org.jboss.forge.status.common.tools.Tools;
import org.jboss.forge.status.portlet.conf.ConfgurationImpl;
-import org.jboss.forge.status.portlet.conf.ServiceConfImpl;
import org.jboss.forge.status.portlet.conf.ServiceScoresManager;
-import org.jboss.forge.status.portlet.conf.UpdatesConfImpl;
import org.jboss.logging.Logger;
import org.jboss.portal.common.context.DelegateContext;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java 2006-11-22 11:11:45 UTC (rev 7775)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java 2006-11-22 12:39:49 UTC (rev 7776)
@@ -23,34 +23,22 @@
package org.jboss.forge.status.portlet.conf;
-import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Properties;
-import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
-import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.common.exceptions.GetScoresException;
import org.jboss.forge.status.common.exceptions.ScoresException;
-import org.jboss.forge.status.common.exceptions.ScoresSaveException;
-
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.protocol.ScoresService;
import org.jboss.forge.status.common.protocol.conf.Configuration;
import org.jboss.forge.status.common.protocol.conf.PluginConf;
import org.jboss.forge.status.common.protocol.conf.PluginsValues;
import org.jboss.forge.status.common.protocol.conf.PluginsValuesRemote;
-import org.jboss.forge.status.common.protocol.conf.ScoresUpdater;
-import org.jboss.forge.status.common.protocol.conf.ServiceConf;
-
import org.jboss.forge.status.common.tools.Tools;
import org.jboss.logging.Logger;
@@ -69,21 +57,25 @@
private boolean asyncSave = false;
private Logger log;
- private ScoresService service;
-
public ServiceScoresManager(Configuration conf) throws ScoresException {
properties = conf.getScoresServiceConf().getProperties();
log = Logger.getLogger(this.getClass());
+ ScoresService service = getService();
+
+ service.init(conf, this);
+ }
+
+
+ private ScoresService getService() throws ScoresException {
+
try {
- service = Tools.getScoresService(properties);
+ return Tools.getScoresService(properties);
} catch (NamingException e) {
throw new ScoresException(e);
}
-
- service.init(conf, this);
}
@@ -111,31 +103,36 @@
save();
asyncSave = true;
log.info("Finished async save.");
- } catch (ScoresSaveException e) {
+ } catch (ScoresException e) {
log.warn("Async saving scores failed.", e);
}
}
- public synchronized void save() throws ScoresSaveException {
+ public synchronized void save() throws ScoresException {
+ ScoresService service = getService();
service.save();
}
- public boolean hasScores(Calendar cal) throws NamingException {
+ public boolean hasScores(Calendar cal) throws NamingException, ScoresException {
+ ScoresService service = getService();
return service.hasPluginsValues(cal);
}
public PluginsValues getScores(Calendar cal)
- throws GetScoresException {
+ throws ScoresException {
log.info("getScores");
PluginsValuesRemote pluginsValues;
try {
+ ScoresService service = getService();
pluginsValues = service.getPluginsValuesRemote(cal);
+ } catch (ScoresException e) {
+ throw e;
} catch (Exception e) {
throw new GetScoresException(e);
}
@@ -149,7 +146,7 @@
public PluginsValues getLatestScores()
- throws GetScoresException {
+ throws ScoresException {
Calendar cal = Calendar.getInstance();
Tools.truncate(cal);
@@ -193,8 +190,9 @@
*/
public long getValue(String pluginId, String projectId,
Calendar cal)
- throws GetScoresException {
+ throws ScoresException {
+ ScoresService service = getService();
return service.getValue(pluginId, projectId, cal);
}
@@ -208,8 +206,9 @@
* Thrown when requested value was not found
*/
public long getValue(String pluginId, String projectId,
- Calendar start, Calendar end) throws GetScoresException {
+ Calendar start, Calendar end) throws ScoresException {
+ ScoresService service = getService();
return service.getValue(pluginId, projectId, start, end);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java 2006-11-22 11:11:45 UTC (rev 7775)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java 2006-11-22 12:39:49 UTC (rev 7776)
@@ -27,8 +27,8 @@
import java.util.Properties;
import org.jboss.forge.status.common.Tags;
-import org.jboss.forge.status.common.exceptions.GetScoresException;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
+import org.jboss.forge.status.common.exceptions.ScoresException;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.tools.Plugins;
import org.jboss.forge.status.service.plugins.Plugin;
@@ -90,7 +90,7 @@
try {
prevValue = scoresManager.getValue(
insidePlugin.getId(), projectId, cal, now);
- } catch (GetScoresException e) {
+ } catch (ScoresException e) {
return 0;
}
More information about the jboss-svn-commits
mailing list