[jboss-svn-commits] JBL Code SVN: r8154 - in labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm: common/tools service/impl service/impl/db service/plugins/cc service/plugins/codelines service/plugins/svn
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 8 16:20:17 EST 2006
Author: wrzep
Date: 2006-12-08 16:20:12 -0500 (Fri, 08 Dec 2006)
New Revision: 8154
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/db/DBServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcBuildsPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/svn/SvnPlugin.java
Log:
JBLAB-599
Small fix for CC plugin.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -7,6 +7,8 @@
import javax.naming.NamingException;
+import org.jboss.forge.common.projects.project.BuildResult;
+import org.jboss.forge.common.projects.project.BuildType;
import org.jboss.forge.common.projects.project.Downloads;
import org.jboss.forge.common.projects.project.IssueTracker;
import org.jboss.forge.common.projects.project.IssueTrackerType;
@@ -54,32 +56,34 @@
return service.getProjectJems(projectId);
}
- public static List<String> getCcURLs(String projectId) {
+ public static List<String> getProjectCcURLs(String projectId) {
- List<Repository> repoList = getProjectCcRepositories(projectId);
- List<String> ccURLs = new ArrayList<String>();
+ List<BuildResult> buildResults = service.getProjectBuildresults(projectId);
+ List<String> ccBuildURLs = new ArrayList<String>();
- for (Repository repository : repoList) {
+ for (BuildResult buildResult : buildResults) {
- ccURLs.add(repository.getValue());
+ if (buildResult.getType() == BuildType.CRUISE_CONTROL) {
+ ccBuildURLs.add(buildResult.getValue());
+ }
}
- return ccURLs;
+ return ccBuildURLs;
}
- public static List<Repository> getProjectCcRepositories(String projectId) {
+ public static List<Repository> getProjectSVNRepositories(String projectId) {
List<Repository> repoList = service.getProjectRepositories(projectId);
- List<Repository> ccRepoList = new ArrayList<Repository>();
+ List<Repository> svnRepoList = new ArrayList<Repository>();
for (Repository repository : repoList) {
if (repository.getType() == RepoType.SVN) {
- ccRepoList.add(repository);
+ svnRepoList.add(repository);
}
}
- return ccRepoList;
+ return svnRepoList;
}
public static IssueTracker getProjectJiraIssueTracker(String projectId) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -30,6 +30,7 @@
import javax.ejb.Timer;
import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.TransactionTimeout;
import org.jboss.forge.jmm.common.Constants;
import org.jboss.forge.jmm.common.exceptions.ScoresException;
@@ -65,6 +66,7 @@
}
@Timeout
+ @TransactionTimeout(value=30)
public void update(Timer timer) {
log.info("Updating scores...");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresServiceImpl.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/ScoresServiceImpl.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -36,7 +36,6 @@
import org.jboss.forge.jmm.common.Constants;
import org.jboss.forge.jmm.common.exceptions.GetScoresException;
import org.jboss.forge.jmm.common.exceptions.ScoresException;
-import org.jboss.forge.jmm.common.exceptions.ScoresSaveException;
import org.jboss.forge.jmm.common.protocol.ScoresManager;
import org.jboss.forge.jmm.common.protocol.ScoresRepositoryManager;
import org.jboss.forge.jmm.common.protocol.ScoresService;
@@ -81,7 +80,6 @@
private List<PluginConf> pluginsConf;
private List<String> projectIds;
-
public void init(Configuration conf, ScoresManager scoresManager)
throws ScoresException {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/db/DBServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/db/DBServiceImpl.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/impl/db/DBServiceImpl.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -59,8 +59,6 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public synchronized void save(PluginsValues toSave) {
-
- System.out.println("save: " + toSave.getDate());
PluginsValues pv = get(toSave.getDate());
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcBuildsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcBuildsPlugin.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcBuildsPlugin.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -50,7 +50,7 @@
@Override
public long getPluginValue(String projectId) {
- List<String> URLs = ProjectTools.getCcURLs(projectId);
+ List<String> URLs = ProjectTools.getProjectCcURLs(projectId);
if (URLs == null) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcPlugin.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/cc/CcPlugin.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -62,7 +62,7 @@
protected List<CcProject> getProjectServices(String projectId) {
// Get project cc URLs
- List<String> ccURLs = ProjectTools.getCcURLs(projectId);
+ List<String> ccURLs = ProjectTools.getProjectCcURLs(projectId);
if ((ccURLs == null) || (ccURLs.isEmpty())) {
return null;
@@ -100,7 +100,7 @@
@Override
public String getPluginLink(String projectId) {
- List<String> ccURLsString = ProjectTools.getCcURLs(projectId);
+ List<String> ccURLsString = ProjectTools.getProjectCcURLs(projectId);
return (ccURLsString == null) ? null : ccURLsString.get(0);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -58,7 +58,7 @@
long cl = 0;
- List<Repository> repoList = ProjectTools.getProjectCcRepositories(projectId);
+ List<Repository> repoList = ProjectTools.getProjectSVNRepositories(projectId);
if (repoList == null) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/svn/SvnPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/svn/SvnPlugin.java 2006-12-08 21:18:56 UTC (rev 8153)
+++ labs/jbosslabs/trunk/portal-extensions/forge-jmm/src/java/org/jboss/forge/jmm/service/plugins/svn/SvnPlugin.java 2006-12-08 21:20:12 UTC (rev 8154)
@@ -100,7 +100,7 @@
*/
private String getRepoURL(String projectId) {
- List<Repository> repoList = ProjectTools.getProjectCcRepositories(projectId);
+ List<Repository> repoList = ProjectTools.getProjectSVNRepositories(projectId);
if ((repoList == null) || (repoList.size() == 0)) {
return null;
More information about the jboss-svn-commits
mailing list