svn commit: r1687974 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed: aggregator/impl/PortletRendererImpl.java services/rest/UserManagerService.java

Author: taylor
Date: Sat Jun 27 22:39:26 2015
New Revision: 1687974

URL: http://svn.apache.org/r1687974
Log:
aligning both user managers to use same email attribute

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/UserManagerService.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java?rev=1687974&r1=1687973&r2=1687974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java Sat Jun 27 22:39:26 2015
@@ -117,7 +117,7 @@ public class PortletRendererImpl impleme
         this.portletContentCache = portletContentCache;
         if (Jetspeed.getConfiguration() != null) {
             this.autoRefreshEnabled = Jetspeed.getConfiguration().getBoolean(PortalConfigurationConstants.AUTO_REFRESH_ENABLED, true);
-
+        }
     }
 
     public PortletRendererImpl(PortletContainer container, 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/UserManagerService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/UserManagerService.java?rev=1687974&r1=1687973&r2=1687974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/UserManagerService.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/UserManagerService.java Sat Jun 27 22:39:26 2015
@@ -239,7 +239,7 @@ public class UserManagerService extends
             User user = userManager.getUser(userName);
             user.getSecurityAttributes().getAttribute("user.name.given", true).setStringValue(userNameGiven);
             user.getSecurityAttributes().getAttribute("user.name.family", true).setStringValue(userNameFamily);
-            user.getSecurityAttributes().getAttribute("user.email", true).setStringValue(userEmail);
+            user.getSecurityAttributes().getAttribute("user.business-info.online.email", true).setStringValue(userEmail);
             
             if (userEnabled == null)
             {
@@ -408,7 +408,7 @@ public class UserManagerService extends
             
             user.getSecurityAttributes().getAttribute("user.name.given", true).setStringValue(userNameGiven);
             user.getSecurityAttributes().getAttribute("user.name.family", true).setStringValue(userNameFamily);
-            user.getSecurityAttributes().getAttribute("user.email", true).setStringValue(userEmail);
+            user.getSecurityAttributes().getAttribute("user.business-info.online.email", true).setStringValue(userEmail);
             
             userManager.updateUser(user);