Author: bdaw Date: 2007-07-05 19:02:42 -0400 (Thu, 05 Jul 2007) New Revision: 7674 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml Log: JBPORTAL-1307 - Added XMMP (Jabber) to user profile Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 22:21:07 UTC (rev 7673) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 23:02:42 UTC (rev 7674) @@ -891,6 +891,7 @@ ctx.put("YIM", (String)getProperty(user,User.INFO_USER_IM_YIM)); ctx.put("MSNM", (String)getProperty(user,User.INFO_USER_IM_MSNM)); ctx.put("SKYPE", (String)getProperty(user,User.INFO_USER_IM_SKYPE)); + ctx.put("XMMP", (String)getProperty(user,User.INFO_USER_IM_XMMP)); ctx.put("SIGNATURE", (String)getProperty(user,User.INFO_USER_SIGNATURE)); ctx.put("LOCATION", (String)getProperty(user,User.INFO_USER_LOCATION)); ctx.put("OCCUPATION", (String)getProperty(user,User.INFO_USER_OCCUPATION)); @@ -988,6 +989,7 @@ String yim = req.getParameter("yim"); String aim = req.getParameter("aim"); String skype = req.getParameter("skype"); + String xmmp = req.getParameter("xmmp"); String location = req.getParameter("location"); String occupation = req.getParameter("occupation"); String interests = req.getParameter("interests"); @@ -1068,6 +1070,7 @@ putNonEmptyProperty(user, User.INFO_USER_IM_YIM, yim); putNonEmptyProperty(user, User.INFO_USER_IM_AIM, aim); putNonEmptyProperty(user, User.INFO_USER_IM_SKYPE, skype); + putNonEmptyProperty(user, User.INFO_USER_IM_XMMP, xmmp); putNonEmptyProperty(user, User.INFO_USER_SIGNATURE, signature); putNonEmptyProperty(user, User.INFO_USER_LOCATION, location); putNonEmptyProperty(user, User.INFO_USER_OCCUPATION, occupation); @@ -1103,6 +1106,7 @@ portletHelper.setRenderParameter(resp, "YIM", yim); portletHelper.setRenderParameter(resp, "MSNM", msnm); portletHelper.setRenderParameter(resp, "SKYPE", skype); + portletHelper.setRenderParameter(resp, "XMMP", xmmp); portletHelper.setRenderParameter(resp, "SIGNATURE", signature); portletHelper.setRenderParameter(resp, "LOCATION", location); portletHelper.setRenderParameter(resp, "OCCUPATION", occupation); Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-07-05 22:21:07 UTC (rev 7673) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-07-05 23:02:42 UTC (rev 7674) @@ -309,6 +309,20 @@ </mapping> </property> <property> + <name>portal.user.im.xmmp</name> + <type>java.lang.String</type> + <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> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.xmmp</value> + </database> + </mapping> + </property> + <property> <name>portal.user.homepage</name> <type>java.lang.String</type> <access-mode>read-write</access-mode> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-07-05 22:21:07 UTC (rev 7673) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-07-05 23:02:42 UTC (rev 7674) @@ -221,6 +221,7 @@ REGISTER_YIM=Yahoo id REGISTER_MSNM=MSN messenger id REGISTER_SKYPE=Skype id +REGISTER_XMMP=XMMP id REGISTER_LOCATION=Location REGISTER_LANGUAGE=Preferred language REGISTER_OCCUPATION=Occupation Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-07-05 22:21:07 UTC (rev 7673) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-07-05 23:02:42 UTC (rev 7674) @@ -119,6 +119,10 @@ <td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"></td> </tr> <tr> + <td class="portlet-form-label">${n:i18n("REGISTER_XMMP")}</td> + <td><input type="text" name="xmmp" value="${n:out("XMMP")}" size="30" maxlength="100"></td> +</tr> +<tr> <td colspan="3" nowrap><h4>${n:i18n("REGISTER_ADDITIONAL")}</h4></td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java 2007-07-05 22:21:07 UTC (rev 7673) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java 2007-07-05 23:02:42 UTC (rev 7674) @@ -51,6 +51,7 @@ public static final String INFO_USER_IM_MSNM = "portal.user.im.msnm"; public static final String INFO_USER_IM_YIM = "portal.user.im.yim"; public static final String INFO_USER_IM_SKYPE = "portal.user.im.skype"; + public static final String INFO_USER_IM_XMMP = "portal.user.im.xmmp"; public static final String INFO_USER_HOMEPAGE = "portal.user.homepage"; public static final String INFO_USER_TIME_ZONE_OFFSET = "portal.user.time-zone-offset"; public static final String INFO_USER_THEME = "portal.user.theme"; Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml 2007-07-05 22:21:07 UTC (rev 7673) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml 2007-07-05 23:02:42 UTC (rev 7674) @@ -309,6 +309,20 @@ </mapping> </property> <property> + <name>portal.user.im.xmmp</name> + <type>java.lang.String</type> + <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> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.xmmp</value> + </database> + </mapping> + </property> + <property> <name>portal.user.homepage</name> <type>java.lang.String</type> <access-mode>read-write</access-mode>