Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4660 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins/cc plugins/codelines plugins/jira plugins/svn service service/impl service/impl/protocol templates tools
|
From: <jbo...@li...> - 2006-06-08 00:36:03
|
Author: dam...@jb...
Date: 2006-06-07 20:35:55 -0400 (Wed, 07 Jun 2006)
New Revision: 4660
Added:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Removed:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
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/StatusConfWatcher.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/StatusPortlet.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.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/plugins/jira/JiraStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.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/service/impl/ScoresServiceImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
Log:
MERGE: -r 4659:4658 . to revert 4659.
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-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -35,7 +35,6 @@
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
@@ -48,7 +47,8 @@
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.forge.status.tools.ScoresManagerAsync;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import org.jboss.portal.common.context.DelegateContext;
@@ -92,12 +92,12 @@
PluginsValues pluginsValues;
try {
- // Get current scores
+ // Compute and save current scores
- ScoresManager.init(portalName, serviceConf);
- ScoresManager.save(projects, pluginsConf);
+ ScoresManagerAsync.init(portalName, serviceConf);
+ ScoresManagerAsync.save(projects, pluginsConf);
- pluginsValues = ScoresManager.getCurrentScores();
+ pluginsValues = ScoresManagerAsync.getCurrentScores();
} catch (ScoresSaveException e) {
log.error("Saving scores failed ", e);
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -24,7 +24,7 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.forge.status.common.Locations;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
@@ -40,16 +40,16 @@
String portalName = key;
- addWatchedPath(key, Locations.getXmlCmPath(portalName));
- addWatchedPath(key, Locations.getXmlStatusPluginsCmPath(portalName));
- addWatchedPath(key, Locations.getServicePropertiesCmPath(portalName));
+ addWatchedPath(key, Tools.getXmlCmPath(portalName));
+ addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName));
+ addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName));
/* Watch projects.xml file */
- addWatchedPath(key, Locations.getProjectsXmlPath(portalName));
+ addWatchedPath(key, Tools.getProjectsXmlPath(portalName));
/* Watch all project.xml files.
* We assume that they contain entries used by plugins */
- Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName);
+ Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName);
for (String projectXmlPath : projectXmlPathsSet) {
addWatchedPath(key, projectXmlPath);
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-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.io.IOException;
-import org.jboss.forge.status.common.Locations;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
@@ -53,13 +53,13 @@
public StatusDescriptor(String portalName, ContentManager cm) {
try {
- String statusPath = Locations.getXmlCmPath(portalName);
+ String statusPath = Tools.getXmlCmPath(portalName);
Node statusRoot = getRoot(cm , statusPath);
- String pluginsPath = Locations.getXmlStatusPluginsCmPath(portalName);
+ String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName);
Node pluginsRoot = getRoot(cm, pluginsPath);
- String servicePath = Locations.getServicePropertiesCmPath(portalName);
+ String servicePath = Tools.getServicePropertiesCmPath(portalName);
org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath);
status = new Status(portalName, statusRoot, pluginsRoot,
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -28,9 +28,7 @@
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.common.Tools;
-
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
@@ -64,17 +62,17 @@
DelegateContext context = null;
if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) {
- jspPath = Locations.getPrjDetailsJspCmPath();
+ jspPath = Tools.getPrjDetailsJspCmPath();
context = desc.getProjectContext(id);
}
if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) {
- jspPath = Locations.getColumnDetailsJspCmPath();
+ jspPath = Tools.getColumnDetailsJspCmPath();
context = desc.getColumnContext(id);
}
if (id == null) { // Request for main Matrix page
- jspPath = Locations.getJspCmPath();
+ jspPath = Tools.getJspCmPath();
context = desc.getContext();
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,8 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
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-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.HashMap;
-import org.jboss.forge.common.projects.Repository;
import org.jboss.forge.status.plugins.Plugin;
+import org.jboss.forge.status.tools.Tags;
/**
* @author Pawel Wrzeszcz
@@ -61,19 +61,24 @@
long cl = 0;
- Repository repo = projects.getProjectRepository(projectId);
+ String url = getProperty(projectId, Tags.SVN_REPO_ADRESS_TAG);
- if (repo != null) {
+ if (url != null) {
- String url = repo.getLocation();
- String userName = repo.getUsername();
- String password = repo.getPassword();
+ String userName = getProperty(projectId, Tags.SVN_USERNAME_TAG);
+ String password = getProperty(projectId, Tags.SVN_PASSWD_TAG);
cl = getValue(url, userName, password);
- cashedValues.put(projectId, new Long(cl));
}
+
+ cashedValues.put(projectId, new Long(cl));
}
return cashedValues.get(projectId).longValue();
}
+
+ private String getProperty(String projectId, String propertyName) {
+ String prop = projects.getProjectProperty(projectId, propertyName);
+ return (prop == "" ? null : prop);
+ }
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,9 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.common.projects.IssueTracker;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
@@ -96,14 +95,8 @@
private String getJiraURL(String projectId) {
- IssueTracker it = projects.getProjectIssueTracker(projectId);
-
- if ((it == null)
- || (it.getType() != IssueTracker.JIRA_ISSUE_TRACKER)) {
- return null;
- }
-
- return it.getLocation();
+ String jiraURL = projects.getProjectProperty(projectId, Tags.JIRA_ADRESS_TAG);
+ return (jiraURL == "" ? null : jiraURL);
}
@Override
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,9 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.common.projects.Repository;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
@@ -63,7 +62,7 @@
String repoURL = getRepoURL(projectId);
if (repoURL == null) {
- return null;
+ return null;
}
SvnRepository repository = null;
@@ -96,23 +95,9 @@
return repository;
}
-
- /**
- * For the given project id, returns project SVN repository location or
- * null if no such project exist or its repository is not SVN repository.
- */
private String getRepoURL(String projectId) {
-
- Repository repository = projects.getProjectRepository(projectId);
- if (repository == null) {
- return null;
- }
-
- if (repository.getType() == Repository.SVN_REPOSITORY) {
- return repository.getLocation();
- } else {
- return null;
- }
+ String repoURL = projects.getProjectProperty(projectId, Tags.SVN_REPO_ADRESS_TAG);
+ return (repoURL == "" ? null : repoURL);
}
@Override
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -29,6 +29,7 @@
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.protocol.PluginConf;
+import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
/**
@@ -36,11 +37,12 @@
*/
public interface ScoresService {
+ public PluginsValues getPluginsValues(String portalName,
+ Date date) throws GetScoresException;
+
public void save(Projects projects, List<PluginConf> pluginsConf,
- String portalName) throws ScoresSaveException;
-
- public PluginsValues getPluginsValues(String portalName, Date date)
- throws GetScoresException;
-
- public boolean hasPluginsValues(String portalName, Date date);
+ String portalName) throws ScoresSaveException;
+
+ public PluginValues get(String portalName, String pluginId, Date date)
+ throws GetScoresException;
}
\ No newline at end of file
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-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -35,7 +35,6 @@
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.protocol.GetScoresRequest;
@@ -57,7 +56,7 @@
@ActivationConfigProperty(propertyName="destinationType",
propertyValue="javax.jms.Queue"),
@ActivationConfigProperty(propertyName="destination",
- propertyValue=Constants.QUEUE_NAME)
+ propertyValue="queue/jmm")
})
public class ScoresMDB implements MessageListener {
@@ -69,17 +68,16 @@
ObjectMessage message = (ObjectMessage) msg;
try {
- String requestName =
- message.getStringProperty(Constants.NAME_PROPERTY);
+ String requestName = message.getStringProperty("name");
System.out.println("request name: " + requestName);
- if (requestName.equals(Constants.SAVE_MESSAGE)) {
+ if (requestName.equals("save")) {
SaveRequest saveRequest = (SaveRequest) message.getObject();
handleRequest(saveRequest);
}
- if (requestName.equals(Constants.GET_SCORES_MESSAGE)) {
+ if (requestName.equals("getPluginsValues")) {
GetScoresRequest getScoresRequest =
(GetScoresRequest) message.getObject();
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -43,17 +43,16 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
-import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.common.Tags;
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.impl.protocol.PluginValuesImpl;
import org.jboss.forge.status.service.impl.protocol.PluginsValuesImpl;
import org.jboss.forge.status.service.protocol.PluginConf;
import org.jboss.forge.status.tools.Plugins;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
@@ -67,12 +66,12 @@
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
-@Service(objectName=Tags.STATUS_SERVICE_NAME)
+@Service(objectName=Tools.STATUS_SERVICE_NAME)
@Management(ScoresService.class)
@Local(ScoresServiceLocal.class)
-@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
+@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE)
@Remote(ScoresServiceRemote.class)
-@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE)
+@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE)
public class ScoresServiceImpl implements ScoresService {
private static Logger log = Logger.getLogger(ScoresServiceImpl.class);
@@ -100,7 +99,7 @@
// Get directory where we store historical scores
Directory rootDir = cm.getRootDirectory();
- String dirName = Locations.getShotokuStatusPath(portalName);
+ String dirName = Tools.getShotokuStatusPath(portalName);
Directory dir = getDir(rootDir, dirName);
log.info("Computing scores...");
@@ -182,7 +181,7 @@
Directory dir;
try {
- dir = rootDir.getDirectory(Locations.getShotokuStatusPath(portalName));
+ dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName));
} catch (RepositoryException e) {
throw new GetScoresException(e);
} catch (ResourceDoesNotExist e) {
@@ -342,16 +341,11 @@
return getNodeName(today);
}
- public boolean hasPluginsValues(String portalName, Date date) {
+ public PluginValuesImpl get(String portalName, String pluginId, Date date)
+ throws GetScoresException {
- PluginsValuesImpl pluginsValues = null;
-
- try {
- pluginsValues = getPluginsValues(portalName, date);
- } catch (GetScoresException e) {
- return false;
- }
-
- return (pluginsValues != null);
- }
+ PluginsValuesImpl pv = getPluginsValues(portalName, date);
+ return pv.getPluginValues(pluginId);
+ }
+
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -27,9 +27,9 @@
import java.util.Properties;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
import org.jboss.forge.status.service.protocol.PluginConf;
+import org.jboss.forge.status.tools.Tags;
import org.w3c.dom.Node;
/**
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -24,8 +24,8 @@
import java.util.Properties;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.ServiceConf;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.shotoku.Node;
/**
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -26,8 +26,8 @@
import java.util.List;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -34,11 +34,11 @@
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
import org.jboss.forge.status.tools.ProjectsByNameComparator;
import org.jboss.forge.status.tools.ProjectsByScoreComparator;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -27,8 +27,8 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -22,9 +22,9 @@
package org.jboss.forge.status.templates;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.forge.common.XmlTools;
import org.jboss.portal.common.context.DelegateContext;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -26,8 +26,8 @@
import java.util.ArrayList;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -31,7 +31,6 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.plugins.Plugin;
import org.jboss.forge.status.service.protocol.PluginConf;
Deleted: 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-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -1,183 +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.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Date;
-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;
-
-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.impl.protocol.SaveRequestImpl;
-import org.jboss.forge.status.service.protocol.GetScoresRequest;
-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;
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-
-public class ScoresManager {
-
- private static boolean isRemote;
- private static Properties properties;
-
- public static void init(String portalName, ServiceConf serviceConf) {
-
- ScoresManagerSync.init(portalName, serviceConf); //TODO inheritance
-
- isRemote = serviceConf.isRemote();
- System.out.println("remote: " + isRemote);
-
- properties = serviceConf.getProperties();
- }
-
- public static void save(Projects projects, List<PluginConf> pluginsConf)
- throws ScoresSaveException {
-
- SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects);
- //TODO request factory
- //conf factory?
-
- // Send message
- try {
- sendMessage(Constants.SAVE_MESSAGE, saveRequest);
- } catch (Exception e) {
- throw new ScoresSaveException(e);
- }
- }
-
- public static PluginsValues getScores(Date date, Date toDate)
- throws GetScoresException {
- //TODO toDate
-
- Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-
- GetScoresRequest getScoresRequest =
- new GetScoresRequestImpl(date, toDate, timestamp);
-
- // Send message
- try {
- sendMessage(Constants.GET_SCORES_MESSAGE, getScoresRequest);
- } catch (Exception e) {
- throw new GetScoresException(e);
- }
-
- PluginsValues pluginsValues = null;
- int attempts = 0;
-
- for (;;) {
-
- pluginsValues = RecordManager.get(timestamp);
-
- System.out.println("attempt: " + pluginsValues);
-
- if ((pluginsValues != null) ||
- ((attempts++) == Constants.MAX_ATTEMPTS)) {
- break;
- }
-
- try {
- Thread.sleep(Constants.SLEEP_TIME);
- } catch (InterruptedException e) {
- throw new GetScoresException(e);
- }
- }
-
- return pluginsValues;
- }
-
- /**
- * For the specified plugin returns historical project score
- * from the given <code>date</code> in the past.
- * If scores from specified day are not available,
- * the next available scores saved at the day before or equal
- * to <code>toDate</code> are returned.
- *
- * 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,
- Date date, Date toDate)
- throws GetScoresException {
-
- PluginsValues pluginsValues = getScores(date, toDate);
-
- return pluginsValues.getPluginValue(pluginId, projectId);
- }
-
- public static PluginsValues getCurrentScores()
- throws GetScoresException {
-
- Date now = new Date();
-
- return getScores(now, now);
- }
-
- 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 = new InitialContext(properties);
-
- queue = (Queue) context.lookup(Constants.QUEUE_NAME);
- QueueConnectionFactory factory =
- (QueueConnectionFactory) context.lookup("ConnectionFactory");
- connection = factory.createQueueConnection();
- session = connection.createQueueSession(false,
- QueueSession.AUTO_ACKNOWLEDGE);
-
- // Create message
- ObjectMessage message = session.createObjectMessage();
- message.setStringProperty("name", name);
- message.setObject(request);
-
- sender = session.createSender(queue);
- sender.send(message);
- session.close ();
- }
-
-}
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java (from rev 4658, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java)
Modified: 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-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -32,7 +32,6 @@
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;
@@ -130,8 +129,8 @@
// Perform look up using JNDI name of ejb object
String serviceBinding =
- (isRemote ? Constants.STATUS_REMOTE_SERVICE :
- Constants.STATUS_LOCAL_SERVICE);
+ (isRemote ? Tools.STATUS_REMOTE_SERVICE :
+ Tools.STATUS_LOCAL_SERVICE);
Object ref = context.lookup(serviceBinding);
// Narrow the reference of the object returned by lookup() method
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java (from rev 4658, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java)
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java (from rev 4658, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java)
|
