From do-not-reply at jboss.org Tue Aug 31 05:25:28 2010
Content-Type: multipart/mixed; boundary="===============8798612556939149768=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r3975 -
 portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization.
Date: Tue, 31 Aug 2010 05:25:26 -0400
Message-ID: <201008310925.o7V9PQeT011337@svn01.web.mwc.hst.phx2.redhat.com>

--===============8798612556939149768==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mstruk
Date: 2010-08-31 05:25:26 -0400 (Tue, 31 Aug 2010)
New Revision: 3975

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicati=
on/localization/DefaultLocalePolicyService.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicati=
on/localization/LocalizationFilter.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicati=
on/localization/LocalizationLifecycle.java
Log:
GTNPORTAL-1302: Previous fix overwritten by GTNPORTAL-1306 work. Now fixed =
again.

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/ap=
plication/localization/DefaultLocalePolicyService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/localization/DefaultLocalePolicyService.java	2010-08-31 07:41:49 UTC (r=
ev 3974)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/localization/DefaultLocalePolicyService.java	2010-08-31 09:25:26 UTC (r=
ev 3975)
@@ -32,9 +32,13 @@
  * This service represents a default policy for determining LocaleConfig t=
o be used for user's session.
  * This service is registered through portal services configuration file: =
conf/portal/configuration.xml
  * Custom locale determination policy can be implemented by overriding or =
completely replacing this class,
- * and registering an alternative implementation.
+ * and registering an alternative implementation. Special care needs to be=
 taken to assure Locale consistency
+ * between portal requests and non-portal requests - like login redirect u=
pon failed authentication attempt.
+ * To keep consistency at least one of {@link LocaleContextInfo#cookieLoca=
les} and {@link LocaleContextInfo#sessionLocale}
+ * needs to be enabled.
  *
  * @see NoBrowserLocalePolicyService
+ * @see LocalizationFilter
  *
  * @author <a href=3D"mailto:mstrukel(a)redhat.com">Marko Strukelj</a>
  */

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/ap=
plication/localization/LocalizationFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/localization/LocalizationFilter.java	2010-08-31 07:41:49 UTC (rev 3974)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/localization/LocalizationFilter.java	2010-08-31 09:25:26 UTC (rev 3975)
@@ -197,7 +197,7 @@
       }
 =

       String lang =3D userProfile =3D=3D null ? null : userProfile.getUser=
InfoMap().get(Constants.USER_LANGUAGE);
-      return (lang !=3D null) ? new Locale(lang) : null;
+      return (lang !=3D null) ? LocaleContextInfo.getLocale(lang) : null;
    }
 =

    public void beginContext(OrganizationService orgService) throws Excepti=
on

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/ap=
plication/localization/LocalizationLifecycle.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/localization/LocalizationLifecycle.java	2010-08-31 07:41:49 UTC (rev 39=
74)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/localization/LocalizationLifecycle.java	2010-08-31 09:25:26 UTC (rev 39=
75)
@@ -240,7 +240,7 @@
 =

       UserProfile userProfile =3D getLoadedProfile(context);
       lang =3D userProfile =3D=3D null ? null : userProfile.getUserInfoMap=
().get(Constants.USER_LANGUAGE);
-      return (lang !=3D null) ? new Locale(lang) : null;
+      return (lang !=3D null) ? LocaleContextInfo.getLocale(lang) : null;
    }
 =

    private UserProfile loadUserProfile(ExoContainer container, PortalReque=
stContext context)
@@ -306,7 +306,7 @@
       HttpSession session =3D request.getSession(false);
       if (session !=3D null)
          lang =3D (String) session.getAttribute(attrName);
-      return (lang !=3D null) ? new Locale(lang) : null;
+      return (lang !=3D null) ? LocaleContextInfo.getLocale(lang) : null;
    }
 =

    private void saveLocale(PortalRequestContext context, Locale loc)
@@ -336,7 +336,7 @@
          if (log.isWarnEnabled())
             log.warn("Locale changed to unsupported Locale during request =
processing: " + loc);
          return;
-      }      =

+      }
       // we presume PortalRequestContext, and UIPortalApplication
       ((UIPortalApplication) context.getUIApplication()).setOrientation(lo=
caleConfig.getOrientation());
    }
@@ -379,7 +379,7 @@
       UserProfile userProfile =3D loadUserProfile(container, context);
       if (userProfile !=3D null)
       {
-         userProfile.getUserInfoMap().put(Constants.USER_LANGUAGE, loc.get=
Language());
+         userProfile.getUserInfoMap().put(Constants.USER_LANGUAGE, LocaleC=
ontextInfo.getLocaleAsString(loc));
          try
          {
             svc.getUserProfileHandler().saveUserProfile(userProfile, false=
);


--===============8798612556939149768==--