Author: chris.laprun(a)jboss.com Date: 2009-01-12 10:51:24 -0500 (Mon, 12 Jan 2009) New Revision: 12465 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml Log: - Added support for user.login.id JSR-286 property. Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2009-01-10 20:58:49 UTC (rev 12464) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2009-01-12 15:51:24 UTC (rev 12465) @@ -22,18 +22,10 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.server; -import java.security.Principal; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.servlet.http.HttpServletRequest; - import org.jboss.logging.Logger; import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.common.p3p.P3PConstants; import org.jboss.portal.identity.CachedUserImpl; import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.User; @@ -42,6 +34,14 @@ import org.jboss.portal.server.ServerInterceptor; import org.jboss.portal.server.ServerInvocation; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.http.HttpServletRequest; +import java.security.Principal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * The interceptor is responsible for managing the user identity lifecycle based on the principal name returned by the * <code>HttpServletRequest.getUserPrincipal()</code> method. @@ -148,7 +148,10 @@ // Set Last login date getUserProfileModule().setProperty(user, User.INFO_USER_LAST_LOGIN_DATE, "" + new Date().getTime()); - + + // Set login id + getUserProfileModule().setProperty(user, P3PConstants.INFO_USER_LOGIN_ID, userName); + // Get profile profile = getUserProfileModule().getProperties(user); @@ -163,8 +166,8 @@ // Cache invocation.getContext().setAttribute(ServerInvocation.PRINCIPAL_SCOPE, PROFILE_KEY, profile); - - + + } // @@ -188,7 +191,7 @@ } try - { + { // Continue the invocation invocation.invokeNext(); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2009-01-10 20:58:49 UTC (rev 12464) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2009-01-12 15:51:24 UTC (rev 12465) @@ -34,7 +34,7 @@ <access-mode>read-only</access-mode> <usage>mandatory</usage> <display-name xml:lang="en">Name</display-name> - <description xml:lang="en">The user name</description> + <description xml:lang="en">The user's nickname</description> <mapping> <database> <type>column</type> @@ -48,7 +48,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Given Name</display-name> - <description xml:lang="en">The user given name</description> + <description xml:lang="en">The user's given name</description> <mapping> <database> <type>column</type> @@ -62,7 +62,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Family name</display-name> - <description xml:lang="en">The user family name</description> + <description xml:lang="en">The user's family name</description> <mapping> <database> <type>column</type> @@ -76,7 +76,7 @@ <access-mode>read-write</access-mode> <usage>mandatory</usage> <display-name xml:lang="en">Email</display-name> - <description xml:lang="en">The user real email</description> + <description xml:lang="en">The user's real email</description> <mapping> <database> <type>column</type> @@ -93,7 +93,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Fake email</display-name> - <description xml:lang="en">The user fake email</description> + <description xml:lang="en">The user's fake email</description> <mapping> <database> <type>column</type> @@ -107,7 +107,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Registration date</display-name> - <description xml:lang="en">Registration date of user</description> + <description xml:lang="en">The user's registration date</description> <mapping> <database> <type>column</type> @@ -121,7 +121,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">View real email</display-name> - <description xml:lang="en">Is user real email displayed in public</description> + <description xml:lang="en">Should the user's real email be displayed in public?</description> <mapping> <database> <type>column</type> @@ -135,7 +135,7 @@ <access-mode>read-write</access-mode> <usage>mandatory</usage> <display-name xml:lang="en">Enabled</display-name> - <description xml:lang="en">User enabled state</description> + <description xml:lang="en">Is user enabled?</description> <mapping> <database> <type>column</type> @@ -151,7 +151,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Location</display-name> - <description xml:lang="en">The user location</description> + <description xml:lang="en">The user's location</description> <mapping> <database> <type>dynamic</type> @@ -165,7 +165,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Occupation</display-name> - <description xml:lang="en">The user occupation</description> + <description xml:lang="en">The user's occupation</description> <mapping> <database> <type>dynamic</type> @@ -196,7 +196,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Signature</display-name> - <description xml:lang="en">The user signature</description> + <description xml:lang="en">The user's signature</description> <mapping> <database> <type>dynamic</type> @@ -213,7 +213,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Interests</display-name> - <description xml:lang="en">The user interests</description> + <description xml:lang="en">The user's interests</description> <mapping> <database> <type>dynamic</type> @@ -227,7 +227,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Locale</display-name> - <description xml:lang="en">The user locale</description> + <description xml:lang="en">The user's locale</description> <mapping> <database> <type>dynamic</type> @@ -244,7 +244,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">ICQ</display-name> - <description xml:lang="en">The user ICQ id</description> + <description xml:lang="en">The user's ICQ id</description> <mapping> <database> <type>dynamic</type> @@ -258,7 +258,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">AIM</display-name> - <description xml:lang="en">The user AIM id</description> + <description xml:lang="en">The user's AIM id</description> <mapping> <database> <type>dynamic</type> @@ -272,7 +272,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">MSN</display-name> - <description xml:lang="en">The user MSN id</description> + <description xml:lang="en">The user's MSN id</description> <mapping> <database> <type>dynamic</type> @@ -286,7 +286,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">YIM</display-name> - <description xml:lang="en">The user YIM id</description> + <description xml:lang="en">The user's YIM id</description> <mapping> <database> <type>dynamic</type> @@ -300,7 +300,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Skype</display-name> - <description xml:lang="en">The user skype id</description> + <description xml:lang="en">The user's Skype id</description> <mapping> <database> <type>dynamic</type> @@ -314,7 +314,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">XMMP</display-name> - <description xml:lang="en">The user XMMP id</description> + <description xml:lang="en">The user's XMMP id</description> <mapping> <database> <type>dynamic</type> @@ -328,14 +328,14 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Homepage</display-name> - <description xml:lang="en">The user homepage</description> + <description xml:lang="en">The user's homepage</description> <mapping> <database> <type>dynamic</type> <value>portal.user.homepage</value> </database> <!--<ldap>--> - <!--<value>seeAlso</value>--> + <!--<value>seeAlso</value>--> <!--</ldap>--> </mapping> </property> @@ -345,7 +345,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Timezone</display-name> - <description xml:lang="en">Timezone in users location</description> + <description xml:lang="en">The user's timezone</description> <mapping> <database> <type>dynamic</type> @@ -359,7 +359,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Theme</display-name> - <description xml:lang="en">Portlat theme that user is using</description> + <description xml:lang="en">The user's chosen Portal theme</description> <mapping> <database> <type>dynamic</type> @@ -401,7 +401,7 @@ <access-mode>read-write</access-mode> <usage>optional</usage> <display-name xml:lang="en">Last login</display-name> - <description xml:lang="en">The date of users last login</description> + <description xml:lang="en">The user's last login date</description> <mapping> <database> <type>dynamic</type> @@ -409,4 +409,18 @@ </database> </mapping> </property> + <property> + <name>user.login.id</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">User login identifier</display-name> + <description xml:lang="en">The user's login identifier</description> + <mapping> + <database> + <type>dynamic</type> + <value>user.login.id</value> + </database> + </mapping> + </property> </profile> \ No newline at end of file