[jboss-svn-commits] JBL Code SVN: r9727 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/java/org/jboss/forge/projects/info and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2007-02-23 17:40:05 -0500 (Fri, 23 Feb 2007)
New Revision: 9727

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java
Log:
JBLAB-840
refactoring
-Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2007-02-23 22:29:38 UTC (rev 9726)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2007-02-23 22:40:05 UTC (rev 9727)
@@ -264,26 +264,6 @@
         return getProjects(portalName).getProjectIds();
     }
 
-    public static ProjectsService getProjectsService() {
-
-        ProjectsService service = null;
-
-        try {
-            MBeanServer server = MBeanServerLocator.locate();
-
-            service = (ProjectsService) MBeanProxyExt.create(
-                    ProjectsService.class,
-                    ProjectsService.PROJECTS_SERVICE,
-                    server);
-
-
-        } catch (MalformedObjectNameException e) {
-            log.warn("Unable to get ProjectsService", e);
-        }
-
-        return service;
-    }
-
     /**
      *
      * @param projectId Id of the project to which freezone's the given path

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java	2007-02-23 22:29:38 UTC (rev 9726)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java	2007-02-23 22:40:05 UTC (rev 9727)
@@ -22,10 +22,12 @@
 package org.jboss.forge.projects.info;
 
 import javax.faces.context.FacesContext;
+import javax.management.MalformedObjectNameException;
 
 import org.jboss.forge.common.ForgeHelper;
 import org.jboss.forge.common.projects.ProjectsHelper;
 import org.jboss.forge.common.projects.project.Project;
+import org.jboss.forge.common.ejb3.LabsServices;
 import org.jboss.forge.common.ejb3.ProjectsService;
 import org.jboss.logging.Logger;
 import org.jboss.portlet.JBossRenderRequest;
@@ -69,8 +71,13 @@
 
 	private static Project getProjectById(String projectId) {
 		
-		ProjectsService service = ProjectsHelper.getProjectsService();
-		
+		ProjectsService service;
+		try {
+			service = LabsServices.getProjectsService();
+		} catch (MalformedObjectNameException e) {
+			log.warn("Unable to obtain ProjectsService. " + e.getMessage());
+			return null;
+		}
 		return service.getProjectByName(projectId);
 	}
 	

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java	2007-02-23 22:29:38 UTC (rev 9726)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java	2007-02-23 22:40:05 UTC (rev 9727)
@@ -32,8 +32,6 @@
 import org.jboss.forge.common.ejb3.LabsServices;
 import org.jboss.forge.common.ejb3.ProjectsService;
 import org.jboss.forge.common.ejb3.ProjectsServiceRW;
-import org.jboss.forge.common.projects.ProjectsHelper;
-
 import org.jboss.forge.common.projects.project.Documentation;
 import org.jboss.forge.common.projects.project.DocumentationType;
 import org.jboss.forge.common.projects.project.Project;
@@ -51,6 +49,7 @@
 	static {
 		try {
 			projectsServiceRW = LabsServices.getProjectsServiceRW();
+			projectsService = LabsServices.getProjectsService();
 		} catch (MalformedObjectNameException e) {
 			log.warn("Cannot get ProjectsServiceRW");
 		}
@@ -58,10 +57,6 @@
 	
 	public static Project getProjectByName(String projectId) {
 		
-		if (projectsService == null) {
-			projectsService = ProjectsHelper.getProjectsService();
-		}
-		
 		return projectsService.getProjectByName(projectId);
 	}
 
@@ -72,10 +67,6 @@
 	
 	public static List<SelectItem> getAllProjects() {
 		
-		if (projectsService == null) {
-			projectsService = ProjectsHelper.getProjectsService();
-		}
-		
 		List<SelectItem> projects = new ArrayList<SelectItem>();
 		for (String projectId : projectsService.getProjectsIds()) {
 			projects.add(new SelectItem(projectId,projectId));