[jboss-svn-commits] JBL Code SVN: r6195 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: common plugins plugins/cc plugins/codelines plugins/jira plugins/math plugins/svn

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Sep 13 06:50:46 EDT 2006


Author: wrzep
Date: 2006-09-13 06:50:32 -0400 (Wed, 13 Sep 2006)
New Revision: 6195

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/DownloadsPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JEMSIntegrationPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/KosmosStatusPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/PackagedForDownloadPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcBuildsPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/AddPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/ConstPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/DivPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/MulPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/RandomPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/WeightedScorePlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
Log:
JBLAB-599
Errors inside plugins don't disrupt computing values for other
plugins.

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -20,6 +20,8 @@
 
 	public static final String COLUMN_DETAILS_ACTION = "viewColumnDetails";
 
+	public static final long DEFAULT_PLUGIN_VALUE		 = 0;
+
 	
 	/**
 	 * This class cannot be instatiated.

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/DownloadsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/DownloadsPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/DownloadsPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -41,7 +41,7 @@
 		super();
 	}
 		
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		return DownloadCounterTools.
 				getOverallDownloadsForProject(projectId,portalName,cm);
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JEMSIntegrationPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JEMSIntegrationPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/JEMSIntegrationPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -34,7 +34,7 @@
 public class JEMSIntegrationPlugin extends Plugin {
 
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 
 		//TODO temp workaround before we can use
 		//      List<String> org.jboss.forge.common.projects.test.Project.getJems()

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/KosmosStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/KosmosStatusPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/KosmosStatusPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -123,7 +123,7 @@
 	 * @see org.jboss.forge.status.Plugin#getValue(java.lang.String)
 	 */
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		if (!projectServices.containsKey(projectId)) {
 			projectServices.put(projectId, getProjectServices(projectId));

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/PackagedForDownloadPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/PackagedForDownloadPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/PackagedForDownloadPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -33,7 +33,7 @@
 public class PackagedForDownloadPlugin extends Plugin {
 
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		DelegateContext ds =
 			projects.getDownloadsContext(new NullPermissionsChecker(),

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -27,9 +27,11 @@
 
 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.exceptions.InvalidPluginPropertiesException;
 import org.jboss.forge.status.service.ScoresManager;
 import org.jboss.forge.status.tools.Plugins;
+import org.jboss.logging.Logger;
 
 /**
 * @author Pawel Wrzeszcz
@@ -55,6 +57,8 @@
 	
 	protected ScoresManager scoresManager;
 	
+	private Logger log = Logger.getLogger(Plugin.class);
+	
 	/**
 	 * @param id Plugin id
 	 * @param portalName Portal name
@@ -81,25 +85,92 @@
 	
 	/**
 	 * For the given project returns value specyfic to this plugin.
+	 * If an error occured while computing a value, returns
+	 * <code>Constants.DEFAULT_PLUGIN_VALUE</code> 
 	 * 
 	 * @param projectId project id
 	 * @return value computed by plugin for the project
 	 * with the given <code>projectId</code>.
 	 */
-	public abstract long getValue(String projectId);
+	public final long getValue(String projectId) {
+		
+		long v = Constants.DEFAULT_PLUGIN_VALUE;
+		
+		try {
+		
+			v = getPluginValue(projectId);
+			
+		} catch (Exception e) {
+			
+			log.warn("Exception in plugin (getPluginValue)" + id + 
+												"\nCause: " + e.getMessage());	
+		}
+		
+		return v;
+	}
 	
+	/**
+	 * For the given project returns value specyfic to this plugin.
+	 * 
+	 * @param projectId project id
+	 * @return value computed by plugin for the project
+	 * with the given <code>projectId</code>.
+	 */
+	protected abstract long getPluginValue(String projectId);
+	
+	
+	/** For the given project returns link associated with this plugin
+	 * and project or null if such link does not exsist.
+	 */
+	public final String getLink(String projectId) {
+		
+		String s = null;
+		
+		try {
+		
+			s = getPluginLink(projectId);
+			
+		} catch (Exception e) {
+			
+			log.warn("Exception in plugin (getPluginLink)" + id + 
+												"\nCause: " + e.getMessage());	
+		}
+		
+		return s;
+	}
+	
 	/** For the given project returns link associated with this plugin and project.
 	 * Should be overrided inside plugins that have some links associated with projects.
 	 */
-	public String getLink(String projectId) {
+	protected String getPluginLink(String projectId) {
 		return null;
 	}
 	
 	/** For the given project returns name of link associated with this plugin
 	 * or null if projects have not any link associated with this plugin.
+	 */
+	public final String getLinkName() {
+		
+		String s = null;
+		
+		try {
+		
+			s = getPluginLinkName();
+			
+		} catch (Exception e) {
+			
+			log.warn("Exception in plugin (getPluginLinkName)" + id + 
+												"\nCause: " + e.getMessage());	
+		}
+		
+		return s;
+	}
+	
+	/** For the given project returns name of link associated with this plugin
+	 * or null if projects have not any link associated with this plugin.
 	 * This method should be overrided inside plugins that have some links associated with projects.
 	 */
-	public String getLinkName() {
+	protected String getPluginLinkName() {
 		return null;
 	}
 	
@@ -112,7 +183,7 @@
 	 * @return rate computed by plugin for the project
 	 * with the given <code>projectId</code>.
 	 */
-	public int getRate(String projectId) {
+	public final int getRate(String projectId) {
 				
 		long totalScore = getTotalScore();
 			
@@ -128,7 +199,7 @@
 	/**
 	 * @return plugin id
 	 */
-	public String getId() { return id; };
+	public final String getId() { return id; };
 
 	private long getTotalScore() {
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcBuildsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcBuildsPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcBuildsPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -51,7 +51,7 @@
 	protected Map<String,Long> cachedValues = new HashMap<String,Long>();
 	
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		if (cachedValues.containsKey(projectId)) {
 			

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -110,7 +110,7 @@
 	}
 	
 	@Override
-	public String getLink(String projectId) {
+	public String getPluginLink(String projectId) {
 		
 		List<String> ccURLsString = getCcURLs(projects, projectId);
 		
@@ -118,7 +118,7 @@
 	}
 
 	@Override
-	public String getLinkName() {
+	public String getPluginLinkName() {
 		return CC_LINK_NAME;
 	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -58,7 +58,7 @@
 	}
 	
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		if (!cachedValues.containsKey(projectId)) {
 			

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -102,12 +102,12 @@
 	}
 	
 	@Override
-	public String getLink(String projectId) {
+	public String getPluginLink(String projectId) {
 		return getJiraURL(projectId);
 	}
 	
 	@Override
-	public String getLinkName() {
+	public String getPluginLinkName() {
 		return JIRA_LINK_NAME;
 	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/AddPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/AddPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/AddPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -29,7 +29,7 @@
 public class AddPlugin extends MathPlugin {
 
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		long v1 = plugin1.getValue(projectId);
 		long v2 = plugin2.getValue(projectId);		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/ConstPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/ConstPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/ConstPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -57,7 +57,7 @@
 	}	
 	
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		return value;
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/DivPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/DivPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/DivPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -29,7 +29,7 @@
 public class DivPlugin extends MathPlugin {
 
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		long v2 = plugin2.getValue(projectId);
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -77,7 +77,7 @@
 	}
 
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		long currentValue = insidePlugin.getValue(projectId);
 		long prevValue = 0;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/MulPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/MulPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/MulPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -29,7 +29,7 @@
 public class MulPlugin extends MathPlugin {
 
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		long v1 = plugin1.getValue(projectId);
 		long v2 = plugin2.getValue(projectId);

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/RandomPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/RandomPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/RandomPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -59,7 +59,7 @@
 	}
 
 	@Override
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		return random.nextInt(maxValue);
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/WeightedScorePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/WeightedScorePlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/WeightedScorePlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -73,7 +73,7 @@
 		}
 	}
 
-	public long getValue(String projectId) {
+	public long getPluginValue(String projectId) {
 		
 		int total = 0;
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java	2006-09-13 10:10:48 UTC (rev 6194)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java	2006-09-13 10:50:32 UTC (rev 6195)
@@ -110,12 +110,12 @@
 	}
 	
 	@Override
-	public String getLink(String projectId) {
+	public String getPluginLink(String projectId) {
 		return getRepoURL(projectId);
 	}
 	
 	@Override
-	public String getLinkName() {
+	public String getPluginLinkName() {
 		return SVN_LINK_NAME;
 	}
 	




More information about the jboss-svn-commits mailing list