Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4786 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: configuration/to-copy forge-common/src/java/org/jboss/forge/common/projects forge-status/src/java/org/jboss/forge/status forge-status/src/java/org/jboss/forge/status/common forge-status/src/java/org/jboss/forge/status/exceptions forge-status/src/java/org/jboss/forge/status/plugins forge-status/src/java/org/jboss/forge/status/plugins/codelines forge-status/src/java/org/jboss/forge/status/service/impl forge-status/src/java/org/jboss/forge/status/service/impl/protocol forge-status/src/java/org/jboss/forge/status/service/protocol forge-status/src/java/org/jboss/forge/status/tools forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-theme/jbossForgeLayout.war/layouts jbosswiki/wiki-common/src/java/org/jboss/wiki jbosswiki/wiki-common/src/java/org/jboss/wiki/management jbosswiki/wiki-management/src/java/org/jboss/wiki
Author: dam...@jb... Date: 2006-06-20 15:38:10 -0400 (Tue, 20 Jun 2006) New Revision: 4786 Added: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/configuration/to-copy/mail-service.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresException.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/LabsDialogBox.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EMailNotifier.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/EMailNotifierSLSB.java Removed: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/MailNotificationBean.java Log: MERGED: -r 4761:4785 https://svn.labs.jboss.com/labs/jbosslabs/trunk into qa for Labs 1.1-SP1 lol. Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/configuration/to-copy/mail-service.xml (from rev 4785, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/mail-service.xml) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -123,32 +123,36 @@ downloadCounters.get(link).increment(); try { - //CountersServiceInterface countersService = - // (CountersServiceInterface) ctx.lookup(CountersServiceInterface.jndiName); - //countersService.incrementCounter(link); + CountersServiceInterface countersService = + (CountersServiceInterface) ctx.lookup(CountersServiceInterface.jndiName); + countersService.incrementCounter(link); + // MDB CODE COMMENTED OUT BECAUSE OF MDB ISSUES // This code sends message to counters' MDB with message // containing filepath of which counter has to be increased - QueueSession sess = null; - Queue queue = null; - queue = (Queue) ctx.lookup("queue/jblab_counters"); - QueueConnectionFactory factory = - (QueueConnectionFactory) ctx.lookup("java:/ConnectionFactory"); - sess =factory.createQueueConnection().createQueueSession(false, - QueueSession.AUTO_ACKNOWLEDGE); - if (sess != null) - { - TextMessage msg = sess.createTextMessage(link); - sess.createSender(queue).send(msg); - } + //QueueSession sess = null; + //Queue queue = null; + //queue = (Queue) ctx.lookup("queue/jblab_counters"); + //QueueConnectionFactory factory = + // (QueueConnectionFactory) ctx.lookup("java:/ConnectionFactory"); + //sess =factory.createQueueConnection().createQueueSession(false, + // QueueSession.AUTO_ACKNOWLEDGE); + //if (sess != null) + //{ + // TextMessage msg = sess.createTextMessage(link); + // sess.createSender(queue).send(msg); + //} } catch (NamingException e) { getLogger().error("CountersService was not found while incrementing counter.",e); } - catch (JMSException e) - { - getLogger().error("Problem while using JMS to send increment command to MDB.",e); + //catch (JMSException e) + //{ + // getLogger().error("Problem while using JMS to send increment command to MDB.",e); + //} + catch (Exception e) { + getLogger().error("CountersService problem while incrementing counter.",e); } } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -22,7 +22,6 @@ package org.jboss.forge.status; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; @@ -49,7 +48,6 @@ 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.ScoresManagerSync; import org.jboss.forge.status.tools.ScoresManager; import org.jboss.logging.Logger; @@ -75,7 +73,7 @@ private List<PluginConf> pluginsConf; - private Timestamp timestamp; + private Calendar updateDate; private Logger log; @@ -85,7 +83,8 @@ * @param pluginsRoot Node defining Plugins used in the Matrix */ public Status(String portalName, Node statusRoot, Node pluginsRoot, - org.jboss.shotoku.Node serviceNode) { + org.jboss.shotoku.Node serviceNode) + throws GetScoresException { log = Logger.getLogger(this.getClass()); @@ -94,23 +93,25 @@ pluginsConf = getPluginsConfList(pluginsRoot); ServiceConf serviceConf = new ServiceConfImpl(serviceNode); - ScoresManagerSync.init(portalName, serviceConf); + ScoresManager.init(portalName, serviceConf); PluginsValues pluginsValues; - try { - // Get latest available scores - ScoresManager.init(portalName, serviceConf); - pluginsValues = ScoresManager.getLatestScores(); - - // Compute and save current scores + + // Compute and save current scores + try { ScoresManager.save(projects, pluginsConf); - timestamp = ScoresManager.requestCurrentScores(); } catch (ScoresSaveException e) { log.error("Saving scores failed ", e); - return; + } + + // 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); - return; + throw e; } // Get columns to display on the main page @@ -217,54 +218,52 @@ log.info("Checking for updated scores."); - PluginsValues pluginsValues; + PluginsValues pluginsValues = null; + // Check for updated scores try { - pluginsValues = ScoresManager.getScores(timestamp); + pluginsValues = ScoresManager.getLatestScores(); } catch (GetScoresException e) { - log.warn("Resending \"get\" request failed."); - return false; + log.warn("Failed to get lates scores."); } - if (pluginsValues == null) { - - Calendar tsCal = Calendar.getInstance(); - tsCal.setTime(timestamp); - Calendar now = Calendar.getInstance(); - - if (tsCal.get(Calendar.DAY_OF_MONTH) != - now.get(Calendar.DAY_OF_MONTH)) { - - try { - ScoresManager.save(projects, pluginsConf); - //TODO *Maybe* get rid of "save", have only "get" - // and service performing "save" on it's own - // (after necessary init or using it own conf)? - timestamp = ScoresManager.requestCurrentScores(); - } catch (ScoresSaveException e) { - log.warn("Sending \"save\" request failed."); - } catch (GetScoresException e) { - log.warn("Sending \"get\" request failed."); - } + // Perform save if needed + if ((pluginsValues == null) || needsSave(pluginsValues.getDate())){ + + try { + ScoresManager.save(projects, pluginsConf); + } catch (ScoresSaveException e) { + log.warn("Sending \"save\" request failed."); } - - return false; } + // Refresh if scores are new + if ((pluginsValues != null) && + (pluginsValues.getDate() != updateDate)) { + + refreshScores(pluginsValues); + } + + return true; + } + + private boolean needsSave(Calendar date) { + + Calendar now = Calendar.getInstance(); + + return (now.get(Calendar.DAY_OF_MONTH) != date.get(Calendar.DAY_OF_MONTH)); + } + + private void refreshScores(PluginsValues pluginsValues) { + log.info("Refreshing scores..."); mainPageColumns.update(pluginsValues); matrixTemplate.update(pluginsValues); - log.info("Finished refreshing scores."); + updateDate = pluginsValues.getDate(); - try { - timestamp = ScoresManager.requestCurrentScores(); - } catch (GetScoresException e) { - log.warn("Sending \"get\" request failed."); - } - - return true; + log.info("Finished refreshing scores."); } } \ No newline at end of file Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -22,10 +22,12 @@ package org.jboss.forge.status; +import java.util.HashMap; import java.util.Map; import java.io.IOException; import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.portal.common.context.DelegateContext; import org.jboss.shotoku.ContentManager; @@ -44,14 +46,28 @@ */ public class StatusDescriptor { - private DelegateContext context; - private Map<String,DelegateContext> projectContexts; - private Map<String,DelegateContext> columnContexts; + private DelegateContext context = new DelegateContext(); + private Map<String,DelegateContext> projectContexts + = new HashMap<String,DelegateContext>(); + private Map<String,DelegateContext> columnContexts + = new HashMap<String,DelegateContext>(); + + private String portalName; + private ContentManager cm; + private Status status; public StatusDescriptor(String portalName, ContentManager cm) { + this.portalName = portalName; + this.cm = cm; + + init(); + } + + private void init() { + try { String statusPath = Locations.getXmlCmPath(portalName); Node statusRoot = getRoot(cm , statusPath); @@ -67,19 +83,22 @@ fillContext(); + } catch (GetScoresException e){ + // do nothing } catch (Exception e) { e.printStackTrace(); } } private void fillContext() { - - context = new DelegateContext(); - status.fillContext(context); - projectContexts = status.getProjectContexts(); - columnContexts = status.getColumnContexts(); - + if (status != null) { + + status.fillContext(context); + + projectContexts = status.getProjectContexts(); + columnContexts = status.getColumnContexts(); + } } public DelegateContext getContext() { @@ -107,7 +126,11 @@ public void update() { - if (status.needsUpdate()) { + if (status == null) { + init(); + } + + if ((status != null) && (status.needsUpdate())) { fillContext(); } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -11,14 +11,12 @@ public static final String NAME_PROPERTY = "name"; public static final String SAVE_MESSAGE = "save"; - public static final String GET_SCORES_MESSAGE = "get"; 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 */ - //TODO conf via cms? - + /** * This class cannot be instatiated. */ Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -27,7 +27,7 @@ * Indicates that searching for saved scores failed. */ -public class GetScoresException extends Exception { +public class GetScoresException extends ScoresException { private static final long serialVersionUID = 7291136165537810321L; @@ -38,5 +38,9 @@ public GetScoresException(Exception e) { super(e); } + + public GetScoresException(String msg) { + super(msg); + } } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresException.java (from rev 4785, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresException.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -27,7 +27,7 @@ * Indicates that computing or saving scores failed. */ -public class ScoresSaveException extends Exception { +public class ScoresSaveException extends ScoresException { private static final long serialVersionUID = 7291136165537810321L; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -29,7 +29,7 @@ import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.tools.Plugins; -import org.jboss.forge.status.tools.ScoresManagerSync; +import org.jboss.forge.status.tools.ScoresManager; /** * @author Pawel Wrzeszcz (paw...@gm...) @@ -79,7 +79,7 @@ try { - prevValue = ScoresManagerSync.getValue( + prevValue = ScoresManager.getValue( insidePlugin.getId(), projectId, cal, now); } catch (GetScoresException e) { return 0; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -128,7 +128,7 @@ repository.setAuthenticationManager(authManager); /* Analyze */ - log.debug("Analyzing repository " + repository.getLocation() + "."); + log.info("Analyzing repository " + repository.getLocation() + "."); return repository; } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -57,11 +57,6 @@ @Override public long getValue(String projectId) { - System.out.print("clp getValue: "); - System.out.print(projectId + " "); - System.out.println(cachedValues); - //TODO and now NPE appears, where exactly?? - if (!cachedValues.containsKey(projectId)) { long cl = 0; @@ -79,6 +74,8 @@ } } - return cachedValues.get(projectId).longValue(); + Long value = cachedValues.get(projectId); + + return value == null ? 0 : value.longValue(); } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -22,8 +22,6 @@ package org.jboss.forge.status.service.impl; -import java.sql.Timestamp; -import java.util.Calendar; import java.util.List; import javax.ejb.ActivationConfigProperty; @@ -36,17 +34,11 @@ import org.jboss.forge.common.projects.Projects; import org.jboss.forge.status.common.Constants; -import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; -import org.jboss.forge.status.service.impl.protocol.GetScoresResponseImpl; -import org.jboss.forge.status.service.protocol.GetScoresRequest; -import org.jboss.forge.status.service.protocol.GetScoresResponse; 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.tools.RecordManager; -import org.jboss.forge.status.tools.ScoresManagerSync; +import org.jboss.forge.status.tools.ScoresManager; import org.jboss.logging.Logger; @@ -79,14 +71,9 @@ SaveRequest saveRequest = (SaveRequest) message.getObject(); handleRequest(saveRequest); + } else { + log.info("Unknown request: " + requestName); } - - if (requestName.equals(Constants.GET_SCORES_MESSAGE)) { - - GetScoresRequest getScoresRequest = - (GetScoresRequest) message.getObject(); - handleRequest(getScoresRequest); - } log.info("Finished processing request: " + requestName); @@ -101,29 +88,10 @@ List<PluginConf> pluginsConf = saveRequest.getPluginsConf(); try { - ScoresManagerSync.save(projects, pluginsConf); + ScoresManager.saveSync(projects, pluginsConf); } catch (ScoresSaveException e) { log.warn("Error processing save request.", e); } } - - private static void handleRequest(GetScoresRequest request) { - - Calendar cal = request.getCalendar(); - Timestamp timestamp = request.getTimestamp(); - - PluginsValues pluginsValues = null; - try { - pluginsValues = ScoresManagerSync.getScores(cal); - } catch (GetScoresException e) { - log.warn("Error processing get request, returning null values."); - // If something is wrong, response will contain null pluginsValues - } - - GetScoresResponse response = - new GetScoresResponseImpl(pluginsValues, request); - - RecordManager.add(timestamp, response); - } } Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -1,56 +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.protocol; - -import java.sql.Timestamp; -import java.util.Calendar; -import org.jboss.forge.status.service.protocol.GetScoresRequest; - -/** -* @author Pawel Wrzeszcz -*/ -public class GetScoresRequestImpl implements GetScoresRequest { - - private static final long serialVersionUID = 7844595317056960170L; - - private Calendar cal; - private Timestamp timestamp; - - public GetScoresRequestImpl(Calendar cal, - Timestamp timestamp) { - - this.cal = cal; - this.timestamp = timestamp; - } - - public Calendar getCalendar() { - return cal; - } - - public Timestamp getTimestamp() { - return timestamp; - } - - - -} \ No newline at end of file Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -1,54 +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.protocol; - -import org.jboss.forge.status.service.protocol.GetScoresRequest; -import org.jboss.forge.status.service.protocol.GetScoresResponse; -import org.jboss.forge.status.service.protocol.PluginsValues; - -/** -* @author Pawel Wrzeszcz -*/ -public class GetScoresResponseImpl implements GetScoresResponse { - - private static final long serialVersionUID = 7844595317056960170L; - - private PluginsValues pluginsValues; - private GetScoresRequest request; - - public GetScoresResponseImpl(PluginsValues pluginsValues, - GetScoresRequest request) { - - this.pluginsValues = pluginsValues; - this.request = request; - } - - public PluginsValues getPluginsValues() { - return pluginsValues; - } - - public GetScoresRequest getRequest() { - return request; - } - -} \ No newline at end of file Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -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.service.protocol; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Calendar; - -/** -* @author Pawel Wrzeszcz -*/ -public interface GetScoresRequest extends Serializable { - - public Calendar getCalendar(); - - public Timestamp getTimestamp(); - -} \ No newline at end of file Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -1,36 +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.protocol; - -import java.io.Serializable; - -/** -* @author Pawel Wrzeszcz -*/ -public interface GetScoresResponse extends Serializable { - - public PluginsValues getPluginsValues(); - - public GetScoresRequest getRequest(); - -} \ No newline at end of file Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -1,44 +0,0 @@ -package org.jboss.forge.status.tools; - -import java.sql.Timestamp; -import java.util.ArrayList; - -import org.jboss.forge.status.service.protocol.GetScoresResponse; - -/** - * @author Pawel Wrzeszcz - */ -public class RecordManager { - - private static ArrayList<GetScoresResponse> buff = - new ArrayList<GetScoresResponse> (); - - private static int maxSize = 100; - - public static void add (Timestamp sent, GetScoresResponse response) { - - // Remove the earliest item if the cache is full - if (buff.size () > maxSize) { - buff.remove (0); - } - - buff.add(response); - } - - public static GetScoresResponse get(Timestamp sent) { - - for (int i = 0; i < buff.size (); i++) { - - GetScoresResponse resp = buff.get(i); - Timestamp ts = resp.getRequest().getTimestamp(); - - if (ts.equals(sent)) { - - buff.remove(i); - return resp; - } - } - return null; - } - -} Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -23,7 +23,6 @@ package org.jboss.forge.status.tools; import java.io.Serializable; -import java.sql.Timestamp; import java.util.Calendar; import java.util.List; import java.util.Properties; @@ -38,14 +37,15 @@ 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.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; -import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl; +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.GetScoresRequest; -import org.jboss.forge.status.service.protocol.GetScoresResponse; import org.jboss.forge.status.service.protocol.PluginConf; import org.jboss.forge.status.service.protocol.PluginsValues; import org.jboss.forge.status.service.protocol.SaveRequest; @@ -58,15 +58,16 @@ public class ScoresManager { + private static String portalName; private static Properties properties; - private static boolean remote; + private static boolean isRemote; public static void init(String portalName, ServiceConf serviceConf) { - ScoresManagerSync.init(portalName, serviceConf); + ScoresManager.portalName = portalName; properties = serviceConf.getProperties(); - remote = serviceConf.isRemote(); + isRemote = serviceConf.isRemote(); } public static void save(Projects projects, List<PluginConf> pluginsConf) @@ -81,58 +82,54 @@ throw new ScoresSaveException(e); } } + + public static void saveSync(Projects projects, + List<PluginConf> pluginsConf) + throws ScoresSaveException { - public static Timestamp requestScores(Calendar cal) - throws GetScoresException { - - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - - GetScoresRequest getScoresRequest = - new GetScoresRequestImpl(cal, timestamp); + ScoresService service = null; try { - sendMessage(Constants.GET_SCORES_MESSAGE, getScoresRequest); - } catch (Exception e) { - throw new GetScoresException(e); + service = getService(); + } catch (NamingException e) { + throw new ScoresSaveException(e); } - - return timestamp; - } - public static Timestamp requestCurrentScores() - throws GetScoresException { + service.save(projects, pluginsConf, portalName); +} + public static boolean hasScores(Calendar cal) { - Calendar cal = Calendar.getInstance(); + ScoresService service; + try { + service = getService(); + } catch (NamingException e) { + return false; + } - return requestScores(cal); + return service.hasPluginsValues(portalName, cal); } - public static PluginsValues getScores(Timestamp timestamp) + + public static PluginsValues getScores(Calendar cal) throws GetScoresException { - - - GetScoresResponse response = RecordManager.get(timestamp); - - System.out.println("attempt"); - - if (response == null) { - return null; + + PluginsValues pluginsValues = null; + + try { + ScoresService service = getService(); + pluginsValues = service.getPluginsValues(portalName, cal); + } catch (Exception e) { + throw new GetScoresException(e); } - - PluginsValues pluginsValues = response.getPluginsValues(); - + if (pluginsValues == null) { - try { - sendMessage(Constants.GET_SCORES_MESSAGE, - response.getRequest()); - } catch (Exception e) { - throw new GetScoresException(e); - } + throw new GetScoresException(); } - + return pluginsValues; } + public static PluginsValues getLatestScores() throws GetScoresException { @@ -143,48 +140,115 @@ System.out.println("Trying " + cal.getTime().toString()); - if (ScoresManagerSync.hasScores(cal)) { - return ScoresManagerSync.getScores(cal); + if (ScoresManager.hasScores(cal)) { + return ScoresManager.getScores(cal); } - if ((attempts++) == Constants.MAX_ATTEMPTS) { - return null; + if ((++attempts) == Constants.MAX_ATTEMPTS) { + throw new GetScoresException( + "Can not find any recently saved scores. " + + "Gave up after " + attempts + " attempts."); } cal.add(Calendar.DAY_OF_MONTH, -1); } } + + /** + * For the specified plugin returns historical project score + * from the given <code>date</code> in the past. + * + * Notice that only year, month and day matter in passed dates. + * + * @return project score from the given date for specified plugin + * @throws GetScoresException + */ + public static long getValue(String pluginId, String projectId, + Calendar cal) + throws GetScoresException { + + PluginsValues pluginsValues = getScores(cal); + + return pluginsValues.getPluginValue(pluginId, projectId); + } + + public static long getValue(String id, String projectId, + Calendar start, Calendar end) throws GetScoresException { + + long value; + Calendar cal = start; + + for (;;) { + + if (cal.after(end)) { + throw new GetScoresException(); + } + + try { + value = getValue(id, projectId, cal); + return value; + } catch (GetScoresException e) { + // try next + cal.add(Calendar.DAY_OF_MONTH, 1); + } + } + } + private static ScoresService getService() throws NamingException { + + Context context = null; + if (isRemote) { + context = new InitialContext(properties); + } else { + context = new InitialContext(); + } + + // Perform look up using JNDI name of ejb object + String serviceBinding = + (isRemote ? Constants.STATUS_REMOTE_SERVICE : + Constants.STATUS_LOCAL_SERVICE); + Object ref = context.lookup(serviceBinding); + + // Narrow the reference of the object returned by lookup() method + ScoresService service = + (ScoresService) PortableRemoteObject.narrow( ref, + (isRemote ? ScoresServiceRemote.class : + ScoresServiceLocal.class)); + + return service; + } + private static void sendMessage(String name, Serializable request) throws - NamingException, JMSException { - + NamingException, JMSException { + Queue queue = null; QueueConnection connection = null; QueueSession session = null; QueueSender sender = null; - + Context context = null; - if (remote) { + 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 message + + 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); - + message.setStringProperty("name", name); + message.setObject(request); + sender = session.createSender(queue); - sender.send(message); - session.close (); + sender.send(message); + session.close (); } + } Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -1,182 +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.tools; - -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.status.common.Constants; -import org.jboss.forge.status.exceptions.GetScoresException; -import org.jboss.forge.status.exceptions.ScoresSaveException; -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.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.service.protocol.ServiceConf; - -/** -* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) -*/ - -public class ScoresManagerSync { - - private static String portalName; - private static boolean isRemote; - private static Properties properties; - - public static void init(String portalName, ServiceConf serviceConf) { - - ScoresManagerSync.portalName = portalName; - - isRemote = serviceConf.isRemote(); - - properties = serviceConf.getProperties(); - } - - public static void save(Projects projects, List<PluginConf> pluginsConf) - throws ScoresSaveException { - - ScoresService service = null; - - try { - service = getService(); - } catch (NamingException e) { - throw new ScoresSaveException(e); - } - - service.save(projects, pluginsConf, portalName); - } - - public static PluginsValues getScores(Calendar cal) - throws GetScoresException { - - PluginsValues pluginsValues = null; - - try { - ScoresService service = getService(); - pluginsValues = service.getPluginsValues(portalName, cal); - } catch (Exception e) { - throw new GetScoresException(e); - } - - if (pluginsValues == null) { - throw new GetScoresException(); - } - - return pluginsValues; - } - - public static boolean hasScores(Calendar cal) { - - ScoresService service; - try { - service = getService(); - } catch (NamingException e) { - return false; - } - - return service.hasPluginsValues(portalName, cal); - } - - /** - * For the specified plugin returns historical project score - * from the given <code>date</code> in the past. - * - * Notice that only year, month and day matter in passed dates. - * - * @return project score from the given date for specified plugin - * @throws GetScoresException - */ - public static long getValue(String pluginId, String projectId, - Calendar cal) - throws GetScoresException { - - PluginsValues pluginsValues = getScores(cal); - - return pluginsValues.getPluginValue(pluginId, projectId); - } - - public static PluginsValues getCurrentScores() - throws GetScoresException { - - Calendar now = Calendar.getInstance(); - - return getScores(now); - } - - private static ScoresService getService() throws NamingException { - - Context context = new InitialContext(properties); - - // Perform look up using JNDI name of ejb object - String serviceBinding = - (isRemote ? Constants.STATUS_REMOTE_SERVICE : - Constants.STATUS_LOCAL_SERVICE); - Object ref = context.lookup(serviceBinding); - - // Narrow the reference of the object returned by lookup() method - ScoresService service = - (ScoresService) PortableRemoteObject.narrow( ref, - (isRemote ? ScoresServiceRemote.class : - ScoresServiceLocal.class)); - - return service; - } - - public static long getValue(String id, String projectId, - Calendar start, Calendar end) throws GetScoresException { - - long value; - Calendar cal = start; - - for (;;) { - - if (cal.after(end)) { - throw new GetScoresException(); - } - - try { - value = getValue(id, projectId, cal); - return value; - } catch (GetScoresException e) { - // try next - cal.add(Calendar.DAY_OF_MONTH, 1); - } - } - } - - /* - * java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory - * java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces - * java.naming.provider.url=localhost:1099 - * jnp.disableDiscovery=true - */ -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/LabsDialogBox.java (from rev 4785, labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/LabsDialogBox.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -114,7 +114,7 @@ Image image = new Image("/file-access/default/theme/images/but_tagme.gif"); image.setStyleName("tagme_btn"); - image.addClickListener(new TagMeShowPopupListener(path, user, clas)); + image.addClickListener(new TagMeShowPopupListener(path, user, clas, image)); return image; //return new Button("TagMe", new TagMeShowPopupListener(path, user, clas)); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -25,6 +25,7 @@ import java.util.Vector; import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -61,13 +62,16 @@ private Button saveBtn; private FlexTable suggTable; + + private Vector suggestionCheckboxes; - private Vector suggestionCheckboxes; + private Image parentButton; - public TagMeShowPopupListener(String path, String user, String clas) { + public TagMeShowPopupListener(String path, String user, String clas, Image parentButton) { this.path = path; this.currentUser = user; this.clas = clas; + this.parentButton = parentButton; } public TagMeShowPopupListener getMyself() { @@ -76,7 +80,7 @@ public void refreshSugestions() { suggestionCheckboxes = new Vector(); - + while (suggTable.getRowCount() > 0) { table.removeRow(0); } @@ -89,12 +93,12 @@ AsyncCallback callback = new AsyncCallback() { public void onSuccess(Object result) { - Vector vect = (Vector)result; - - int rowLen = (int)Math.sqrt(vect.size()); - + Vector vect = (Vector) result; + + int rowLen = (int) Math.sqrt(vect.size()); + for (int i = 0; i < vect.size(); i++) { - CheckBox chBox = new CheckBox((String)vect.get(i)); + CheckBox chBox = new CheckBox((String) vect.get(i)); suggTable.setWidget(i / rowLen, i % rowLen, chBox); suggestionCheckboxes.add(chBox); } @@ -182,7 +186,7 @@ // call AJAX methos, after that callback is going to be executed tagging.getTags(path, clas, callback); - + // refresh tags also refreshSugestions(); } @@ -223,7 +227,7 @@ refreshTags(); - final DialogBox dialog = new DialogBox(); + final LabsDialogBox dialog = new LabsDialogBox(); HorizontalPanel btnPanel = new HorizontalPanel(); this.saveBtn = new Button("Save", new TagMeClickListener(path, @@ -256,8 +260,7 @@ dialog.setText("TagMe!"); - dialog.setPopupPosition(sender.getAbsoluteLeft(), sender - .getAbsoluteTop()); + dialog.setPopupPosition(DOM.getAbsoluteLeft(parentButton.getElement()), DOM.getAbsoluteTop(parentButton.getElement())); dialog.show(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-20 19:38:10 UTC (rev 4786) @@ -125,8 +125,13 @@ <div id="jbfPageFooter"> <div id="Copyright"> - JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> -Theme made by <a href="http://mamut.net.pl">Szimano</a> + <a href="http://www.redhat.com"><img src="http://www.jboss.com/jbosstheme/img/logo_rh_home.png" alt=" Red Hat" width="96" height="31" border="0" /></a> + <br /> + <br /> + © 2002-2006 Red Hat, Inc. All rights reserved. JBoss is a registered trademark of Red Hat, Inc. + <a href="http://www.jboss.com/privacy_policy">Privacy Policy</a><br /> + + Theme made by <a href="http://mamut.net.pl">Szimano</a> </div> </div> Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -37,6 +37,7 @@ import org.jboss.mx.util.MBeanProxyExt; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.wiki.exceptions.WikiManagementNotFoundException; +import org.jboss.wiki.management.EMailNotifier; import org.jboss.wiki.management.NotificationMsg; import org.jboss.wiki.management.WikiServiceMenagement; import org.jboss.wiki.plugins.DifferenceEngine; @@ -77,17 +78,20 @@ try { InitialContext context = new InitialContext(); - QueueSession sess = null; - Queue queue = null; + //QueueSession sess = null; + //Queue queue = null; + EMailNotifier notifer = null; try { - queue = (Queue) context.lookup("queue/wikiNotifications"); + /*queue = (Queue) context.lookup("queue/wikiNotifications"); QueueConnectionFactory factory = (QueueConnectionFactory) context .lookup("java:/ConnectionFactory"); sess = factory.createQueueConnection().createQueueSession( - false, QueueSession.AUTO_ACKNOWLEDGE); + false, QueueSession.AUTO_ACKNOWLEDGE);*/ - if (sess != null) { - + notifer = (EMailNotifier)context.lookup(EMailNotifier.class.getName()); + + //if (sess != null) { + if (notifer != null) { String notifs = page .getMetaDataProperty(WatchListPlugin.WATCH_PROPERTY); @@ -150,17 +154,18 @@ diffs + "<br /><hr />\n<br/>\nThis is notification of page: " + pageLink + "<br/>\n" + pageHtml.getContent(), page.getName(), fromEmail, pageLink); - ObjectMessage msg = sess.createObjectMessage(notifMsg); - sess.createSender(queue).send(msg); + //ObjectMessage msg = sess.createObjectMessage(notifMsg); + //sess.createSender(queue).send(msg); + notifer.sendNotification(notifMsg); } } else { log.error("Couldn't create queue session."); } } catch (CloneNotSupportedException e) { log.error(e); - } catch (JMSException e) { + }/* catch (JMSException e) { log.error(e); - } + }*/ } catch (NamingException e1) { log.error(e1); } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EMailNotifier.java (from rev 4785, labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EMailNotifier.java) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/EMailNotifierSLSB.java (from rev 4785, labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/EMailNotifierSLSB.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/MailNotificationBean.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/MailNotificationBean.java 2006-06-20 19:28:56 UTC (rev 4785) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/MailNotificationBean.java 2006-06-20 19:38:10 UTC (rev 4786) @@ -19,7 +19,7 @@ * 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.wiki; +/*package org.jboss.wiki; import java.util.Date; @@ -102,4 +102,4 @@ } } -} +}*/ |
