[jboss-svn-commits] JBL Code SVN: r7036 - in labs/jbosslabs/trunk/portal-extensions/forge-status: . src/java/org/jboss/forge/status/common/protocol src/java/org/jboss/forge/status/common/protocol/conf src/java/org/jboss/forge/status/common/tools src/java/org/jboss/forge/status/portlet/conf src/java/org/jboss/forge/status/service/impl src/java/org/jboss/forge/status/service/impl/db/protocol src/java/org/jboss/forge/status/service/impl/shotoku/protocol src/java/org/jboss/forge/status/service/plugins src/java/org/jboss/forge/status/service/plugins/cc src/java/org/jboss/forge/status/service/plugins/codelines src/java/org/jboss/forge/status/service/plugins/jira src/java/org/jboss/forge/status/service/plugins/math src/java/org/jboss/forge/status/service/plugins/productization src/java/org/jboss/forge/status/service/plugins/productization/docs src/java/org/jboss/forge/status/service/plugins/productization/forums src/java/org/jboss/forge/status/service/plugins/productization/support src/java/! org/jboss/forge/status/service/plugins/svn
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 23 15:46:51 EDT 2006
Author: wrzep
Date: 2006-10-23 15:46:36 -0400 (Mon, 23 Oct 2006)
New Revision: 7036
Added:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresService.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/conf/ScoresFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/Plugins.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/DBScoresFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginValuesEntity.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginsValuesEntity.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginValuesImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginsValuesImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/ShotokuScoresFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/KosmosStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/Plugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcBuildsPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/AddedCodeLinesPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/CodeLinesPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/jira/JiraStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/ConstPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/MathPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/RandomPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/WeightedScorePlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/JEMSIntegrationPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/docs/DocumentationTypePlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/forums/ForumTypePlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/support/SupportTypePlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/svn/SvnStatusPlugin.java
Log:
http://jira.jboss.com/jira/browse/JBLAB-781 (Standalone JMM service)
Got rid of all calls to org.jboss.forge.common.projects.Projects (labs side) from remote JMM service.
They will be handled using appropiate service on labs side.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml 2006-10-23 19:46:36 UTC (rev 7036)
@@ -57,11 +57,12 @@
</goal>
<goal name="service-deploy">
- <ant:delete file="${local.deploy.dir}/${status.service.final.name}" />
+ <ant:delete file="${local.deploy.dir}/${status.service.final.name}" />
+ <ant:copy todir="${jmm.service.deploy.dir}" file="target/${status.service.final.name}" />
<ant:copy todir="${jmm.service.deploy.dir}">
- <ant:fileset dir="target/${jmm.service.sar}" flatten="true" overwrite="true">
- <ant:filename name="**" />
+ <ant:fileset dir="target/" flatten="true" overwrite="true">
+ <ant:filename name="**/${jmm.service.sar}/**" />
</ant:fileset>
</ant:copy>
@@ -76,7 +77,7 @@
<goal name="service-all">
<attainGoal name="service-clean" />
- <attainGoal name="build" />
+<!-- <attainGoal name="build" /> -->
<attainGoal name="service-build" />
<attainGoal name="service-deploy" />
</goal>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresService.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/ScoresService.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -26,10 +26,6 @@
import java.util.Calendar;
import java.util.List;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.exceptions.GetScoresException;
import org.jboss.forge.status.common.exceptions.ScoresException;
import org.jboss.forge.status.common.exceptions.ScoresSaveException;
@@ -39,12 +35,11 @@
/**
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
-//@Local
-//@Remote
+
public interface ScoresService extends Serializable {
public void init(String portalName, ScoresManager scoresManager,
- List<PluginConf> pluginsConf, Projects projects)
+ List<PluginConf> pluginsConf, List<String> projectIds)
throws ScoresException;
public void save() throws ScoresSaveException;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/conf/ScoresFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/conf/ScoresFactory.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/protocol/conf/ScoresFactory.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,9 +22,7 @@
package org.jboss.forge.status.common.protocol.conf;
-import java.util.Set;
-
-import org.jboss.forge.common.projects.Projects;
+import java.util.List;
import org.jboss.forge.status.common.tools.Plugins;
import org.jboss.forge.status.service.plugins.Plugin;
@@ -35,8 +33,8 @@
*/
public interface ScoresFactory {
- public PluginsValues createPluginsValues(Projects projects, Plugins plugins);
+ public PluginsValues createPluginsValues(List<String> projectIds, Plugins plugins);
- public PluginValues createPluginValues(Plugin plugin, Set<String> projectIds);
+ public PluginValues createPluginValues(Plugin plugin, List<String> projectIds);
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/Plugins.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/Plugins.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/Plugins.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -29,8 +29,6 @@
import java.util.Properties;
import java.util.Set;
-import org.jboss.forge.common.projects.Projects;
-
import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.common.protocol.ScoresManager;
@@ -54,7 +52,7 @@
/**
* Projects present in the Status Matrix.
*/
- private Projects projects;
+ private List<String> projectIds;
private ScoresManager scoresManager;
@@ -63,12 +61,12 @@
/**
* @param pluginsNode Node with plugins definitions
* @param portalName portal name
- * @param projects Projects present in the Status Matrix
+ * @param projectIds Projects present in the Status Matrix
*/
public Plugins(List<PluginConf> pluginsConf, String portalName,
- Projects projects, ScoresManager scoresManager) {
+ List<String> projectIds, ScoresManager scoresManager) {
- this.projects = projects;
+ this.projectIds = projectIds;
this.scoresManager = scoresManager;
log = Logger.getLogger(this.getClass());
@@ -117,7 +115,7 @@
try {
plugin = (Plugin) pluginClass.newInstance();
- plugin.init(pluginId, portalName, projects,
+ plugin.init(pluginId, portalName, projectIds,
this, pluginProperties, scoresManager);
} catch (InvalidPluginPropertiesException e) {
Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -0,0 +1,43 @@
+package org.jboss.forge.status.common.tools;
+
+import java.util.List;
+
+import org.jboss.forge.common.projects.IssueTracker;
+import org.jboss.forge.common.projects.Projects;
+import org.jboss.forge.common.projects.Repository;
+import org.jboss.forge.status.common.Tags;
+
+/**
+ * @author Pawel Wrzeszcz
+ */
+public class ProjectTools {
+
+ private static Projects projects;
+
+
+ public static List<String> getCcURLs(String projectId) {
+
+ String ccURLsString =
+ projects.getProjectProperty(projectId, Tags.CC_ADRESS_TAG);
+
+ if (ccURLsString == "") {
+ return null;
+ }
+
+ return Tools.getCommaSeparatedStrings(ccURLsString);
+ }
+
+
+ public static Repository getProjectRepository(String projectId) {
+
+ return projects.getProjectRepository(projectId);
+ }
+
+
+ public static IssueTracker getProjectIssueTracker(String projectId) {
+
+ return projects.getProjectIssueTracker(projectId);
+ }
+
+
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/portlet/conf/ServiceScoresManager.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,9 +22,11 @@
package org.jboss.forge.status.portlet.conf;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -33,6 +35,8 @@
import javax.rmi.PortableRemoteObject;
import org.jboss.forge.common.projects.Projects;
+import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.common.exceptions.GetScoresException;
@@ -84,8 +88,12 @@
throw new ScoresException(e);
}
- service.init(portalName, this, pluginsConf, projects);
+ List<String> projectIds = new ArrayList<String>(
+ projects.getProjectIds(
+ (PermissionsChecker) new NullPermissionsChecker(), null));
+ service.init(portalName, this, pluginsConf, projectIds);
+
sheduleUpdates(serviceConf);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -38,7 +38,6 @@
import org.jboss.annotation.ejb.Management;
import org.jboss.annotation.ejb.Service;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.common.exceptions.GetScoresException;
@@ -68,7 +67,7 @@
//@Local(ScoresService.class)
//@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
- at Remote(ScoresService.class)
+//@Remote(ScoresService.class)
//@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE)
public class ScoresServiceImpl implements ScoresService {
@@ -84,11 +83,11 @@
private ScoresFactory scoresFactory;
private List<PluginConf> pluginsConf;
- private Projects projects;
+ private List<String> projectIds;
public void init(String portalName, ScoresManager scoresManager,
- List<PluginConf> pluginsConf, Projects projects)
+ List<PluginConf> pluginsConf, List<String> projectIds)
throws ScoresException {
log.info("INIT");
@@ -96,7 +95,7 @@
this.portalName = portalName;
this.scoresManager = scoresManager;
this.pluginsConf = pluginsConf;
- this.projects = projects;
+ this.projectIds = projectIds;
try {
repositoryManager = new DBScoresRepositoryManager();
@@ -110,7 +109,7 @@
/**
* Saves current plugin values.
*
- * @param projects Projects for which plugin values will be saved
+ * @param projectIds Projects for which plugin values will be saved
* @param plugins Plugins for which values will be saved
* @param portalName
* @return true iff saving was successful
@@ -121,14 +120,14 @@
log.info("Getting plugins...");
// Get plugins from conf
- Plugins plugins = new Plugins(pluginsConf, portalName, projects,
+ Plugins plugins = new Plugins(pluginsConf, portalName, projectIds,
scoresManager);
log.info("Computing scores...");
// Get plugin values and save them in proper node
PluginsValues pluginsValues =
- scoresFactory.createPluginsValues(projects, plugins);
+ scoresFactory.createPluginsValues(projectIds, plugins);
log.info("Saving...");
@@ -231,6 +230,9 @@
public Object invoke(Invocation mi) throws Exception {
System.out.println("MyService.invoke> method=" + mi.getMethod().getName());
- return "invoke";
+
+ mi.getMethod().invoke(this,mi.getArguments());
+
+ return "invoke";
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/DBScoresFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/DBScoresFactory.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/DBScoresFactory.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,6 +22,7 @@
package org.jboss.forge.status.service.impl.db.protocol;
+import java.util.List;
import java.util.Set;
import org.jboss.forge.common.projects.Projects;
@@ -38,11 +39,11 @@
*/
public class DBScoresFactory implements ScoresFactory {
- public PluginsValues createPluginsValues(Projects projects, Plugins plugins) {
- return new PluginsValuesEntity(projects, plugins);
+ public PluginsValues createPluginsValues(List<String> projectIds, Plugins plugins) {
+ return new PluginsValuesEntity(projectIds, plugins);
}
- public PluginValues createPluginValues(Plugin plugin, Set<String> projectIds) {
+ public PluginValues createPluginValues(Plugin plugin, List<String> projectIds) {
return new PluginValuesEntity(plugin, projectIds, null);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginValuesEntity.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginValuesEntity.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginValuesEntity.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -24,9 +24,8 @@
package org.jboss.forge.status.service.impl.db.protocol;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-import java.util.Set;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -63,7 +62,7 @@
*/
public PluginValuesEntity () {}
- public PluginValuesEntity(Plugin plugin, Set<String> projectIds,
+ public PluginValuesEntity(Plugin plugin, List<String> projectIds,
PluginsValuesEntity pluginsValues) {
// Get plugin properties
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginsValuesEntity.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginsValuesEntity.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/db/protocol/PluginsValuesEntity.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -25,9 +25,8 @@
import java.util.Calendar;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-import java.util.Set;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -39,8 +38,6 @@
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.status.common.protocol.conf.PluginValues;
import org.jboss.forge.status.common.protocol.conf.PluginsValues;
import org.jboss.forge.status.common.tools.Plugins;
@@ -77,15 +74,12 @@
* @param projects Projects present in the Status Matrix
* @param plugins Plugins which values will be stored
*/
- public PluginsValuesEntity(Projects projects, Plugins plugins) {
+ public PluginsValuesEntity(List<String> projectIds, Plugins plugins) {
date = Calendar.getInstance();
values = new HashMap<String,PluginValuesEntity>();
- Set<String> projectIds =
- projects.getProjectIds(new NullPermissionsChecker(), null);
-
for (Plugin plugin : plugins.getPlugins()) {
PluginValuesEntity pluginValues =
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginValuesImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginValuesImpl.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginValuesImpl.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -23,9 +23,8 @@
package org.jboss.forge.status.service.impl.shotoku.protocol;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-import java.util.Set;
-
import org.jboss.forge.status.common.protocol.conf.PluginValues;
import org.jboss.forge.status.service.plugins.Plugin;
@@ -45,7 +44,7 @@
private Map<String,Integer> rates = new HashMap<String,Integer>();
private Map<String,String> links = new HashMap<String,String>();
- public PluginValuesImpl(Plugin plugin, Set<String> projectIds) {
+ public PluginValuesImpl(Plugin plugin, List<String> projectIds) {
// Get plugin properties
pluginId = plugin.getId();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginsValuesImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginsValuesImpl.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/PluginsValuesImpl.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -23,13 +23,10 @@
package org.jboss.forge.status.service.impl.shotoku.protocol;
import java.util.Calendar;
+import java.util.List;
import java.util.Map;
import java.util.HashMap;
-import java.util.Set;
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
-
import org.jboss.forge.status.common.protocol.conf.PluginValues;
import org.jboss.forge.status.common.protocol.conf.PluginsValues;
import org.jboss.forge.status.common.tools.Plugins;
@@ -51,18 +48,15 @@
private Calendar cal;
/**
- * @param projects Projects present in the Status Matrix
+ * @param projectId Projects present in the Status Matrix
* @param plugins Plugins which values will be stored
*/
- public PluginsValuesImpl(Projects projects, Plugins plugins) {
+ public PluginsValuesImpl(List<String> projectIds, Plugins plugins) {
cal = Calendar.getInstance();
values = new HashMap<String,PluginValues>();
- Set<String> projectIds =
- projects.getProjectIds(new NullPermissionsChecker(), null);
-
for (Plugin plugin : plugins.getPlugins()) {
PluginValuesImpl pluginValues = new PluginValuesImpl(plugin, projectIds);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/ShotokuScoresFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/ShotokuScoresFactory.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/shotoku/protocol/ShotokuScoresFactory.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,10 +22,7 @@
package org.jboss.forge.status.service.impl.shotoku.protocol;
-import java.util.Set;
-
-import org.jboss.forge.common.projects.Projects;
-
+import java.util.List;
import org.jboss.forge.status.common.protocol.conf.PluginValues;
import org.jboss.forge.status.common.protocol.conf.PluginsValues;
import org.jboss.forge.status.common.protocol.conf.ScoresFactory;
@@ -38,11 +35,11 @@
*/
public class ShotokuScoresFactory implements ScoresFactory {
- public PluginsValues createPluginsValues(Projects projects, Plugins plugins) {
- return new PluginsValuesImpl(projects, plugins);
+ public PluginsValues createPluginsValues(List<String> projectIds, Plugins plugins) {
+ return new PluginsValuesImpl(projectIds, plugins);
}
- public PluginValues createPluginValues(Plugin plugin, Set<String> projectIds) {
+ public PluginValues createPluginValues(Plugin plugin, List<String> projectIds) {
return new PluginValuesImpl(plugin, projectIds);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/KosmosStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/KosmosStatusPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/KosmosStatusPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,7 +22,6 @@
package org.jboss.forge.status.service.plugins;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.tools.Plugins;
@@ -66,10 +65,10 @@
}
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
- super.init(id, portalName, projects, plugins, properties, scoresManager);
+ super.init(id, portalName, projectIds, plugins, properties, scoresManager);
getServiceProperty(properties);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/Plugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/Plugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/Plugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,11 +22,9 @@
package org.jboss.forge.status.service.plugins;
+import java.util.List;
import java.util.Properties;
-import java.util.Set;
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
@@ -51,7 +49,7 @@
protected String portalName;
/** Projects present in the Status Matrix. */
- protected Projects projects;
+ protected List<String> projectIds;
/** Plugins loaded before this plugin */
protected Plugins plugins;
@@ -65,7 +63,7 @@
/**
* @param id Plugin id
* @param portalName Portal name
- * @param projects Projects present in the Status Matrix
+ * @param projectIds Projects present in the Status Matrix
* @param properties plugin specyfic properties
* or null if properties are not specified
* @param scoresManager
@@ -74,13 +72,13 @@
* Thrown when properties passed in <code>propertiesNode</code>
* are incorrect or missing.
*/
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
this.id = id;
this.portalName = portalName;
- this.projects = projects;
+ this.projectIds = projectIds;
this.plugins = plugins;
this.properties = properties;
this.scoresManager = scoresManager;
@@ -223,9 +221,6 @@
private long getTotalScore() {
- Set<String> projectIds = projects.getProjectIds(
- new NullPermissionsChecker(), null);
-
long s = 0;
for (String projectId : projectIds) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcBuildsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcBuildsPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcBuildsPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -33,6 +33,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.jboss.forge.status.common.tools.ProjectTools;
import org.jboss.forge.status.service.plugins.Plugin;
import org.jboss.logging.Logger;
@@ -58,7 +59,7 @@
return cachedValues.get(projectId);
}
- List<String> URLs = CcStatusPlugin.getCcURLs(projects, projectId);
+ List<String> URLs = ProjectTools.getCcURLs(projectId);
if (URLs == null) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcStatusPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/cc/CcStatusPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -26,9 +26,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.Tags;
-import org.jboss.forge.status.common.tools.Tools;
+import org.jboss.forge.status.common.tools.ProjectTools;
import org.jboss.forge.status.service.plugins.KosmosStatusPlugin;
import org.jboss.logging.Logger;
@@ -63,7 +62,7 @@
protected List<CcProject> getProjectServices(String projectId) {
// Get project cc URLs
- List<String> ccURLs = getCcURLs(projects, projectId);
+ List<String> ccURLs = ProjectTools.getCcURLs(projectId);
if ((ccURLs == null) || (ccURLs.isEmpty())) {
return null;
@@ -97,24 +96,11 @@
return (stats.isEmpty() ? null : stats);
}
-
-
- public static List<String> getCcURLs(Projects projects, String projectId) {
-
- String ccURLsString =
- projects.getProjectProperty(projectId, Tags.CC_ADRESS_TAG);
-
- if (ccURLsString == "") {
- return null;
- }
- return Tools.getCommaSeparatedStrings(ccURLsString);
- }
-
@Override
public String getPluginLink(String projectId) {
- List<String> ccURLsString = getCcURLs(projects, projectId);
+ List<String> ccURLsString = ProjectTools.getCcURLs(projectId);
return (ccURLsString == null) ? null : ccURLsString.get(0);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/AddedCodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/AddedCodeLinesPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/AddedCodeLinesPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,9 +22,9 @@
package org.jboss.forge.status.service.plugins.codelines;
+import java.util.List;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.common.protocol.ScoresManager;
@@ -41,7 +41,7 @@
private int days;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -59,7 +59,7 @@
days = Integer.parseInt(daysString);
- super.init(id, portalName, projects, plugins, properties, scoresManager);
+ super.init(id, portalName, projectIds, plugins, properties, scoresManager);
}
@Override
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/CodeLinesPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/codelines/CodeLinesPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -26,6 +26,7 @@
import java.util.HashMap;
import org.jboss.forge.common.projects.Repository;
+import org.jboss.forge.status.common.tools.ProjectTools;
import org.jboss.forge.status.service.plugins.Plugin;
import org.jboss.logging.Logger;
@@ -64,7 +65,7 @@
long cl = 0;
- Repository repo = projects.getProjectRepository(projectId);
+ Repository repo = ProjectTools.getProjectRepository(projectId);
if (repo != null) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/jira/JiraStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/jira/JiraStatusPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/jira/JiraStatusPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -27,6 +27,7 @@
import org.jboss.forge.common.projects.IssueTracker;
import org.jboss.forge.status.common.Tags;
+import org.jboss.forge.status.common.tools.ProjectTools;
import org.jboss.forge.status.service.plugins.KosmosStatusPlugin;
import org.jboss.logging.Logger;
@@ -93,8 +94,9 @@
private String getJiraURL(String projectId) {
- IssueTracker it = projects.getProjectIssueTracker(projectId);
+ IssueTracker it = ProjectTools.getProjectIssueTracker(projectId);
+
if ((it == null)
|| (it.getType() != IssueTracker.JIRA_ISSUE_TRACKER)) {
return null;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/ConstPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/ConstPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/ConstPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,9 +22,9 @@
package org.jboss.forge.status.service.plugins.math;
+import java.util.List;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.tools.Plugins;
@@ -39,7 +39,7 @@
private long value;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -52,7 +52,7 @@
value = Long.parseLong(valueString);
- super.init(id, portalName, projects, plugins,
+ super.init(id, portalName, projectIds, plugins,
properties, scoresManager);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/LastNDaysStatusPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -23,9 +23,9 @@
package org.jboss.forge.status.service.plugins.math;
import java.util.Calendar;
+import java.util.List;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.common.exceptions.GetScoresException;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
@@ -44,7 +44,7 @@
private int days;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -73,7 +73,7 @@
}
days = Integer.parseInt(daysString);
- super.init(id, portalName, projects, plugins, properties, scoresManager);
+ super.init(id, portalName, projectIds, plugins, properties, scoresManager);
}
@Override
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/MathPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/MathPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/MathPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,9 +22,9 @@
package org.jboss.forge.status.service.plugins.math;
+import java.util.List;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.tools.Plugins;
@@ -40,7 +40,7 @@
protected Plugin plugin2;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -68,7 +68,7 @@
" does not exist.");
}
- super.init(id, portalName, projects, plugins,
+ super.init(id, portalName, projectIds, plugins,
properties, scoresManager);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/RandomPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/RandomPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/RandomPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,10 +22,10 @@
package org.jboss.forge.status.service.plugins.math;
+import java.util.List;
import java.util.Properties;
import java.util.Random;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.tools.Plugins;
@@ -43,7 +43,7 @@
private static final int RANDOM_DEFAULT_MAX_VALUE = 1024;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -55,7 +55,7 @@
random = new Random();
- super.init(id, portalName, projects, plugins, properties, scoresManager);
+ super.init(id, portalName, projectIds, plugins, properties, scoresManager);
}
@Override
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/WeightedScorePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/WeightedScorePlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/math/WeightedScorePlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -24,10 +24,10 @@
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.common.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.common.protocol.ScoresManager;
import org.jboss.forge.status.common.tools.Plugins;
@@ -50,11 +50,11 @@
}
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties props, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
- super.init(id, portalName, projects, plugins, props, scoresManager);
+ super.init(id, portalName, projectIds, plugins, props, scoresManager);
properties = new Hashtable<String,Float>(props.size());
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/JEMSIntegrationPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/JEMSIntegrationPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/JEMSIntegrationPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,11 +22,7 @@
package org.jboss.forge.status.service.plugins.productization;
-import java.util.Iterator;
-
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.status.service.plugins.Plugin;
-import org.jboss.portal.common.context.DelegateContext;
/**
* @author Pawel Wrzeszcz
@@ -39,8 +35,9 @@
//TODO temp workaround before we can use
// List<String> org.jboss.forge.common.projects.test.Project.getJems()
+ /*
DelegateContext projectContext =
- projects.getProjectContext(
+ projectIds.getProjectContext(
new NullPermissionsChecker(), projectId);
Iterator it = projectContext.childIterator("jems");
@@ -59,6 +56,8 @@
}
return counter;
+ */
+ return 4;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -22,9 +22,7 @@
package org.jboss.forge.status.service.plugins.productization;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.status.service.plugins.Plugin;
-import org.jboss.portal.common.context.DelegateContext;
/**
@@ -35,13 +33,15 @@
@Override
public long getPluginValue(String projectId) {
-
+ /*
DelegateContext ds =
- projects.getDownloadsContext(new NullPermissionsChecker(),
+ projectIds.getDownloadsContext(new NullPermissionsChecker(),
projectId, "");
- return (ds == null ? 0 : 1);
+ return (ds == null ? 0 : 1);*/
+ return 1;
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/docs/DocumentationTypePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/docs/DocumentationTypePlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/docs/DocumentationTypePlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.test.Documentation;
import org.jboss.forge.common.projects.test.DocumentationType;
@@ -45,7 +44,7 @@
private DocumentationType docType;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -66,7 +65,7 @@
"No such decumentation type: " + docTypeString + ".");
}
- super.init(id, portalName, projects, plugins, properties, scoresManager);
+ super.init(id, portalName, projectIds, plugins, properties, scoresManager);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/forums/ForumTypePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/forums/ForumTypePlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/forums/ForumTypePlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.test.Forum;
import org.jboss.forge.common.projects.test.ForumType;
import org.jboss.forge.status.common.Tags;
@@ -44,7 +43,7 @@
private ForumType forumType;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -65,7 +64,7 @@
"No such forum type: " + forumTypeString + ".");
}
- super.init(id, portalName, projects, plugins, properties, scoresManager);
+ super.init(id, portalName, projectIds, plugins, properties, scoresManager);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/support/SupportTypePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/support/SupportTypePlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/support/SupportTypePlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.Properties;
-import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.test.SupportService;
import org.jboss.forge.common.projects.test.SupportType;
@@ -45,7 +44,7 @@
private SupportType supportType;
@Override
- public void init(String id, String portalName, Projects projects,
+ public void init(String id, String portalName, List<String> projectIds,
Plugins plugins, Properties properties, ScoresManager scoresManager)
throws InvalidPluginPropertiesException {
@@ -66,7 +65,7 @@
"No such support type: " + supportTypeString + ".");
}
- super.init(id, portalName, projects, plugins, properties, scoresManager);
+ super.init(id, portalName, projectIds, plugins, properties, scoresManager);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/svn/SvnStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/svn/SvnStatusPlugin.java 2006-10-23 19:32:20 UTC (rev 7035)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/svn/SvnStatusPlugin.java 2006-10-23 19:46:36 UTC (rev 7036)
@@ -27,6 +27,7 @@
import org.jboss.forge.common.projects.Repository;
import org.jboss.forge.status.common.Tags;
+import org.jboss.forge.status.common.tools.ProjectTools;
import org.jboss.forge.status.service.plugins.KosmosStatusPlugin;
import org.jboss.logging.Logger;
@@ -99,7 +100,7 @@
*/
private String getRepoURL(String projectId) {
- Repository repository = projects.getProjectRepository(projectId);
+ Repository repository = ProjectTools.getProjectRepository(projectId);
if (repository == null) {
return null;
}
More information about the jboss-svn-commits
mailing list