[jboss-svn-commits] JBL Code SVN: r36549 - labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui.

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

Author: sviluppatorefico
Date: 2011-01-18 20:00:10 -0500 (Tue, 18 Jan 2011)
New Revision: 36549

Modified:
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
Log:
bug fixing. Added the wrapper for authentication

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2011-01-18 23:31:24 UTC (rev 36548)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2011-01-19 01:00:10 UTC (rev 36549)
@@ -57,7 +57,9 @@
 import org.jboss.portal.identity.UserModule;
 import org.jboss.portal.identity.UserProfileModule;
 import org.jboss.portlet.forums.ForumsConstants;
+import org.jboss.portlet.forums.auth.jbportal.UserModulePortal;
 import org.jboss.portlet.forums.auth.jbportal.UserProfileModulePortal;
+import org.jboss.portlet.forums.auth.picketlink.UserModulePL;
 import org.jboss.portlet.forums.auth.picketlink.UserProfileModulePL;
 import org.jboss.portlet.forums.feeds.FeedConstants;
 import org.jboss.portlet.forums.format.render.bbcodehtml.ToHTMLConfig;
@@ -701,13 +703,11 @@
 			.lookup("/UserTransaction");
         	try {
 			   ut.begin();
-               UserModule userModule = (UserModule) initialContext
-                    .lookup(ModuleConstants.USERMODULE_JNDINAME);
+               UserModule userModule = getUserModule();
                user = userModule.findUserByUserName(userName);
                ut.commit();
 		    } catch (NotSupportedException e) {
-	           UserModule userModule = (UserModule) new InitialContext()
-                   .lookup(ModuleConstants.USERMODULE_JNDINAME);
+		       UserModule userModule = getUserModule();
                user = userModule.findUserByUserName(userName);
 		    } catch (Exception e) {
 			   log.error("Cannot load the user", e);
@@ -1100,5 +1100,15 @@
 		}
 		return userProfileModule;
 	}
+	
+	public static UserModule getUserModule() throws Exception {
+		UserModule userModule = null;
+		try {
+			userModule = UserModulePortal.getInstance();
+		} catch (NameNotFoundException nnfe) {
+			userModule = UserModulePL.getInstance();
+		}
+		return userModule;
+	}
     
 }