[jboss-svn-commits] JBL Code SVN: r34906 - in labs/jbossforums/branches/forums130P27: authz-jaae-plugin/src/main/org/jboss/forums/security and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 26 12:04:23 EDT 2010
Author: sviluppatorefico
Date: 2010-08-26 12:04:22 -0400 (Thu, 26 Aug 2010)
New Revision: 34906
Modified:
labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml
labs/jbossforums/branches/forums130P27/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/security-config.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/security-config.xml
Log:
managed the transaction in the util classes.
In cluster mode identuty modules was not installed. Resolved
Modified: labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml 2010-08-26 15:48:47 UTC (rev 34905)
+++ labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml 2010-08-26 16:04:22 UTC (rev 34906)
@@ -71,7 +71,8 @@
<path refid="sun.jsf.classpath"/>
<path refid="jbportal.classpath"/>
<path refid="jboss-jaae-engine.classpath"/>
- <path refid="jakarta-commons-jexl.classpath"/>
+ <path refid="jakarta-commons-jexl.classpath"/>
+ <path refid="jboss.j2ee.classpath"/>
</path>
<!-- Configure modules -->
Modified: labs/jbossforums/branches/forums130P27/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums130P27/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java 2010-08-26 15:48:47 UTC (rev 34905)
+++ labs/jbossforums/branches/forums130P27/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java 2010-08-26 16:04:22 UTC (rev 34906)
@@ -27,6 +27,8 @@
import java.util.Set;
import javax.naming.InitialContext;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
import org.jboss.portal.identity.MembershipModule;
import org.jboss.portal.identity.RoleModule;
@@ -108,25 +110,36 @@
*/
public static void populateRoles(User user) throws Exception
{
- InitialContext context = new InitialContext();
+ InitialContext initialContext = new InitialContext();
//perform this operation in the context of a JTA Transaction
+ UserTransaction ut = (UserTransaction) initialContext
+ .lookup("/UserTransaction");
if(user!=null && user.getIdentity()!=null)
{
UserModule userModule = JBossPortalUtil.getUserModule();
-
- //grab the roles for this user
- String username = user.getIdentity().getUserName();
- org.jboss.portal.identity.User portalUser = userModule.findUserByUserName(username);
- Set roles = getMembershipModule().getRoles(portalUser);
- if(!Util.isEmpty(roles))
- {
- for(Iterator itr=roles.iterator();itr.hasNext();)
- {
- String roleName = ((org.jboss.portal.identity.Role)itr.next()).getName();
- Role role = new Role(roleName,roleName);
- user.getRoles().add(role);
- }
+ try {
+ ut.begin();
+ //grab the roles for this user
+ String username = user.getIdentity().getUserName();
+ org.jboss.portal.identity.User portalUser = userModule.findUserByUserName(username);
+ Set roles = getMembershipModule().getRoles(portalUser);
+ if(!Util.isEmpty(roles))
+ {
+ for(Iterator itr=roles.iterator();itr.hasNext();)
+ {
+ String roleName = ((org.jboss.portal.identity.Role)itr.next()).getName();
+ Role role = new Role(roleName,roleName);
+ user.getRoles().add(role);
+ }
+ }
+ ut.commit();
+ } catch (Exception e) {
+ try {
+ ut.rollback();
+ } catch (SystemException se) {
+ se.printStackTrace();
+ }
}
}
}
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2010-08-26 15:48:47 UTC (rev 34905)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2010-08-26 16:04:22 UTC (rev 34906)
@@ -27,8 +27,6 @@
import java.util.Collection;
import java.util.List;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -48,7 +46,6 @@
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import org.hibernate.search.annotations.Store;
-import org.jboss.portlet.forums.ForumsModule;
import org.jboss.portlet.forums.model.Forum;
/**
@@ -131,17 +128,7 @@
@ManyToMany
@JoinTable(name = "JBP_FORUMS_FORUMSWATCH", joinColumns = @JoinColumn(name = "JBP_FORUM_ID"), inverseJoinColumns = @JoinColumn(name = "JBP_ID"))
private List<WatchImpl> watches;
- private static ForumsModule fm;
- private static void initializeForumsModule() {
- try {
- fm = (ForumsModule) new InitialContext()
- .lookup("java:portal/ForumsModule");
- } catch (NamingException e) {
- e.printStackTrace();
- }
- }
-
/**
*/
public CategoryImpl getCategory() {
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-08-26 15:48:47 UTC (rev 34905)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2010-08-26 16:04:22 UTC (rev 34906)
@@ -37,6 +37,7 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
+import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.portlet.PortletPreferences;
@@ -45,6 +46,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
import org.apache.log4j.Logger;
import org.jboss.portal.core.modules.ModuleConstants;
@@ -691,9 +694,23 @@
.getExternalContext().getRemoteUser();
if (userName != null && userName.trim().length() > 0)
{
- UserModule userModule = (UserModule) new InitialContext()
+ Context initialContext = new InitialContext();
+ UserTransaction ut = (UserTransaction) initialContext
+ .lookup("/UserTransaction");
+ try {
+ ut.begin();
+ UserModule userModule = (UserModule) initialContext
.lookup(ModuleConstants.USERMODULE_JNDINAME);
- user = userModule.findUserByUserName(userName);
+ user = userModule.findUserByUserName(userName);
+ ut.commit();
+ } catch (Exception e) {
+ log.error("Cannot load the user", e);
+ try {
+ ut.rollback();
+ } catch (SystemException se) {
+ se.printStackTrace();
+ }
+ }
}
return user;
}
@@ -794,14 +811,28 @@
String guestUserName = BaseController.getForumsModule().getGuestUserName();
+ UserTransaction ut = null;
try
- {
+ {
+ Context initialContext = new InitialContext();
+ ut = (UserTransaction) initialContext
+ .lookup("/UserTransaction");
+ ut.begin();
userModule = (UserModule)new InitialContext().lookup(ModuleConstants.USERMODULE_JNDINAME);
user = userModule.findUserByUserName(guestUserName);
+ ut.commit();
}
catch (NoSuchUserException e)
{
user = userModule.createUser(guestUserName, "Guest user account!");
+ ut.commit();
+ } catch (Exception e) {
+ log.error("Cannot load setup script", e);
+ try {
+ ut.rollback();
+ } catch (SystemException se) {
+ se.printStackTrace();
+ }
}
Long userId = (Long) user.getId();
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/security-config.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/security-config.xml 2010-08-26 15:48:47 UTC (rev 34905)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/security-config.xml 2010-08-26 16:04:22 UTC (rev 34906)
@@ -27,6 +27,8 @@
<module-option name="unauthenticatedIdentity">guest</module-option>
<module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
<module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+ <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
<module-option name="additionalRole">Authenticated</module-option>
<module-option name="password-stacking">useFirstPass</module-option>
</login-module>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/security-config.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/security-config.xml 2010-08-26 15:48:47 UTC (rev 34905)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/security-config.xml 2010-08-26 16:04:22 UTC (rev 34906)
@@ -27,6 +27,8 @@
<module-option name="unauthenticatedIdentity">guest</module-option>
<module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
<module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+ <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
<module-option name="additionalRole">Authenticated</module-option>
<module-option name="password-stacking">useFirstPass</module-option>
</login-module>
More information about the jboss-svn-commits
mailing list