small changes for the pom.xml from the testsuite
and change PortalURLParserImpl, so that the parameter are UTF-8 encoded
git-svn-id: https://svn.apache.org/repos/asf/portals/pluto/branches/1.1-286-trunk-merge@609575 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java b/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
index 8448466..c55e1db 100644
--- a/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
+++ b/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
@@ -17,6 +17,7 @@
package org.apache.pluto.driver.url.impl;
import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Iterator;
import java.util.Map;
@@ -351,6 +352,12 @@
private String encodeMultiValues(String[] values) {
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < values.length; i++) {
+ try {
+ values[i] = URLEncoder.encode(values[i], "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
buffer.append(values[i] != null ? values[i] : "");
if (i + 1 < values.length) {
buffer.append(VALUE_DELIM);
@@ -424,7 +431,14 @@
// Split multiple values into a value array.
String[] paramValues = value.split(VALUE_DELIM);
-
+ for (int i = 0; i < paramValues.length;i++){
+ try {
+ paramValues[i] = URLDecoder.decode(paramValues[i], "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
// Construct portal URL parameter and return.
return new PortalURLParameter(windowId, paramName, paramValues);
}
@@ -464,7 +478,7 @@
ENCODINGS[i][1],
ENCODINGS[i][0]);
}
- return string;
+ return string;
}
}
diff --git a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
index bd6e159..1437acc 100644
--- a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
+++ b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
@@ -17,9 +17,7 @@
package org.apache.pluto.driver;
import java.io.IOException;
-import java.util.Collection;
import java.util.Enumeration;
-import java.util.List;
import javax.portlet.PortletException;
import javax.servlet.RequestDispatcher;
@@ -28,33 +26,18 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.descriptors.portlet.EventDD;
-import org.apache.pluto.descriptors.portlet.EventDefinitionDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.PublicRenderParamDD;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.driver.core.PortletWindowImpl;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
-import org.apache.pluto.driver.services.portal.SupportedModesService;
import org.apache.pluto.driver.url.PortalURL;
-import org.apache.pluto.internal.InternalPortletWindow;
-import org.apache.pluto.internal.impl.InternalPortletWindowImpl;
-import org.apache.pluto.spi.EventProvider;
-import org.apache.pluto.spi.PublicRenderParameterProvider;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.WebApplicationContext;
-
-import com.sun.jmx.snmp.Enumerated;
/**
* The controller servlet used to drive the Portal Driver. All requests mapped
* to this servlet will be processed as Portal Requests.
diff --git a/pluto-testsuite/pom.xml b/pluto-testsuite/pom.xml
index fb761e9..f4d1919 100644
--- a/pluto-testsuite/pom.xml
+++ b/pluto-testsuite/pom.xml
@@ -150,7 +150,7 @@
-->
<property environment="env"/>
<property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
- <move file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war"/>
+ <copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war"/>
= </tasks>
</configuration>
<goals>
