[jboss-svn-commits] JBL Code SVN: r36505 - in labs/jbossforums/trunk: forums/src/main/org/jboss/portlet/forums/auth/picketlink and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jan 6 18:23:31 EST 2011


Author: sviluppatorefico
Date: 2011-01-06 18:23:30 -0500 (Thu, 06 Jan 2011)
New Revision: 36505

Modified:
   labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/MembershipModulePL.java
   labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserModulePL.java
   labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserProfileModulePL.java
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/MembershipModulePL.java
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserModulePL.java
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserProfileModulePL.java
   labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml
Log:
picketlink integration - added the authenticated role and the new jndi name for picketlink idm

Modified: labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/MembershipModulePL.java
===================================================================
--- labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/MembershipModulePL.java	2011-01-06 22:27:43 UTC (rev 36504)
+++ labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/MembershipModulePL.java	2011-01-06 23:23:30 UTC (rev 36505)
@@ -1,8 +1,9 @@
 package org.jboss.forums.security.picketlink;
 
-import java.io.File;
 import java.util.Set;
 
+import javax.naming.InitialContext;
+
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.MembershipModule;
 import org.jboss.portal.identity.Role;
@@ -10,7 +11,6 @@
 import org.picketlink.idm.api.IdentitySession;
 import org.picketlink.idm.api.IdentitySessionFactory;
 import org.picketlink.idm.api.RelationshipManager;
-import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
 
 public class MembershipModulePL implements MembershipModule {
 
@@ -19,11 +19,10 @@
 	private static MembershipModule currentInstance;
 
 	public MembershipModulePL() throws Exception {
-		IdentitySessionFactory identitySessionFactory = new IdentityConfigurationImpl()
-				.configure(new File("src/test/resources/example-db-config.xml"))
-				.buildIdentitySessionFactory();
+		IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) new InitialContext()
+				.lookup("java:/IdentitySessionFactory");
 		IdentitySession identitySession = identitySessionFactory
-				.createIdentitySession("realm://JBossIdentityExample/SampleRealm");
+				.createIdentitySession("idm_realm");
 		relationshipManager = identitySession.getRelationshipManager();
 	}
 

Modified: labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserModulePL.java
===================================================================
--- labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserModulePL.java	2011-01-06 22:27:43 UTC (rev 36504)
+++ labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserModulePL.java	2011-01-06 23:23:30 UTC (rev 36505)
@@ -1,8 +1,9 @@
 package org.jboss.forums.security.picketlink;
 
-import java.io.File;
 import java.util.Set;
 
+import javax.naming.InitialContext;
+
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.NoSuchUserException;
 import org.jboss.portal.identity.User;
@@ -11,7 +12,6 @@
 import org.picketlink.idm.api.IdentitySession;
 import org.picketlink.idm.api.IdentitySessionFactory;
 import org.picketlink.idm.api.PersistenceManager;
-import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
 
 public class UserModulePL implements UserModule {
 
@@ -20,11 +20,10 @@
 	private static UserModule currentInstance;
 
 	private UserModulePL() throws Exception {
-		IdentitySessionFactory identitySessionFactory = new IdentityConfigurationImpl()
-				.configure(new File("src/test/resources/example-db-config.xml"))
-				.buildIdentitySessionFactory();
+		IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) new InitialContext()
+				.lookup("java:/IdentitySessionFactory");
 		IdentitySession identitySession = identitySessionFactory
-				.createIdentitySession("realm://JBossIdentityExample/SampleRealm");
+				.createIdentitySession("idm_realm");
 		persistenceManager = identitySession.getPersistenceManager();
 	}
 
@@ -127,8 +126,8 @@
 	public void removeUser(Object arg0) throws IdentityException,
 			IllegalArgumentException {
 		try {
-			persistenceManager.removeUser(persistenceManager
-					.findUser((String) arg0), true);
+			persistenceManager.removeUser(
+					persistenceManager.findUser((String) arg0), true);
 		} catch (org.picketlink.idm.common.exception.IdentityException ie) {
 			ie.printStackTrace();
 		}

Modified: labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserProfileModulePL.java
===================================================================
--- labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserProfileModulePL.java	2011-01-06 22:27:43 UTC (rev 36504)
+++ labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/picketlink/UserProfileModulePL.java	2011-01-06 23:23:30 UTC (rev 36505)
@@ -1,8 +1,9 @@
 package org.jboss.forums.security.picketlink;
 
-import java.io.File;
 import java.util.Map;
 
+import javax.naming.InitialContext;
+
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.User;
 import org.jboss.portal.identity.UserProfileModule;
@@ -10,7 +11,6 @@
 import org.picketlink.idm.api.AttributesManager;
 import org.picketlink.idm.api.IdentitySession;
 import org.picketlink.idm.api.IdentitySessionFactory;
-import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
 
 public class UserProfileModulePL implements UserProfileModule {
 
@@ -19,11 +19,10 @@
 	private static UserProfileModule currentInstance;
 
 	public UserProfileModulePL() throws Exception {
-		IdentitySessionFactory identitySessionFactory = new IdentityConfigurationImpl()
-				.configure(new File("src/test/resources/example-db-config.xml"))
-				.buildIdentitySessionFactory();
+		IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) new InitialContext()
+				.lookup("java:/IdentitySessionFactory");
 		IdentitySession identitySession = identitySessionFactory
-				.createIdentitySession("realm://JBossIdentityExample/SampleRealm");
+				.createIdentitySession("idm_realm");
 		userProfileManager = identitySession.getAttributesManager();
 	}
 

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/MembershipModulePL.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/MembershipModulePL.java	2011-01-06 22:27:43 UTC (rev 36504)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/MembershipModulePL.java	2011-01-06 23:23:30 UTC (rev 36505)
@@ -1,8 +1,9 @@
 package org.jboss.portlet.forums.auth.picketlink;
 
-import java.io.File;
 import java.util.Set;
 
+import javax.naming.InitialContext;
+
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.MembershipModule;
 import org.jboss.portal.identity.Role;
@@ -10,7 +11,6 @@
 import org.picketlink.idm.api.IdentitySession;
 import org.picketlink.idm.api.IdentitySessionFactory;
 import org.picketlink.idm.api.RelationshipManager;
-import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
 
 public class MembershipModulePL implements MembershipModule {
 
@@ -19,11 +19,10 @@
 	private static MembershipModule currentInstance;
 
 	public MembershipModulePL() throws Exception {
-		IdentitySessionFactory identitySessionFactory = new IdentityConfigurationImpl()
-				.configure(new File("src/test/resources/example-db-config.xml"))
-				.buildIdentitySessionFactory();
+		IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) new InitialContext()
+				.lookup("java:/IdentitySessionFactory");
 		IdentitySession identitySession = identitySessionFactory
-				.createIdentitySession("realm://JBossIdentityExample/SampleRealm");
+				.createIdentitySession("idm_realm");
 		relationshipManager = identitySession.getRelationshipManager();
 	}
 

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserModulePL.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserModulePL.java	2011-01-06 22:27:43 UTC (rev 36504)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserModulePL.java	2011-01-06 23:23:30 UTC (rev 36505)
@@ -1,8 +1,9 @@
 package org.jboss.portlet.forums.auth.picketlink;
 
-import java.io.File;
 import java.util.Set;
 
+import javax.naming.InitialContext;
+
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.NoSuchUserException;
 import org.jboss.portal.identity.User;
@@ -11,7 +12,6 @@
 import org.picketlink.idm.api.IdentitySession;
 import org.picketlink.idm.api.IdentitySessionFactory;
 import org.picketlink.idm.api.PersistenceManager;
-import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
 
 public class UserModulePL implements UserModule {
 
@@ -20,11 +20,10 @@
 	private static UserModule currentInstance;
 
 	private UserModulePL() throws Exception {
-		IdentitySessionFactory identitySessionFactory = new IdentityConfigurationImpl()
-				.configure(new File("src/test/resources/example-db-config.xml"))
-				.buildIdentitySessionFactory();
+		IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) new InitialContext()
+				.lookup("java:/IdentitySessionFactory");
 		IdentitySession identitySession = identitySessionFactory
-				.createIdentitySession("realm://JBossIdentityExample/SampleRealm");
+				.createIdentitySession("idm_realm");
 		persistenceManager = identitySession.getPersistenceManager();
 	}
 
@@ -127,8 +126,8 @@
 	public void removeUser(Object arg0) throws IdentityException,
 			IllegalArgumentException {
 		try {
-			persistenceManager.removeUser(persistenceManager
-					.findUser((String) arg0), true);
+			persistenceManager.removeUser(
+					persistenceManager.findUser((String) arg0), true);
 		} catch (org.picketlink.idm.common.exception.IdentityException ie) {
 			ie.printStackTrace();
 		}

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserProfileModulePL.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserProfileModulePL.java	2011-01-06 22:27:43 UTC (rev 36504)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/auth/picketlink/UserProfileModulePL.java	2011-01-06 23:23:30 UTC (rev 36505)
@@ -1,8 +1,9 @@
 package org.jboss.portlet.forums.auth.picketlink;
 
-import java.io.File;
 import java.util.Map;
 
+import javax.naming.InitialContext;
+
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.User;
 import org.jboss.portal.identity.UserProfileModule;
@@ -10,7 +11,6 @@
 import org.picketlink.idm.api.AttributesManager;
 import org.picketlink.idm.api.IdentitySession;
 import org.picketlink.idm.api.IdentitySessionFactory;
-import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
 
 public class UserProfileModulePL implements UserProfileModule {
 
@@ -19,11 +19,10 @@
 	private static UserProfileModule currentInstance;
 
 	public UserProfileModulePL() throws Exception {
-		IdentitySessionFactory identitySessionFactory = new IdentityConfigurationImpl()
-				.configure(new File("src/test/resources/example-db-config.xml"))
-				.buildIdentitySessionFactory();
+		IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) new InitialContext()
+				.lookup("java:/IdentitySessionFactory");
 		IdentitySession identitySession = identitySessionFactory
-				.createIdentitySession("realm://JBossIdentityExample/SampleRealm");
+				.createIdentitySession("idm_realm");
 		userProfileManager = identitySession.getAttributesManager();
 	}
 

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml	2011-01-06 22:27:43 UTC (rev 36504)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml	2011-01-06 23:23:30 UTC (rev 36505)
@@ -33,16 +33,13 @@
             <module-option name="password-stacking">useFirstPass</module-option>
          </login-module>
          <login-module code="org.picketlink.idm.auth.JBossIdentityIDMLoginModule" flag="required">
-            <module-option name="identitySessionFactoryJNDIName">java:/IdentitySessionFactory</module-option>
-      		<module-option name="realmName">idm_realm</module-option>
-      		<module-option name="roleGroupTypeName">user</module-option>
-      		<module-option name="userEnabledAttributeName">enabled</module-option>
-      		<module-option name="additionalRole">user</module-option>
-      		<module-option name="associatedGroupType">member</module-option>
-      		<module-option name="associatedGroupName">user</module-option>
-      		<module-option name="validateUserNameCase">true</module-option>
-      		<module-option name="userNameToLowerCase">false</module-option>
-      		<module-option name="transactionAware">false</module-option>
+                <module-option name="identitySessionFactoryJNDIName">java:/IdentitySessionFactory</module-option>
+                <module-option name="realmName">idm_realm</module-option>
+                <module-option name="roleGroupTypeName">Authenticated</module-option>
+                <module-option name="additionalRole">Authenticated</module-option>
+                <module-option name="validateUserNameCase">true</module-option>
+                <module-option name="userNameToLowerCase">false</module-option>
+                <module-option name="transactionAware">false</module-option>
          </login-module>
        </authentication>
     </application-policy>



More information about the jboss-svn-commits mailing list