Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4812 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . common service/impl tools
|
From: <jbo...@li...> - 2006-06-24 11:24:23
|
Author: wrzep
Date: 2006-06-24 07:24:17 -0400 (Sat, 24 Jun 2006)
New Revision: 4812
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.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/StatusConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.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/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Removed MDB.
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-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -97,13 +97,6 @@
PluginsValues pluginsValues;
- // Compute and save current scores
- try {
- ScoresManager.save(projects, pluginsConf);
- } catch (ScoresSaveException e) {
- log.error("Saving scores failed ", e);
- }
-
// Get latest available scores
try {
ScoresManager.init(portalName, serviceConf);
@@ -214,33 +207,29 @@
/**
* @return true iff updated scores are available
*/
- public boolean needsUpdate() {
+ public synchronized boolean needsUpdate() {
log.info("Checking for updated scores.");
PluginsValues pluginsValues = null;
- // Check for updated scores
- try {
- pluginsValues = ScoresManager.getLatestScores();
- } catch (GetScoresException e) {
- log.warn("Failed to get lates scores.");
- }
-
- // Perform save if needed
- if ((pluginsValues == null) || needsSave(pluginsValues.getDate())){
-
+ if (needsSave(updateDate)) {
+
try {
ScoresManager.save(projects, pluginsConf);
+
+ pluginsValues = ScoresManager.getLatestScores();
+
} catch (ScoresSaveException e) {
- log.warn("Sending \"save\" request failed.");
+ log.warn("Saving scores failed.");
+ } catch (GetScoresException e) {
+ log.warn("Failed to get lates scores.");
}
}
- // Refresh if scores are new
- if ((pluginsValues != null) &&
- (pluginsValues.getDate() != updateDate)) {
+ if (pluginsValues != null) {
+ log.info("Refreshing scores...");
refreshScores(pluginsValues);
}
@@ -256,14 +245,10 @@
private void refreshScores(PluginsValues pluginsValues) {
- log.info("Refreshing scores...");
-
mainPageColumns.update(pluginsValues);
matrixTemplate.update(pluginsValues);
updateDate = pluginsValues.getDate();
-
- log.info("Finished refreshing scores.");
}
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -68,12 +68,14 @@
/* Called only when some of the watched resources changes. */
public void update(String key, StatusDescriptor currentObject,
Map<String, ChangeType> changes) {
+ System.out.println("update/resource");
put(key, getDesc(key));
}
@Override
/* Called to check if updated scores are available. */
public void update(String key, StatusDescriptor desc) {
+ System.out.println("update/timeout");
desc.update();
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -94,6 +94,7 @@
if (status != null) {
+ context = new DelegateContext();
status.fillContext(context);
projectContexts = status.getProjectContexts();
@@ -103,7 +104,6 @@
public DelegateContext getContext() {
- update();
return context;
}
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-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -7,14 +7,9 @@
public static final int MAX_ATTEMPTS = 10;
- public static final String QUEUE_NAME = "queue/jmm";
-
- public static final String NAME_PROPERTY = "name";
- public static final String SAVE_MESSAGE = "save";
+ public static final String STATUS_LOCAL_SERVICE = "java:/Status/LocalScoresService";
+ public static final String STATUS_REMOTE_SERVICE = "java:/Status/RemoteScoresService";
- public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService";
- public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService";
-
public static final long CACHE_INTERVAL = 5*60*1000; /* milliseconds */
/**
Deleted: 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-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -1,97 +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.service.impl;
-
-import java.util.List;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-
-import org.jboss.forge.common.projects.Projects;
-
-import org.jboss.forge.status.common.Constants;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.protocol.PluginConf;
-import org.jboss.forge.status.service.protocol.SaveRequest;
-
-import org.jboss.forge.status.tools.ScoresManager;
-import org.jboss.logging.Logger;
-
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-
-@MessageDriven(activateConfig =
-{
- @ActivationConfigProperty(propertyName="destinationType",
- propertyValue="javax.jms.Queue"),
- @ActivationConfigProperty(propertyName="destination",
- propertyValue=Constants.QUEUE_NAME)
-})
-public class ScoresMDB implements MessageListener {
-
- private static Logger log = Logger.getLogger(ScoresMDB.class);
-
- synchronized public void onMessage(Message msg) {
-
- ObjectMessage message = (ObjectMessage) msg;
-
- String requestName = null;
-
- try {
- requestName = message.getStringProperty(Constants.NAME_PROPERTY);
- log.info("Request name: " + requestName);
-
- if (requestName.equals(Constants.SAVE_MESSAGE)) {
-
- SaveRequest saveRequest = (SaveRequest) message.getObject();
- handleRequest(saveRequest);
- } else {
- log.info("Unknown request: " + requestName);
- }
-
- log.info("Finished processing request: " + requestName);
-
- } catch (JMSException e) {
- log.warn("Error processing request: " + requestName, e);
- }
- }
-
- private static void handleRequest(SaveRequest saveRequest) {
-
- Projects projects = saveRequest.getProjects();
- List<PluginConf> pluginsConf = saveRequest.getPluginsConf();
-
- try {
- ScoresManager.saveSync(projects, pluginsConf);
- } catch (ScoresSaveException e) {
- log.warn("Error processing save request.", e);
- }
- }
-
-}
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-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -136,7 +136,7 @@
* @param pluginsValues PluginsValues to save
* @throws ScoresSaveException
*/
- private void save(Node node, PluginsValuesImpl pluginsValues)
+ private synchronized void save(Node node, PluginsValuesImpl pluginsValues)
throws ScoresSaveException {
try {
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-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -22,18 +22,10 @@
package org.jboss.forge.status.tools;
-import java.io.Serializable;
import java.util.Calendar;
import java.util.List;
import java.util.Properties;
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -45,10 +37,8 @@
import org.jboss.forge.status.service.ScoresService;
import org.jboss.forge.status.service.ScoresServiceLocal;
import org.jboss.forge.status.service.ScoresServiceRemote;
-import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
import org.jboss.forge.status.service.protocol.PluginConf;
import org.jboss.forge.status.service.protocol.PluginsValues;
-import org.jboss.forge.status.service.protocol.SaveRequest;
import org.jboss.forge.status.service.protocol.ServiceConf;
import org.jboss.forge.status.common.Constants;
@@ -69,21 +59,8 @@
properties = serviceConf.getProperties();
isRemote = serviceConf.isRemote();
}
-
- public static void save(Projects projects, List<PluginConf> pluginsConf)
- throws ScoresSaveException {
- SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects);
-
- // Send message
- try {
- sendMessage(Constants.SAVE_MESSAGE, saveRequest);
- } catch (Exception e) {
- throw new ScoresSaveException(e);
- }
- }
-
- public static void saveSync(Projects projects,
+ public static void save(Projects projects,
List<PluginConf> pluginsConf)
throws ScoresSaveException {
@@ -218,37 +195,5 @@
return service;
}
-
- private static void sendMessage(String name, Serializable request) throws
- NamingException, JMSException {
-
- Queue queue = null;
- QueueConnection connection = null;
- QueueSession session = null;
- QueueSender sender = null;
-
- Context context = null;
- if (isRemote) {
- context = new InitialContext(properties);
- } else {
- context = new InitialContext();
- }
-
- queue = (Queue) context.lookup(Constants.QUEUE_NAME);
- QueueConnectionFactory factory =
- (QueueConnectionFactory) context.lookup("java:/ConnectionFactory");
- connection = factory.createQueueConnection();
- session = connection.createQueueSession(false,
- QueueSession.AUTO_ACKNOWLEDGE);
-
- // Create a message
- ObjectMessage message = session.createObjectMessage();
- message.setStringProperty("name", name);
- message.setObject(request);
-
- sender = session.createSender(queue);
- sender.send(message);
- session.close ();
- }
}
|
