[Jboss-svn-commits] JBL Code SVN: r1725 - in trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins plugins/svn

[<jbo...@li...>]

Author: wrzep
Date: 2005-12-07 13:32:30 -0500 (Wed, 07 Dec 2005)
New Revision: 1725

Modified:
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
Log:
missing/incorrect plugin properties handling one more time

http://jira.jboss.com/jira/browse/JBLAB-415

Pawel


Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-12-07 18:08:17 UTC (rev 1724)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-12-07 18:32:30 UTC (rev 1725)
@@ -43,8 +43,9 @@
 import org.w3c.dom.NodeList;
 
 //import org.jboss.forge.status.plugins.InvalidPluginPropertiesException;
+import org.jboss.forge.status.plugins.InvalidPluginPropertiesException;
 import org.jboss.forge.status.plugins.StatusPlugin;
-//import org.jboss.logging.Logger;
+import org.jboss.logging.Logger;
 
 /**
 * @author Pawel Wrzeszcz
@@ -65,7 +66,7 @@
 	private Projects projects;
 	private List<StatusPlugin> plugins;
 	
-	//private Logger log;
+	private Logger log;
 
 	private HashSet<String> pluginsElements;
 	
@@ -73,7 +74,7 @@
 		this.portalName = portalName;
 		this.scoreAlgorithm = scoreAlgorithm;
 		
-		//log = Logger.getLogger(this.getClass());
+		log = Logger.getLogger(this.getClass());
 		initPluginElements();
 		
 		// Get the projects
@@ -189,7 +190,7 @@
 		try {
 			pluginClass = Class.forName(pluginClassString);
 		} catch (ClassNotFoundException e) {
-			//log.error("Plugin class not found: " + pluginClassString);
+			log.error("Plugin class not found: " + pluginClassString);
 			return null;
 		}
 		
@@ -198,7 +199,7 @@
 		try {
 			plugin = (StatusPlugin) pluginClass.newInstance();
 		} catch (Exception e) {
-			//log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e);
+			log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e);
 			return null;
 		}
 		
@@ -211,12 +212,12 @@
 		
 		
 		// Initialize plugin
-		//try {
+		try {
 			plugin.init(projects, pluginSpecificPropertiesMap);
-		//} catch (InvalidPluginPropertiesException e) {
-			//log.warn(e);
-			//return null;
-		//}
+		} catch (InvalidPluginPropertiesException e) {
+			log.warn(e);
+			return null;
+		}
 		
 		return plugin;
 	}

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java	2005-12-07 18:08:17 UTC (rev 1724)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java	2005-12-07 18:32:30 UTC (rev 1725)
@@ -35,7 +35,7 @@
 	protected Projects projects;
 	protected Map properties;
 	
-	public void init(Projects projects, Map<String,String> properties)/* throws InvalidPluginPropertiesException */{
+	public void init(Projects projects, Map<String,String> properties) throws InvalidPluginPropertiesException {
 		this.projects = projects;
 		this.properties = properties;
 	}

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java	2005-12-07 18:08:17 UTC (rev 1724)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java	2005-12-07 18:32:30 UTC (rev 1725)
@@ -23,6 +23,7 @@
 package org.jboss.forge.status.plugins.svn;
 
 import org.jboss.forge.common.projects.Projects;
+import org.jboss.forge.status.plugins.InvalidPluginPropertiesException;
 import org.jboss.forge.status.plugins.StatusPlugin;
 
 import java.net.MalformedURLException;
@@ -31,12 +32,9 @@
 import java.util.List;
 import java.util.Map;
 
-//import org.jboss.logging.Logger;
-
 import com.caucho.hessian.client.HessianProxyFactory;
 
 import hu.midori.kosmos.protocol.SvnService;
-//import hu.midori.kosmos.model.SvnRepository;
 
 /**
 * @author Pawel Wrzeszcz
@@ -47,36 +45,34 @@
 	private static final String SVN_SERVICE_PROPERTY = "svn-service";
 
 	private Map<String,Map> projectsMaps;
+
 	
-	//private Logger log;
-	
 	private String serviceURL;
 	
 	public SvnStatusPlugin() {
 		super();
 		
 		projectsMaps = new HashMap<String,Map>();
-		//log = Logger.getLogger(this.getClass());
 	}
 	
-	public void init(Projects projects, Map<String,String> properties) /*throws InvalidPluginPropertiesException*/ {
+	public void init(Projects projects, Map<String,String> properties) throws InvalidPluginPropertiesException {
 		super.init(projects,properties);
 		
 		getProperties(properties);
 		
 	}
 	
-	private void getProperties(Map<String, String> properties) /*throws InvalidPluginPropertiesException*/ {
-		/*if (properties == null) {
+	private void getProperties(Map<String, String> properties) throws InvalidPluginPropertiesException {
+		if (properties == null) {
 			throw new InvalidPluginPropertiesException("Missing properties for " + getName() + " plugin.");
 		}
-	*/
+	
 		serviceURL = properties.get(SVN_SERVICE_PROPERTY);
-		/*
+		
 		if (serviceURL == null) {
 			throw new InvalidPluginPropertiesException(
 					"Missing " + SVN_SERVICE_PROPERTY + " property for " + getName() + " plugin.");
-		}*/
+		}
 	}
 
 	protected abstract int getPluginSpecyficValue(Map projectMap);