Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4767 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: common service/impl service/impl/protocol service/protocol tools
Author: wrzep
Date: 2006-06-15 08:29:40 -0400 (Thu, 15 Jun 2006)
New Revision: 4767
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java
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/service/impl/ScoresMDB.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Cleanup after simplifying getting and refreshing scores.
Pawel
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-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -11,7 +11,6 @@
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";
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-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -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,16 +34,10 @@
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.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);
@@ -106,24 +93,5 @@
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/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java 2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -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/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java 2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -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/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java 2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -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/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java 2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -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/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java 2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -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/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-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-15 12:29:40 UTC (rev 4767)
@@ -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;
@@ -43,7 +42,6 @@
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
-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;
@@ -80,32 +78,6 @@
}
}
- public static PluginsValues getScores(Timestamp timestamp)
- throws GetScoresException {
-
-
- GetScoresResponse response = RecordManager.get(timestamp);
-
- System.out.println("attempt");
-
- if (response == null) {
- return null;
- }
-
- PluginsValues pluginsValues = response.getPluginsValues();
-
- if (pluginsValues == null) {
- try {
- sendMessage(Constants.GET_SCORES_MESSAGE,
- response.getRequest());
- } catch (Exception e) {
- throw new GetScoresException(e);
- }
- }
-
- return pluginsValues;
- }
-
public static PluginsValues getLatestScores()
throws GetScoresException {
|
