Author: wrzep Date: 2006-05-31 13:00:18 -0400 (Wed, 31 May 2006) New Revision: 4526 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/ScoresServiceImpl.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginsValuesImpl.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java 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/ScoresManagerSync.java Log: JBLAB-599 Pawel 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-31 16:07:56 UTC (rev 4525) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-05-31 17:00:18 UTC (rev 4526) @@ -69,10 +69,10 @@ ObjectMessage message = (ObjectMessage) msg; + String requestName = null; + try { - String requestName = - message.getStringProperty(Constants.NAME_PROPERTY); - + requestName = message.getStringProperty(Constants.NAME_PROPERTY); log.info("Request name: " + requestName); if (requestName.equals(Constants.SAVE_MESSAGE)) { @@ -87,11 +87,11 @@ (GetScoresRequest) message.getObject(); handleRequest(getScoresRequest); } - - log.info("Finished processing request: " + requestName); + log.info("Finished processing request: " + requestName); + } catch (JMSException e) { - log.error(e); //TODO + log.warn("Error processing request: " + requestName, e); } } @@ -103,7 +103,7 @@ try { ScoresManagerSync.save(projects, pluginsConf); } catch (ScoresSaveException e) { - log.error(e); //TODO + log.warn("Error processing save request.", e); } } @@ -116,7 +116,7 @@ try { pluginsValues = ScoresManagerSync.getScores(cal); } catch (GetScoresException e) { - log.error(e); //TODO + log.warn("Error processing get request, returning null values."); // If something is wrong, response will contain null pluginsValues } @@ -126,5 +126,4 @@ RecordManager.add(timestamp, response); } - } 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-31 16:07:56 UTC (rev 4525) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-05-31 17:00:18 UTC (rev 4526) @@ -218,7 +218,7 @@ try { node = dir.getNode(nodeName); } catch (Exception e) { - log.error("Error while getting shotoku node " + + log.info("Unable to get shotoku node " + dir.getFullName() + "/" + nodeName); throw new GetScoresException(e); } Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginsValuesImpl.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginsValuesImpl.java 2006-05-31 16:07:56 UTC (rev 4525) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginsValuesImpl.java 2006-05-31 17:00:18 UTC (rev 4526) @@ -23,7 +23,6 @@ package org.jboss.forge.status.service.impl.protocol; import java.util.Calendar; -import java.util.Date; import java.util.Map; import java.util.HashMap; import java.util.Set; @@ -49,7 +48,7 @@ private Map<String,PluginValuesImpl> values; /** Creation date */ - private Date date; + private Calendar cal; /** * @param projects Projects present in the Status Matrix @@ -57,7 +56,7 @@ */ public PluginsValuesImpl(Projects projects, Plugins plugins) { - date = Calendar.getInstance().getTime(); + cal = Calendar.getInstance(); values = new HashMap<String,PluginValuesImpl>(); @@ -101,8 +100,8 @@ /** * @return creation date */ - public Date getDate() { - return date; + public Calendar getDate() { + return cal; } public boolean hasPlugin(String pluginId) { Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-05-31 16:07:56 UTC (rev 4525) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-05-31 17:00:18 UTC (rev 4526) @@ -43,8 +43,6 @@ String remoteString = (String) properties.get(Tags.SERVICE_REMOTE_ELEMENT); remoteService = remoteString.equals("true"); - - System.out.println("remote " + remoteService + "\n props: " + properties); } public boolean isRemote() { Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java 2006-05-31 16:07:56 UTC (rev 4525) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java 2006-05-31 17:00:18 UTC (rev 4526) @@ -22,8 +22,7 @@ package org.jboss.forge.status.service.protocol; -import java.util.Date; - +import java.util.Calendar; import java.io.Serializable; import org.jboss.forge.status.exceptions.GetScoresException; @@ -51,7 +50,7 @@ /** * @return creation date */ - public Date getDate(); + public Calendar getDate(); public boolean hasPlugin(String pluginId); 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-05-31 16:07:56 UTC (rev 4525) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-05-31 17:00:18 UTC (rev 4526) @@ -58,16 +58,13 @@ public class ScoresManager { - private static boolean isRemote; private static Properties properties; + private Timestamp latestScoresTimestamp; public static void init(String portalName, ServiceConf serviceConf) { ScoresManagerSync.init(portalName, serviceConf); - isRemote = serviceConf.isRemote(); - System.out.println("remote: " + isRemote); - properties = serviceConf.getProperties(); } @@ -75,8 +72,6 @@ throws ScoresSaveException { SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects); - //TODO request factory - //conf factory? // Send message try { Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-05-31 16:07:56 UTC (rev 4525) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-05-31 17:00:18 UTC (rev 4526) @@ -57,7 +57,6 @@ ScoresManagerSync.portalName = portalName; isRemote = serviceConf.isRemote(); - System.out.println("remote: " + isRemote); properties = serviceConf.getProperties(); } |