Author: julien(a)jboss.com Date: 2007-08-28 05:58:23 -0400 (Tue, 28 Aug 2007) New Revision: 8065 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java Log: - update 2.6 to use URL encoder refactorings Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java 2007-08-28 09:26:34 UTC (rev 8064) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java 2007-08-28 09:58:23 UTC (rev 8065) @@ -25,7 +25,6 @@ import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.Portal; -import org.jboss.portal.core.model.portal.Context; import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.CustomizationManager; import org.jboss.portal.core.controller.ControllerContext; @@ -114,7 +113,7 @@ while (iterator.hasNext()) { String name = (String)iterator.next(); - name = FastURLEncoder.DEFAULT_ENCODER.encode(name); + name = FastURLEncoder.getInstance().encode(name); buffer.append('/').append(name); } } Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java 2007-08-28 09:26:34 UTC (rev 8064) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java 2007-08-28 09:58:23 UTC (rev 8065) @@ -125,7 +125,7 @@ for (Iterator i = id.getPath().names();i.hasNext();) { String name = (String)i.next(); - name = FastURLEncoder.DEFAULT_ENCODER.encode(name); + name = FastURLEncoder.getInstance().encode(name); buffer.append('/').append(name); } } Modified: branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-08-28 09:26:34 UTC (rev 8064) +++ branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-08-28 09:58:23 UTC (rev 8065) @@ -123,13 +123,13 @@ for (Iterator i = encoder.getQueryParameters().entrySet().iterator();i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); - String name = FastURLEncoder.DEFAULT_ENCODER.encode((String)entry.getKey()); + String name = FastURLEncoder.getInstance().encode((String)entry.getKey()); String[] values = (String[])entry.getValue(); for (int j = 0;j < values.length;j++) { String value = values[j]; url.append("&amp;").append(name).append('='); - FastURLEncoder.DEFAULT_ENCODER.encode(value, url); + FastURLEncoder.getInstance().encode(value, url); } } Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2007-08-28 09:26:34 UTC (rev 8064) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2007-08-28 09:58:23 UTC (rev 8065) @@ -49,7 +49,7 @@ { /** The fast url encoder. */ - private static final FastURLEncoder urlEncoder = FastURLEncoder.create("UTF8", 0, 1024); + private static final FastURLEncoder urlEncoder = FastURLEncoder.getInstance(); /** The client request. */ private final HttpServletRequest req; Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java 2007-08-28 09:26:34 UTC (rev 8064) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java 2007-08-28 09:58:23 UTC (rev 8065) @@ -72,7 +72,7 @@ { WindowObject window = (WindowObject)object; url.append("/window/"); - FastURLEncoder.DEFAULT_ENCODER.encode(window.getId(), url); + FastURLEncoder.getInstance().encode(window.getId(), url); } else { @@ -86,9 +86,9 @@ String key = (String)entry.getKey(); String value = (String)entry.getValue(); url.append(i.isFirst() ? '?' : '&'); - FastURLEncoder.DEFAULT_ENCODER.encode(key, url); + FastURLEncoder.getInstance().encode(key, url); url.append('='); - FastURLEncoder.DEFAULT_ENCODER.encode(value, url); + FastURLEncoder.getInstance().encode(value, url); } return url.toString(); Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-08-28 09:26:34 UTC (rev 8064) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-08-28 09:58:23 UTC (rev 8065) @@ -135,7 +135,7 @@ String value = values != null ? values[0] : prefInfo.getDefaultValue(); if (value != null) { - tmp.append("&amp;up_").append(FastURLEncoder.DEFAULT_ENCODER.encode(prefName)).append("=").append(FastURLEncoder.DEFAULT_ENCODER.encode(value)); + tmp.append("&amp;up_").append(FastURLEncoder.getInstance().encode(prefName)).append("=").append(FastURLEncoder.getInstance().encode(value)); } }