Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3889 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . exceptions plugins service tools
|
From: <jbo...@li...> - 2006-04-21 16:27:28
|
Author: wrzep
Date: 2006-04-21 12:27:16 -0400 (Fri, 21 Apr 2006)
New Revision: 3889
Added:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/PluginValueNotFoundException.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/plugins/Last7DaysStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.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/service/ScoresServiceLocal.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginsValues.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-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -37,12 +37,12 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
-import org.jboss.forge.status.exceptions.PluginValueNotFoundException;
+import org.jboss.forge.status.exceptions.GetScoresException;
+import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.templates.Column;
import org.jboss.forge.status.templates.Columns;
import org.jboss.forge.status.templates.MatrixTemplate;
import org.jboss.forge.status.tools.PluginConf;
-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.Tags;
@@ -63,11 +63,8 @@
private Columns mainPageColumns;
/** Matrix to display on the project specyfic page */
- private MatrixTemplate matrixTemplate;
+ private MatrixTemplate matrixTemplate;
- /** Plugins used in the Status Matrix */
- private Plugins plugins;
-
/** Projects present in the Status Matrix */
private Projects projects;
@@ -94,24 +91,21 @@
ScoresManager scoresManager = new ScoresManager(portalName);
// Compute and save current scores
- boolean b = scoresManager.save(projects, pluginsConf);
+ scoresManager.save(projects, pluginsConf);
- // <debug>
- System.out.print("save: " + b);
- System.out.println("** class: " + pluginsConf);
- System.out.println("** item class: " + pluginsConf.get(0));
- System.out.println("** item x: " + pluginsConf.get(0).getFieldValue("x"));
-
+ // <debug>;
long v = scoresManager.getValue("downloads", "jbosswiki", new Date(), new Date());
System.out.println("value = " + v);
// </debug>
pluginsValues = scoresManager.getCurrentScores();
- } catch (PluginValueNotFoundException e) {
-
- e.printStackTrace(); //TODO log msg
+ } catch (ScoresSaveException e) {
+ log.error("Saving scores failed ", e);
return;
+ } catch (GetScoresException e) {
+ log.error("Getting computed scores failed ", e);
+ return;
}
// Get columns to display on the main page
Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java 2006-04-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -0,0 +1,42 @@
+/*
+ * 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.exceptions;
+
+/**
+* @author Pawel Wrzeszcz (paw...@gm...)
+* Indicates that searching for saved scores failed.
+*/
+
+public class GetScoresException extends Exception {
+
+ private static final long serialVersionUID = 7291136165537810321L;
+
+ public GetScoresException() {
+ super();
+ }
+
+ public GetScoresException(Exception e) {
+ super(e);
+ }
+
+}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/PluginValueNotFoundException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/PluginValueNotFoundException.java 2006-04-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/PluginValueNotFoundException.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -1,38 +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.exceptions;
-
-/**
-* @author Pawel Wrzeszcz (paw...@gm...)
-* Indicates that searching for value stored in PluginsValues failed.
-*/
-
-public class PluginValueNotFoundException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public PluginValueNotFoundException() {
- super();
- }
-
-}
Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java 2006-04-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -0,0 +1,38 @@
+/*
+ * 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.exceptions;
+
+/**
+* @author Pawel Wrzeszcz (paw...@gm...)
+* Indicates that computing or saving scores failed.
+*/
+
+public class ScoresSaveException extends Exception {
+
+ private static final long serialVersionUID = 7291136165537810321L;
+
+ public ScoresSaveException(Exception e) {
+ super(e);
+ }
+
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-04-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -28,7 +28,7 @@
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException;
-import org.jboss.forge.status.exceptions.PluginValueNotFoundException;
+import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.tools.Plugins;
import org.jboss.forge.status.tools.ScoresManager;
@@ -85,7 +85,7 @@
try {
prevValue = scoresManager.getValue(
insidePlugin.getId(), projectId, prev,now);
- } catch (PluginValueNotFoundException e) {
+ } catch (GetScoresException e) {
return 0;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-04-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -26,7 +26,8 @@
import java.util.List;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.PluginValueNotFoundException;
+import org.jboss.forge.status.exceptions.GetScoresException;
+import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.tools.PluginConf;
import org.jboss.forge.status.tools.PluginValues;
import org.jboss.forge.status.tools.PluginsValues;
@@ -38,11 +39,11 @@
public interface ScoresService {
public PluginsValues getPluginsValues(String portalName,
- Date date) throws PluginValueNotFoundException;
+ Date date) throws GetScoresException;
- public boolean save(Projects projects, List<PluginConf> pluginsConf,
- String portalName);
+ public void save(Projects projects, List<PluginConf> pluginsConf,
+ String portalName) throws ScoresSaveException;
- public PluginValues get(String portalName, Date date)
- throws PluginValueNotFoundException;
+ public PluginValues get(String portalName, String pluginId, Date date)
+ throws GetScoresException;
}
\ No newline at end of file
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-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -42,7 +42,8 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.PluginValueNotFoundException;
+import org.jboss.forge.status.exceptions.GetScoresException;
+import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.tools.PluginConf;
import org.jboss.forge.status.tools.PluginValues;
import org.jboss.forge.status.tools.Plugins;
@@ -83,27 +84,37 @@
* @param portalName
* @return true iff saving was successful
*/
- public boolean save(Projects projects, List<PluginConf> pluginsConf,
- String portalName) {//TODO exception instead of boolean
-
+ public void save(Projects projects, List<PluginConf> pluginsConf,
+ String portalName) throws ScoresSaveException {
+
+ // Get plugins from conf
Plugins plugins = new Plugins(pluginsConf, portalName, projects);
// Get directory where we store historical scores
- Directory dir = getDir(cm.getRootDirectory(),
- Tools.getShotokuStatusPath(portalName));
+ Directory rootDir = cm.getRootDirectory();
+ String dirName = Tools.getShotokuStatusPath(portalName);
+ Directory dir = getDir(rootDir, dirName);
- if (dir == null) {
- return false;
- }
-
// Get plugin values and save them in proper node
PluginsValues pluginsValues = new PluginsValues(projects, plugins);
- Node node = getNode(dir, getCurrentNodeName(), true);
+ // Get node to store scores
+ String nodeName = getCurrentNodeName();
+ Node node = null;
+ try {
+ node = dir.getNode(nodeName);
+ } catch (RepositoryException e) {
+ log.error("Error while getting shotoku node: " +
+ dir.getFullName() + "/" + nodeName, e);
+ throw new ScoresSaveException(e);
+ } catch (ResourceDoesNotExist e) {
+ node = createNode(dir, nodeName);
+ }
+
+ // Save values and store then in cache
values.put(getCurrentNodeName(), pluginsValues);
-
- return save(node, pluginsValues);
+ save(node, pluginsValues);
}
/**
@@ -141,10 +152,10 @@
* Notice that only year, month and day matter in passed dates.
*
* @return scores from the given date
- * @throws PluginValueNotFoundException
+ * @throws GetScoresException
*/
public PluginsValues getPluginsValues(String portalName, Date date)
- throws PluginValueNotFoundException {
+ throws GetScoresException {
// null date means today
if (date == null) {
@@ -157,8 +168,16 @@
if (v == null) { // Not in cache => get value and store it
- Directory dir = getDir(cm.getRootDirectory(),
- Tools.getShotokuStatusPath(portalName));
+ Directory rootDir = cm.getRootDirectory();
+
+ Directory dir;
+ try {
+ dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName));
+ } catch (RepositoryException e) {
+ throw new GetScoresException(e);
+ } catch (ResourceDoesNotExist e) {
+ throw new GetScoresException(e);
+ }
if (dir != null) {
v = getPluginsValues(dir, date);
@@ -174,74 +193,50 @@
*
* @param dir Directory to read scores from
* @return
+ * @throws GetScoresException
*/
- private PluginsValues getPluginsValues(Directory dir, Date date) {
+ private PluginsValues getPluginsValues(Directory dir, Date date)
+ throws GetScoresException {
- Node node = getNode(dir, getNodeName(date), false);
- if (node == null) {
- return null;
+ // Get appropriate node
+ Node node = null;
+ String nodeName = getNodeName(date);
+
+ try {
+ node = dir.getNode(nodeName);
+ } catch (Exception e) {
+ log.error("Error while getting shotoku node " +
+ dir.getFullName() + "/" + nodeName);
+ throw new GetScoresException(e);
}
+ // Restore values
PluginsValues values = null;
-
try {
InputStream is = node.getContentInputStream();
ObjectInputStream ois = new ObjectInputStream(is);
values = (PluginsValues) ois.readObject();
ois.close();
is.close();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
+ } catch (Exception e) {
+ log.error("Error while restoring scores from shotoku node " +
+ dir.getFullName() + "/" + nodeName);
+ throw new GetScoresException(e);
}
return values;
}
/**
- * Gets shotoku Node with name <code>nodeName</code> from specified
- * shotoku Directory.
- * If <code>createIdNotExist</code> flag is set,
- * when node does not exist it is created.
- *
- * @param dir Directory where search will be performed
- * @param nodeName name of searched Node
- * @param createIfNotExist If this flag is set, new Node is created,
- * when node with specified name does not exist.
- * @return Node with the given name
- * or null if such Node does not exist
- * and <code>createIfNotExist</code> was not set.
- * Null is also returned when creating Node failed.
- */
- private Node getNode(Directory dir, String nodeName,
- boolean createIfNotExist) {
-
- Node node = null;
-
- try {
- node = dir.getNode(nodeName);
- } catch (RepositoryException e) {
- log.error("Failed to get shotoku node: " +
- dir.getFullName() + "/" + nodeName, e);
- } catch (ResourceDoesNotExist e) {
-
- if (createIfNotExist) {
- node = createNode(dir, nodeName);
- }
- }
-
- return node;
- }
-
- /**
* Creates new shotoku Node.
*
* @param dir Directory in which new Node will be created
* @param nodeName name of new Node
- * @return Node or null if errors occured
+ * @return Node
+ * @throws ScoresSaveException
*/
- private Node createNode(Directory dir, String nodeName) {
+ private Node createNode(Directory dir, String nodeName)
+ throws ScoresSaveException {
Node node = null;
@@ -251,6 +246,7 @@
} catch (Exception e) {
log.error("Error while creating shotoku node: " +
dir.getFullName() + "/" + nodeName, e);
+ throw new ScoresSaveException(e);
}
return node;
@@ -265,8 +261,10 @@
* @param dirName name of searched Directory
* @return Directory with the given name
* or null when creating Directory failed.
+ * @throws ScoresSaveException
*/
- private Directory getDir(Directory rootDir, String dirName) {
+ private Directory getDir(Directory rootDir, String dirName)
+ throws ScoresSaveException {
Directory dir = null;
@@ -275,6 +273,7 @@
} catch (RepositoryException e) {
log.error("Error while getting shotoku directory " +
rootDir.getFullName() + "/" + dirName);
+ throw new ScoresSaveException(e);
} catch (ResourceDoesNotExist e) {
dir = createDir(rootDir, dirName);
}
@@ -288,8 +287,10 @@
* @param rootDir Directory in which new subdirectory will be created
* @param dirName name of new Directory
* @return Directory or null if errors occured
+ * @throws ScoresSaveException
*/
- private Directory createDir(Directory rootDir, String dirName) {
+ private Directory createDir(Directory rootDir, String dirName)
+ throws ScoresSaveException {
Directory dir = null;
@@ -299,6 +300,7 @@
} catch (Exception e) {
log.error("Error while creating shotoku directory: " +
rootDir.getFullName() + "/" + dirName, e);
+ throw new ScoresSaveException(e);
}
return dir;
@@ -329,8 +331,11 @@
return getNodeName(today);
}
- public PluginValues get(String portalName, Date date) throws PluginValueNotFoundException {
- return ((PluginsValues)getPluginsValues(portalName, date)).getPluginValues("downloads");
+ public PluginValues get(String portalName, String pluginId, Date date)
+ throws GetScoresException {
+
+ PluginsValues pv = getPluginsValues(portalName, date);
+ return pv.getPluginValues(pluginId);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java 2006-04-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -26,7 +26,8 @@
import java.util.List;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.PluginValueNotFoundException;
+import org.jboss.forge.status.exceptions.GetScoresException;
+import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.tools.PluginConf;
import org.jboss.forge.status.tools.PluginValues;
import org.jboss.forge.status.tools.PluginsValues;
@@ -37,11 +38,11 @@
public interface ScoresServiceLocal {
public PluginsValues getPluginsValues(String portalName,
- Date date) throws PluginValueNotFoundException;
+ Date date) throws GetScoresException;
- public boolean save(Projects projects, List<PluginConf> pluginsConf,
- String portalName);
+ public void save(Projects projects, List<PluginConf> pluginsConf,
+ String portalName) throws ScoresSaveException;
- public PluginValues get(String portalName, Date date)
- throws PluginValueNotFoundException;
+ public PluginValues get(String portalName, String pluginId, Date date)
+ throws GetScoresException;
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginsValues.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginsValues.java 2006-04-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginsValues.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -33,7 +33,7 @@
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
-import org.jboss.forge.status.exceptions.PluginValueNotFoundException;
+import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.plugins.Plugin;
/**
@@ -80,11 +80,11 @@
* @param pluginId plugin id
* @param projectId project id
* @return stored plugin value for specified project
- * @throws PluginValueNotFoundException
+ * @throws GetScoresException
* Thrown when requested value was not found
*/
public long getPluginValue(String pluginId, String projectId)
- throws PluginValueNotFoundException {
+ throws GetScoresException {
Long val = null;
PluginValues pluginValues = values.get(pluginId);
@@ -94,7 +94,7 @@
}
if (val == null) {
- throw new PluginValueNotFoundException();
+ throw new GetScoresException();
}
return val;
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-21 16:04:43 UTC (rev 3888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-21 16:27:16 UTC (rev 3889)
@@ -26,10 +26,13 @@
import java.util.List;
import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.PluginValueNotFoundException;
+import org.jboss.forge.status.exceptions.GetScoresException;
+import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.ScoresService;
+
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.MBeanServerLocator;
@@ -40,32 +43,33 @@
public class ScoresManager {
private String portalName;
-
+
public ScoresManager(String portalName) {
this.portalName = portalName;
}
- public boolean save(Projects projects, List<PluginConf> pluginsConf) {
+ public void save(Projects projects, List<PluginConf> pluginsConf)
+ throws ScoresSaveException {
- try {
+
MBeanServer server = MBeanServerLocator.locate();
- ScoresService service = (ScoresService) MBeanProxyExt.create(
- ScoresService.class,
- Tools.STATUS_SERVICE_NAME,
- server);
+ ScoresService service;
+ try {
+ service = (ScoresService) MBeanProxyExt.create(
+ ScoresService.class,
+ Tools.STATUS_SERVICE_NAME,
+ server);
+ } catch (MalformedObjectNameException e) {
+ throw new ScoresSaveException(e);
+ }
- return service.save(projects, pluginsConf, portalName);
+ service.save(projects, pluginsConf, portalName);
- } catch (Exception e) {
- e.printStackTrace (); //TODO log msg
- }
-
- return false;
}
public PluginsValues getScores(Date date, Date toDate)
- throws PluginValueNotFoundException {
+ throws GetScoresException {
PluginsValues pluginsValues = null;
@@ -84,10 +88,10 @@
}
if (pluginsValues == null) {
- throw new PluginValueNotFoundException();
+ throw new GetScoresException();
}
- return null;
+ return pluginsValues;
}
/**
@@ -100,11 +104,11 @@
* Notice that only year, month and day matter in passed dates.
*
* @return project score from the given date for specified plugin
- * @throws PluginValueNotFoundException
+ * @throws GetScoresException
*/
public long getValue(String pluginId, String projectId,
Date date, Date toDate)
- throws PluginValueNotFoundException {
+ throws GetScoresException {
PluginsValues pluginsValues = getScores(date, toDate);
@@ -112,7 +116,7 @@
}
public PluginsValues getCurrentScores()
- throws PluginValueNotFoundException {
+ throws GetScoresException {
Date now = new Date();
|
