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

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

Author: wrzep
Date: 2005-11-24 08:19:58 -0500 (Thu, 24 Nov 2005)
New Revision: 1641

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/StatusDescriptor.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java
Log:
plugins instantination errors handling

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-11-24 12:56:03 UTC (rev 1640)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-11-24 13:19:58 UTC (rev 1641)
@@ -162,22 +162,32 @@
 			
 			Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements);
 			
+			// Get plugin name
+			String pluginClassString = XmlTools.unmarshallText(pluginProperties.get("class"));
+			System.out.println("pluginClassString " + pluginClassString);
+			
+			// Get plugin class
+			
+			Class pluginClass = null;
 			try {
-				// Get plugin name
-				String pluginClassString = XmlTools.unmarshallText(pluginProperties.get("class"));
-				System.out.println("pluginClassString " + pluginClassString);
-				Class pluginClass = Class.forName(pluginClassString);
-				
-				// Get plugin instance and initialize it
-				StatusPlugin plugin = (StatusPlugin) pluginClass.newInstance();
-				plugin.init(projects);
-				
-				// Add plugin to plugins set
-				plugins.add(plugin);
+				pluginClass = Class.forName(pluginClassString);
+			} catch (ClassNotFoundException e) {
+				log.error("Plugin class not found: " + pluginClassString);
+				continue;
+			}
+			
+			// Get plugin instance
+			StatusPlugin plugin = null;
+			try {
+				plugin = (StatusPlugin) pluginClass.newInstance();
 			} catch (Exception e) {
-				e.printStackTrace();
+				log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e);
+				continue;
 			}
-			
+
+			// Initialize plugin and add it to the plugins set
+			plugin.init(projects);
+			plugins.add(plugin);	
 		}
 		
 		return plugins;

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2005-11-24 12:56:03 UTC (rev 1640)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2005-11-24 13:19:58 UTC (rev 1641)
@@ -56,7 +56,7 @@
 	
 	public StatusDescriptor(String portalName, ContentManager cm) {
 		try {		
-			String pluginsPath = StatusTools.getXmlCmPath(portalName,"plugins.xml");
+			String pluginsPath = StatusTools.getXmlCmPath(portalName,"status.xml");
 			Node pluginsRoot = getRoot(cm, pluginsPath);
 			
 			/*

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java	2005-11-24 12:56:03 UTC (rev 1640)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java	2005-11-24 13:19:58 UTC (rev 1641)
@@ -87,7 +87,7 @@
 		List repositories = service.getRepositories(repoURL);
 				
 		repositoryMap = (Map) repositories.get(0); 
-		printRepo(repositoryMap);
+		//printRepo(repositoryMap);
 	
 		return repositoryMap;
 	}