[jboss-svn-commits] JBL Code SVN: r35483 - in labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums: ui and 1 other directory.

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

Author: sviluppatorefico
Date: 2010-10-11 14:56:56 -0400 (Mon, 11 Oct 2010)
New Revision: 35483

Modified:
   labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
   labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
Log:
picketlink integration

Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2010-10-11 16:14:16 UTC (rev 35482)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2010-10-11 18:56:56 UTC (rev 35483)
@@ -35,8 +35,6 @@
 
 import javax.annotation.PostConstruct;
 import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.persistence.EntityManager;
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.PersistenceContext;
@@ -61,6 +59,7 @@
 import org.jboss.portlet.forums.model.Topic;
 import org.jboss.portlet.forums.model.TopicWatch;
 import org.jboss.portlet.forums.model.Watch;
+import org.jboss.portlet.forums.ui.PortalUtil;
 import org.jboss.portlet.forums.util.NotificationEngine;
 
 /**
@@ -93,9 +92,8 @@
 	@PostConstruct
 	public void startService() {
 		try {
-			userProfileModule = (UserProfileModule) new InitialContext()
-					.lookup("java:portal/UserProfileModule");
-		} catch (NamingException e) {
+			userProfileModule = PortalUtil.getUserProfileModule();
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		notificationEngine = new NotificationEngine(this);

Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2010-10-11 16:14:16 UTC (rev 35482)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2010-10-11 18:56:56 UTC (rev 35483)
@@ -39,7 +39,7 @@
 import javax.faces.context.FacesContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import javax.naming.NameNotFoundException;
 import javax.portlet.PortletPreferences;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletURL;
@@ -51,6 +51,8 @@
 import javax.transaction.UserTransaction;
 
 import org.apache.log4j.Logger;
+import org.jboss.forums.security.jbportal.UserProfileModulePortal;
+import org.jboss.forums.security.picketlink.UserProfileModulePL;
 import org.jboss.portal.core.modules.ModuleConstants;
 import org.jboss.portal.identity.NoSuchUserException;
 import org.jboss.portal.identity.User;
@@ -314,9 +316,8 @@
         UserProfileModule temporary = null;
         try
         {
-            temporary = (UserProfileModule) new InitialContext()
-                    .lookup("java:portal/UserProfileModule");
-        } catch (NamingException e)
+            temporary = getUserProfileModule();
+        } catch (Exception e)
         {
             JSFUtil.handleException(e);
         } finally
@@ -1089,5 +1090,15 @@
 		}
 		return (String) VIEW_ID_TO_NAME.get(id);
 	}
+	
+	public static UserProfileModule getUserProfileModule() throws Exception {
+		UserProfileModule userProfileModule = null;
+		try {
+			userProfileModule = UserProfileModulePortal.getInstance();
+		} catch (NameNotFoundException nnfe) {
+			userProfileModule = UserProfileModulePL.getInstance();
+		}
+		return userProfileModule;
+	}
     
 }