gatein SVN: r8712 - epp/portal/branches.
by do-not-reply＠jboss.org
Author: ghjboss
Date: 2012-05-31 17:18:12 -0400 (Thu, 31 May 2012)
New Revision: 8712
Added:
epp/portal/branches/EPP_5_2_1_GA_BZ827194/
Log:
create branch for support patch BZ827194
12 years, 6 months
gatein SVN: r8711 - epp/portal/branches/EPP_5_2_0_GA_BZ821924/component/web/controller/src/main/java/org/exoplatform/web.
by do-not-reply＠jboss.org
Author: ghjboss
Date: 2012-05-31 16:49:10 -0400 (Thu, 31 May 2012)
New Revision: 8711
Modified:
epp/portal/branches/EPP_5_2_0_GA_BZ821924/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java
Log:
commit the fix for BZ821924
Modified: epp/portal/branches/EPP_5_2_0_GA_BZ821924/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java
===================================================================
--- epp/portal/branches/EPP_5_2_0_GA_BZ821924/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2012-05-15 18:56:53 UTC (rev 8710)
+++ epp/portal/branches/EPP_5_2_0_GA_BZ821924/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2012-05-31 20:49:10 UTC (rev 8711)
@@ -45,6 +45,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -309,6 +310,15 @@
public void service(HttpServletRequest req, HttpServletResponse res) throws Exception
{
boolean debug = log.isDebugEnabled();
+ try
+ {
+ // We set the character encoding now to UTF-8 before obtaining parameters
+ req.setCharacterEncoding("UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ log.error("Encoding not supported", e);
+ }
String portalPath = req.getRequestURI().substring(req.getContextPath().length());
Router router = routerRef.get();
12 years, 6 months
gatein SVN: r8710 - epp/portal/branches.
by do-not-reply＠jboss.org
Author: ghjboss
Date: 2012-05-15 14:56:53 -0400 (Tue, 15 May 2012)
New Revision: 8710
Added:
epp/portal/branches/EPP_5_2_0_GA_BZ821924/
Log:
create branch for support patch BZ821924
12 years, 7 months
gatein SVN: r8709 - epp/portal/branches/EPP_5_2_0_GA_BZ819631/webui/portal/src/main/java/org/exoplatform/portal/application/localization.
by do-not-reply＠jboss.org
Author: ghjboss
Date: 2012-05-11 12:32:36 -0400 (Fri, 11 May 2012)
New Revision: 8709
Modified:
epp/portal/branches/EPP_5_2_0_GA_BZ819631/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java
Log:
commit fix for BZ819631
Modified: epp/portal/branches/EPP_5_2_0_GA_BZ819631/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java
===================================================================
--- epp/portal/branches/EPP_5_2_0_GA_BZ819631/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2012-05-07 19:33:58 UTC (rev 8708)
+++ epp/portal/branches/EPP_5_2_0_GA_BZ819631/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2012-05-11 16:32:36 UTC (rev 8709)
@@ -26,6 +26,7 @@
import org.exoplatform.container.RootContainer;
import org.exoplatform.container.component.ComponentRequestLifecycle;
import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.container.web.AbstractFilter;
import org.exoplatform.portal.Constants;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.services.log.ExoLogger;
@@ -79,7 +80,7 @@
*
* @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
*/
-public class LocalizationFilter implements Filter
+public class LocalizationFilter extends AbstractFilter
{
private static Log log = ExoLogger.getLogger("portal:LocalizationFilter");
@@ -87,7 +88,8 @@
private Locale portalLocale = Locale.ENGLISH;
- public void init(FilterConfig filterConfig) throws ServletException
+ @Override
+ public void afterInit(FilterConfig filterConfig) throws ServletException
{
String locale = filterConfig.getInitParameter("PortalLocale");
locale = locale != null ? locale.trim() : null;
@@ -129,7 +131,7 @@
// Initialize currentLocale
- ExoContainer container = ExoContainerContext.getCurrentContainerIfPresent();
+ ExoContainer container = getContainer();
if (container == null)
{
// Nothing we can do, move on
@@ -137,9 +139,6 @@
return;
}
- if (container instanceof RootContainer)
- container = (ExoContainer) container.getComponentInstance("portal");
-
LocaleConfigService localeConfigService = (LocaleConfigService)
container.getComponentInstanceOfType(LocaleConfigService.class);
LocalePolicy localePolicy = (LocalePolicy) container.getComponentInstanceOfType(LocalePolicy.class);
12 years, 7 months
gatein SVN: r8708 - epp/portal/branches.
by do-not-reply＠jboss.org
Author: ghjboss
Date: 2012-05-07 15:33:58 -0400 (Mon, 07 May 2012)
New Revision: 8708
Added:
epp/portal/branches/EPP_5_2_0_GA_BZ819631/
Log:
create branch for BZ819631
12 years, 7 months