You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2007/07/07 16:26:32 UTC
svn commit: r554210 - in
/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src:
main/java/org/apache/pluto/driver/url/impl/
test/java/org/apache/pluto/driver/url/impl/
Author: cdoremus
Date: Sat Jul 7 07:26:31 2007
New Revision: 554210
URL: http://svn.apache.org/viewvc?view=rev&rev=554210
Log:
Fix for PLUTO-361. Thank you Marc Veary for the patch! Also applied trunk diffs in PortalURLParserImpl and RelativePortalURLImpl.
Added:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?view=diff&rev=554210&r1=554209&r2=554210
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java Sat Jul 7 07:26:31 2007
@@ -104,16 +104,16 @@
String servletName = request.getServletPath();
// Construct portal URL using info retrieved from servlet request.
- PortalURL portalURL = new RelativePortalURLImpl(contextPath, servletName, this);
+ PortalURL portalURL = new RelativePortalURLImpl(contextPath, servletName);
// Support added for filter. Should we seperate into a different impl?
String pathInfo = request.getPathInfo();
if (pathInfo == null) {
- if(servletName.indexOf(".jsp") > 0 && !servletName.endsWith(".jsp")) {
+ if(servletName.contains(".jsp") && !servletName.endsWith(".jsp")) {
int idx = servletName.indexOf(".jsp")+".jsp".length();
pathInfo = servletName.substring(idx);
servletName = servletName.substring(0, idx);
- portalURL = new RelativePortalURLImpl(contextPath, servletName, this);
+ portalURL = new RelativePortalURLImpl(contextPath, servletName);
} else {
return portalURL;
}
@@ -154,7 +154,16 @@
if (st.hasMoreTokens()) {
value = st.nextToken();
}
- portalURL.addParameter(decodeParameter(token, value));
+
+ // Defect PLUTO-361
+ // ADDED
+ PortalURLParameter param = decodeParameter( token, value );
+ if( param != null )
+ {
+ portalURL.addParameter( param );
+ }
+ // REMOVED
+ // portalURL.addParameter(decodeParameter(token, value));
}
}
if (renderPath.length() > 0) {
@@ -249,9 +258,9 @@
// Fix for PLUTO-247 - check if query string contains parameters
if ( query.length() > 1 ) {
return buffer.append(query).toString();
- } else {
- return buffer.toString();
}
+
+ return buffer.toString();
}
private String encodeQueryParam(String param) {
@@ -350,6 +359,13 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Decoding parameter: name=" + name
+ ", value=" + value);
+ }
+
+ // Defect PLUTO-361
+ // ADDED: if the length is less than this, there is no parameter...
+ if( name.length() < (PREFIX + PORTLET_ID).length() )
+ {
+ return null;
}
// Decode the name into window ID and parameter name.
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java?view=diff&rev=554210&r1=554209&r2=554210
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java Sat Jul 7 07:26:31 2007
@@ -16,20 +16,18 @@
*/
package org.apache.pluto.driver.url.impl;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.driver.url.PortalURLParameter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.driver.url.PortalURL;
-import org.apache.pluto.driver.url.PortalURLParameter;
-import org.apache.pluto.driver.url.PortalURLParser;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
/**
* The portal URL.
@@ -41,13 +39,7 @@
private String servletPath;
private String renderPath;
- private String actionWindow;
-
- /**
- * PortalURLParser used to construct the string
- * representation of this portal url.
- */
- private PortalURLParser urlParser;
+ private String actionWindow;
/** The window states: key is the window ID, value is WindowState. */
private Map windowStates = new HashMap();
@@ -61,14 +53,12 @@
* Constructs a PortalURLImpl instance using customized port.
* @param contextPath the servlet context path.
* @param servletName the servlet name.
- * @param urlParser the {@link PortalURLParser} used to construct a string representation of the url.
*/
- public RelativePortalURLImpl(String contextPath, String servletName, PortalURLParser urlParser) {
+ public RelativePortalURLImpl(String contextPath, String servletName) {
StringBuffer buffer = new StringBuffer();
buffer.append(contextPath);
buffer.append(servletName);
servletPath = buffer.toString();
- this.urlParser = urlParser;
}
/**
@@ -167,7 +157,7 @@
* @see PortalURLParserImpl#toString(org.apache.pluto.driver.url.PortalURL)
*/
public String toString() {
- return urlParser.toString(this);
+ return PortalURLParserImpl.getParser().toString(this);
}
@@ -200,7 +190,6 @@
portalURL.windowStates = new HashMap(windowStates);
portalURL.renderPath = renderPath;
portalURL.actionWindow = actionWindow;
- portalURL.urlParser = urlParser;
return portalURL;
}
}
Added: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java?view=auto&rev=554210
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java Sat Jul 7 07:26:31 2007
@@ -0,0 +1,621 @@
+package org.apache.pluto.driver.url.impl;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * Copied from mockrunner 0.3.8
+ * Mock implementation of <code>HttpServletRequest</code>.
+ */
+public class MockHttpServletRequest implements HttpServletRequest
+{
+ private Map attributes;
+ private Map parameters;
+ private Vector locales;
+ private Map requestDispatchers;
+ private HttpSession session;
+ private String method;
+ private String authType;
+ private Map headers;
+ private String contextPath;
+ private String pathInfo;
+ private String pathTranslated;
+ private String queryString;
+ private StringBuffer requestUrl;
+ private String requestUri;
+ private String servletPath;
+ private Principal principal;
+ private String remoteUser;
+ private boolean requestedSessionIdIsFromCookie;
+ private String protocol;
+ private String serverName;
+ private int serverPort;
+ private String scheme;
+ private String remoteHost;
+ private String remoteAddr;
+ private Map roles;
+ private String characterEncoding;
+ private int contentLength;
+ private String contentType;
+ private List cookies;
+ private String localAddr;
+ private String localName;
+ private int localPort;
+ private int remotePort;
+ private boolean sessionCreated;
+
+ public MockHttpServletRequest()
+ {
+ resetAll();
+ }
+
+ /**
+ * Resets the state of this object to the default values
+ */
+ public void resetAll()
+ {
+ this.attributes = new HashMap();
+ this.parameters = new HashMap();
+ this.locales = new Vector();
+ this.requestDispatchers = new HashMap();
+ this.method = "GET";
+ headers = new HashMap();
+ requestedSessionIdIsFromCookie = true;
+ protocol = "HTTP/1.1";
+ serverName = "localhost";
+ serverPort = 8080;
+ scheme = "http";
+ remoteHost = "localhost";
+ remoteAddr = "127.0.0.1";
+ roles = new HashMap();
+ contentLength = -1;
+ cookies = new ArrayList();
+ localAddr = "127.0.0.1";
+ localName = "localhost";
+ localPort = 8080;
+ remotePort = 5000;
+ sessionCreated = false;
+ }
+
+ public String getParameter(String key)
+ {
+ String[] values = getParameterValues(key);
+ if (null != values && 0 < values.length)
+ {
+ return values[0];
+ }
+ return null;
+ }
+
+ public void clearParameters()
+ {
+ parameters.clear();
+ }
+
+ public String[] getParameterValues(String key)
+ {
+ return (String[])parameters.get(key);
+ }
+
+ public void setupAddParameter(String key, String[] values)
+ {
+ parameters.put(key, values);
+ }
+
+ public void setupAddParameter(String key, String value)
+ {
+ setupAddParameter(key, new String[] { value });
+ }
+
+ public Enumeration getParameterNames()
+ {
+ Vector parameterKeys = new Vector(parameters.keySet());
+ return parameterKeys.elements();
+ }
+
+ public Map getParameterMap()
+ {
+ return Collections.unmodifiableMap(parameters);
+ }
+
+ public void clearAttributes()
+ {
+ attributes.clear();
+ }
+
+ public Object getAttribute(String key)
+ {
+ return attributes.get(key);
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ Vector attKeys = new Vector(attributes.keySet());
+ return attKeys.elements();
+ }
+
+ public void removeAttribute(String key)
+ {
+ Object value = attributes.get(key);
+ attributes.remove(key);
+ if(null != value)
+ {
+ //callAttributeListenersRemovedMethod(key, value);
+ }
+ }
+
+ public void setAttribute(String key, Object value)
+ {
+ Object oldValue = attributes.get(key);
+ if(null == value)
+ {
+ attributes.remove(key);
+ }
+ else
+ {
+ attributes.put(key, value);
+ }
+ //handleAttributeListenerCalls(key, value, oldValue);
+ }
+
+ public HttpSession getSession()
+ {
+ sessionCreated = true;
+ return session;
+ }
+
+ public HttpSession getSession(boolean create)
+ {
+ if(!create && !sessionCreated) return null;
+ return getSession();
+ }
+
+ public void setSession(HttpSession session)
+ {
+ this.session = session;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String path)
+ {
+ return null;
+ }
+
+ /**
+ * Returns the map of <code>RequestDispatcher</code> objects. The specified path
+ * maps to the corresponding <code>RequestDispatcher</code> object.
+ * @return the map of <code>RequestDispatcher</code> objects
+ */
+ public Map getRequestDispatcherMap()
+ {
+ return Collections.unmodifiableMap(requestDispatchers);
+ }
+
+ /**
+ * Clears the map of <code>RequestDispatcher</code> objects.
+ */
+ public void clearRequestDispatcherMap()
+ {
+ requestDispatchers.clear();
+ }
+
+ public void setRequestDispatcher(String path, RequestDispatcher dispatcher)
+ {
+ }
+
+ public Locale getLocale()
+ {
+ if(locales.size() < 1) return Locale.getDefault();
+ return (Locale)locales.get(0);
+ }
+
+ public Enumeration getLocales()
+ {
+ return locales.elements();
+ }
+
+ public void addLocale(Locale locale)
+ {
+ locales.add(locale);
+ }
+
+ public void addLocales(List localeList)
+ {
+ locales.addAll(localeList);
+ }
+
+ public String getMethod()
+ {
+ return method;
+ }
+
+ public void setMethod(String method)
+ {
+ this.method = method;
+ }
+
+ public String getAuthType()
+ {
+ return authType;
+ }
+
+ public void setAuthType(String authType)
+ {
+ this.authType = authType;
+ }
+
+ public long getDateHeader(String key)
+ {
+ return -1;
+ }
+
+ public String getHeader(String key)
+ {
+ List headerList = (List)headers.get(key);
+ if(null == headerList || 0 == headerList.size()) return null;
+ return (String)headerList.get(0);
+ }
+
+ public Enumeration getHeaderNames()
+ {
+ return new Vector(headers.keySet()).elements();
+ }
+
+ public Enumeration getHeaders(String key)
+ {
+ List headerList = (List)headers.get(key);
+ if(null == headerList) return null;
+ return new Vector(headerList).elements();
+ }
+
+ public int getIntHeader(String key)
+ {
+ String header = getHeader(key);
+ if(null == header) return -1;
+ return new Integer(header).intValue();
+ }
+
+ public void addHeader(String key, String value)
+ {
+ List valueList = (List) headers.get(key);
+ if (null == valueList)
+ {
+ valueList = new ArrayList();
+ headers.put(key, valueList);
+ }
+ valueList.add(value);
+ }
+
+ public void setHeader(String key, String value)
+ {
+ List valueList = new ArrayList();
+ headers.put(key, valueList);
+ valueList.add(value);
+ }
+
+ public void clearHeaders()
+ {
+ headers.clear();
+ }
+
+ public String getContextPath()
+ {
+ return contextPath;
+ }
+
+ public void setContextPath(String contextPath)
+ {
+ this.contextPath = contextPath;
+ }
+
+ public String getPathInfo()
+ {
+ return pathInfo;
+ }
+
+ public void setPathInfo(String pathInfo)
+ {
+ this.pathInfo = pathInfo;
+ }
+
+ public String getPathTranslated()
+ {
+ return pathTranslated;
+ }
+
+ public void setPathTranslated(String pathTranslated)
+ {
+ this.pathTranslated = pathTranslated;
+ }
+
+ public String getQueryString()
+ {
+ return queryString;
+ }
+
+ public void setQueryString(String queryString)
+ {
+ this.queryString = queryString;
+ }
+
+ public String getRequestURI()
+ {
+ return requestUri;
+ }
+
+ public void setRequestURI(String requestUri)
+ {
+ this.requestUri = requestUri;
+ }
+
+ public StringBuffer getRequestURL()
+ {
+ return requestUrl;
+ }
+
+ public void setRequestURL(String requestUrl)
+ {
+ this.requestUrl = new StringBuffer(requestUrl);
+ }
+
+ public String getServletPath()
+ {
+ return servletPath;
+ }
+
+ public void setServletPath(String servletPath)
+ {
+ this.servletPath = servletPath;
+ }
+
+ public Principal getUserPrincipal()
+ {
+ return principal;
+ }
+
+ public void setUserPrincipal(Principal principal)
+ {
+ this.principal = principal;
+ }
+
+ public String getRemoteUser()
+ {
+ return remoteUser;
+ }
+
+ public void setRemoteUser(String remoteUser)
+ {
+ this.remoteUser = remoteUser;
+ }
+
+ public Cookie[] getCookies()
+ {
+ return (Cookie[])cookies.toArray(new Cookie[cookies.size()]);
+ }
+
+ public void addCookie(Cookie cookie)
+ {
+ cookies.add(cookie);
+ }
+
+ public String getRequestedSessionId()
+ {
+ HttpSession session = getSession();
+ if(null == session) return null;
+ return session.getId();
+ }
+
+ public boolean isRequestedSessionIdFromCookie()
+ {
+ return requestedSessionIdIsFromCookie;
+ }
+
+ public boolean isRequestedSessionIdFromUrl()
+ {
+ return isRequestedSessionIdFromURL();
+ }
+
+ public boolean isRequestedSessionIdFromURL()
+ {
+ return !requestedSessionIdIsFromCookie;
+ }
+
+ public void setRequestedSessionIdFromCookie(boolean requestedSessionIdIsFromCookie)
+ {
+ this.requestedSessionIdIsFromCookie = requestedSessionIdIsFromCookie;
+ }
+
+ public boolean isRequestedSessionIdValid()
+ {
+ HttpSession session = getSession();
+ if(null == session) return false;
+ return true;
+ }
+
+ public boolean isUserInRole(String role)
+ {
+ return ((Boolean)roles.get(role)).booleanValue();
+ }
+
+ public void setUserInRole(String role, boolean isInRole)
+ {
+ roles.put(role, new Boolean(isInRole));
+ }
+
+ public String getCharacterEncoding()
+ {
+ return characterEncoding;
+ }
+
+ public void setCharacterEncoding(String characterEncoding) throws UnsupportedEncodingException
+ {
+ this.characterEncoding = characterEncoding;
+ }
+
+ public int getContentLength()
+ {
+ return contentLength;
+ }
+
+ public void setContentLength(int contentLength)
+ {
+ this.contentLength = contentLength;
+ }
+
+ public String getContentType()
+ {
+ return contentType;
+ }
+
+ public void setContentType(String contentType)
+ {
+ this.contentType = contentType;
+ }
+
+ public String getProtocol()
+ {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol)
+ {
+ this.protocol = protocol;
+ }
+
+ public String getServerName()
+ {
+ return serverName;
+ }
+
+ public void setServerName(String serverName)
+ {
+ this.serverName = serverName;
+ }
+
+ public int getServerPort()
+ {
+ return serverPort;
+ }
+
+ public void setServerPort(int serverPort)
+ {
+ this.serverPort = serverPort;
+ }
+
+ public String getScheme()
+ {
+ return scheme;
+ }
+
+ public void setScheme(String scheme)
+ {
+ this.scheme = scheme;
+ }
+
+ public String getRemoteAddr()
+ {
+ return remoteAddr;
+ }
+
+ public void setRemoteAddr(String remoteAddr)
+ {
+ this.remoteAddr = remoteAddr;
+ }
+
+ public String getRemoteHost()
+ {
+ return remoteHost;
+ }
+
+ public void setRemoteHost(String remoteHost)
+ {
+ this.remoteHost = remoteHost;
+ }
+
+ public BufferedReader getReader() throws IOException
+ {
+ return null;
+ }
+
+ public ServletInputStream getInputStream() throws IOException
+ {
+ return null;
+ }
+
+ public void setBodyContent(byte[] data)
+ {
+ }
+
+ public void setBodyContent(String bodyContent)
+ {
+ }
+
+ public String getRealPath(String path)
+ {
+ HttpSession session = getSession();
+ if(null == session) return null;
+ return session.getServletContext().getRealPath(path);
+ }
+
+ public boolean isSecure()
+ {
+ String scheme = getScheme();
+ if(null == scheme) return false;
+ return scheme.equals("https");
+ }
+
+ public String getLocalAddr()
+ {
+ return localAddr;
+ }
+
+ public void setLocalAddr(String localAddr)
+ {
+ this.localAddr = localAddr;
+ }
+
+ public String getLocalName()
+ {
+ return localName;
+ }
+
+ public void setLocalName(String localName)
+ {
+ this.localName = localName;
+ }
+
+ public int getLocalPort()
+ {
+ return localPort;
+ }
+
+ public void setLocalPort(int localPort)
+ {
+ this.localPort = localPort;
+ }
+
+ public int getRemotePort()
+ {
+ return remotePort;
+ }
+
+ public void setRemotePort(int remotePort)
+ {
+ this.remotePort = remotePort;
+ }
+}
Added: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java?view=auto&rev=554210
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java Sat Jul 7 07:26:31 2007
@@ -0,0 +1,64 @@
+package org.apache.pluto.driver.url.impl;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.driver.url.PortalURLParser;
+
+/**
+ * TestPortalURLParser.java
+ * Unit Test for Defect PLUTO-361
+ */
+public class TestPortalURLParser extends TestCase
+{
+ private static final Log LOG = LogFactory.getLog( TestPortalURLParser.class );
+
+ private PortalURLParser parser;
+ private MockHttpServletRequest request;
+ private Throwable throwable = null;
+
+ public void test_DefectPLUTO_361()
+ {
+ // This is a well formed request.
+ this.request = new MockHttpServletRequest();
+ this.request.setContextPath( "/pluto" );
+ this.request.setRequestURI( "/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
+ this.request.setRequestURL( "http://localhost:8080/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
+ this.request.setQueryString( "testId=0&org.apache.pluto.testsuite.PARAM_ACTION_KEY=org.apache.pluto.testsuite.ACTION_VALUE" );
+ this.request.setPathInfo( "/Test Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
+
+ try
+ {
+ PortalURL portalURL = this.parser.parse( this.request );
+ } catch( Throwable t ) {
+ this.throwable = t;
+ LOG.error( "ERROR:", t );
+ }
+ assertNull( "No exception should be thrown", this.throwable );
+ this.throwable = null;
+
+ // Not so well formed request as per defect PLUTO-361
+ this.request = new MockHttpServletRequest();
+ this.request.setContextPath( "/pluto" );
+ this.request.setRequestURI( "/pluto/portal/__" );
+ this.request.setRequestURL( "http://localhost:8080/pluto/portal/__" );
+ this.request.setPathInfo( "/__" );
+
+ try
+ {
+ PortalURL portalURL = this.parser.parse( this.request );
+ } catch( Throwable t ) {
+ this.throwable = t;
+ LOG.error( "ERROR:", t );
+ }
+ assertNull( "No exception should be thrown", this.throwable );
+ this.throwable = null;
+ }
+
+ protected void setUp() throws Exception
+ {
+ this.parser = PortalURLParserImpl.getParser();
+ }
+}
Re: [ROLLBACK] : Re: svn commit: r554210 - in /portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src:
main/java/org/apache/pluto/driver/url/impl/ test/java/org/apache/pluto/driver/url/impl/
Posted by Craig Doremus <cd...@apache.org>.
Sorry, about that David! Thanks for catching this. I will do a rollback
later this evening or tomorrow morning.
/Craig
> Craig,
>
> Please roll back this commit. The String.contains(CharSequence)
> method was not introduced until java 1.5. The 1.1 branch is not
> supposed to rely on 1.5.
>
>
> Of course, if you can fix the 1.5 dependencies without giving up the
> included fix, that would be ideal, but 1.4 compat is more important
> than the fix.
>
> David
>
> cdoremus@apache.org wrote:
>> Author: cdoremus
>> Date: Sat Jul 7 07:26:31 2007
>> New Revision: 554210
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=554210
>> Log:
>> Fix for PLUTO-361. Thank you Marc Veary for the patch! Also applied
>> trunk diffs in PortalURLParserImpl and RelativePortalURLImpl.
>>
>> Added:
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>>
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>>
>> Modified:
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>>
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>>
>>
>> Modified:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?view=diff&rev=554210&r1=554209&r2=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>> (original)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>> Sat Jul 7 07:26:31 2007
>> @@ -104,16 +104,16 @@
>> String servletName = request.getServletPath();
>>
>> // Construct portal URL using info retrieved from servlet
>> request.
>> - PortalURL portalURL = new
>> RelativePortalURLImpl(contextPath, servletName, this);
>> + PortalURL portalURL = new
>> RelativePortalURLImpl(contextPath, servletName);
>>
>> // Support added for filter. Should we seperate into a
>> different impl?
>> String pathInfo = request.getPathInfo();
>> if (pathInfo == null) {
>> - if(servletName.indexOf(".jsp") > 0 &&
>> !servletName.endsWith(".jsp")) {
>> + if(servletName.contains(".jsp") &&
>> !servletName.endsWith(".jsp")) {
>> int idx = servletName.indexOf(".jsp")+".jsp".length();
>> pathInfo = servletName.substring(idx);
>> servletName = servletName.substring(0, idx);
>> - portalURL = new RelativePortalURLImpl(contextPath,
>> servletName, this);
>> + portalURL = new RelativePortalURLImpl(contextPath,
>> servletName);
>> } else {
>> return portalURL;
>> }
>> @@ -154,7 +154,16 @@
>> if (st.hasMoreTokens()) {
>> value = st.nextToken();
>> }
>> - portalURL.addParameter(decodeParameter(token, value));
>> +
>> + // Defect PLUTO-361
>> + // ADDED
>> + PortalURLParameter param = decodeParameter( token,
>> value );
>> + if( param != null )
>> + {
>> + portalURL.addParameter( param );
>> + }
>> + // REMOVED
>> + // portalURL.addParameter(decodeParameter(token,
>> value));
>> }
>> }
>> if (renderPath.length() > 0) {
>> @@ -249,9 +258,9 @@
>> // Fix for PLUTO-247 - check if query string contains
>> parameters
>> if ( query.length() > 1 ) {
>> return buffer.append(query).toString();
>> - } else {
>> - return buffer.toString();
>> }
>> +
>> + return buffer.toString();
>> }
>>
>> private String encodeQueryParam(String param) {
>> @@ -350,6 +359,13 @@
>> if (LOG.isDebugEnabled()) {
>> LOG.debug("Decoding parameter: name=" + name
>> + ", value=" + value);
>> + }
>> +
>> + // Defect PLUTO-361
>> + // ADDED: if the length is less than this, there is no
>> parameter...
>> + if( name.length() < (PREFIX + PORTLET_ID).length() )
>> + {
>> + return null;
>> }
>>
>> // Decode the name into window ID and parameter name.
>>
>> Modified:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java?view=diff&rev=554210&r1=554209&r2=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>> (original)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>> Sat Jul 7 07:26:31 2007
>> @@ -16,20 +16,18 @@
>> */
>> package org.apache.pluto.driver.url.impl;
>>
>> -import java.util.Collection;
>> -import java.util.Collections;
>> -import java.util.HashMap;
>> -import java.util.Iterator;
>> -import java.util.Map;
>> +import org.apache.pluto.driver.url.PortalURL;
>> +import org.apache.pluto.driver.url.PortalURLParameter;
>> +import org.apache.commons.logging.Log;
>> +import org.apache.commons.logging.LogFactory;
>>
>> import javax.portlet.PortletMode;
>> import javax.portlet.WindowState;
>> -
>> -import org.apache.commons.logging.Log;
>> -import org.apache.commons.logging.LogFactory;
>> -import org.apache.pluto.driver.url.PortalURL;
>> -import org.apache.pluto.driver.url.PortalURLParameter;
>> -import org.apache.pluto.driver.url.PortalURLParser;
>> +import java.util.Map;
>> +import java.util.HashMap;
>> +import java.util.Collection;
>> +import java.util.Collections;
>> +import java.util.Iterator;
>>
>> /**
>> * The portal URL.
>> @@ -41,13 +39,7 @@
>>
>> private String servletPath;
>> private String renderPath;
>> - private String actionWindow; - - /** - *
>> PortalURLParser used to construct the string
>> - * representation of this portal url.
>> - */
>> - private PortalURLParser urlParser;
>> + private String actionWindow;
>>
>> /** The window states: key is the window ID, value is
>> WindowState. */
>> private Map windowStates = new HashMap();
>> @@ -61,14 +53,12 @@
>> * Constructs a PortalURLImpl instance using customized port.
>> * @param contextPath the servlet context path.
>> * @param servletName the servlet name.
>> - * @param urlParser the {@link PortalURLParser} used to
>> construct a string representation of the url.
>> */
>> - public RelativePortalURLImpl(String contextPath, String
>> servletName, PortalURLParser urlParser) {
>> + public RelativePortalURLImpl(String contextPath, String
>> servletName) {
>> StringBuffer buffer = new StringBuffer();
>> buffer.append(contextPath);
>> buffer.append(servletName);
>> servletPath = buffer.toString();
>> - this.urlParser = urlParser;
>> }
>>
>> /**
>> @@ -167,7 +157,7 @@
>> * @see
>> PortalURLParserImpl#toString(org.apache.pluto.driver.url.PortalURL)
>> */
>> public String toString() {
>> - return urlParser.toString(this);
>> + return PortalURLParserImpl.getParser().toString(this);
>> }
>>
>>
>> @@ -200,7 +190,6 @@
>> portalURL.windowStates = new HashMap(windowStates);
>> portalURL.renderPath = renderPath;
>> portalURL.actionWindow = actionWindow;
>> - portalURL.urlParser = urlParser;
>> return portalURL;
>> }
>> }
>>
>> Added:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java?view=auto&rev=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>> (added)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>> Sat Jul 7 07:26:31 2007
>> @@ -0,0 +1,621 @@
>> +package org.apache.pluto.driver.url.impl;
>> +
>> +import java.io.BufferedReader;
>> +import java.io.IOException;
>> +import java.io.UnsupportedEncodingException;
>> +import java.security.Principal;
>> +import java.util.ArrayList;
>> +import java.util.Collections;
>> +import java.util.Enumeration;
>> +import java.util.HashMap;
>> +import java.util.List;
>> +import java.util.Locale;
>> +import java.util.Map;
>> +import java.util.Vector;
>> +
>> +import javax.servlet.RequestDispatcher;
>> +import javax.servlet.ServletInputStream;
>> +import javax.servlet.http.Cookie;
>> +import javax.servlet.http.HttpServletRequest;
>> +import javax.servlet.http.HttpSession;
>> +
>> +/**
>> + * Copied from mockrunner 0.3.8
>> + * Mock implementation of <code>HttpServletRequest</code>.
>> + */
>> +public class MockHttpServletRequest implements HttpServletRequest
>> +{
>> + private Map attributes;
>> + private Map parameters;
>> + private Vector locales;
>> + private Map requestDispatchers;
>> + private HttpSession session;
>> + private String method;
>> + private String authType;
>> + private Map headers;
>> + private String contextPath;
>> + private String pathInfo;
>> + private String pathTranslated;
>> + private String queryString;
>> + private StringBuffer requestUrl;
>> + private String requestUri;
>> + private String servletPath;
>> + private Principal principal;
>> + private String remoteUser;
>> + private boolean requestedSessionIdIsFromCookie;
>> + private String protocol;
>> + private String serverName;
>> + private int serverPort;
>> + private String scheme;
>> + private String remoteHost;
>> + private String remoteAddr;
>> + private Map roles;
>> + private String characterEncoding;
>> + private int contentLength;
>> + private String contentType;
>> + private List cookies;
>> + private String localAddr;
>> + private String localName;
>> + private int localPort;
>> + private int remotePort;
>> + private boolean sessionCreated;
>> + + public MockHttpServletRequest()
>> + {
>> + resetAll();
>> + }
>> +
>> + /**
>> + * Resets the state of this object to the default values
>> + */
>> + public void resetAll()
>> + {
>> + this.attributes = new HashMap();
>> + this.parameters = new HashMap();
>> + this.locales = new Vector();
>> + this.requestDispatchers = new HashMap();
>> + this.method = "GET";
>> + headers = new HashMap();
>> + requestedSessionIdIsFromCookie = true;
>> + protocol = "HTTP/1.1";
>> + serverName = "localhost";
>> + serverPort = 8080;
>> + scheme = "http";
>> + remoteHost = "localhost";
>> + remoteAddr = "127.0.0.1";
>> + roles = new HashMap();
>> + contentLength = -1;
>> + cookies = new ArrayList();
>> + localAddr = "127.0.0.1";
>> + localName = "localhost";
>> + localPort = 8080;
>> + remotePort = 5000;
>> + sessionCreated = false;
>> + }
>> + + public String getParameter(String key)
>> + {
>> + String[] values = getParameterValues(key);
>> + if (null != values && 0 < values.length)
>> + {
>> + return values[0];
>> + }
>> + return null;
>> + }
>> + + public void clearParameters()
>> + {
>> + parameters.clear();
>> + }
>> +
>> + public String[] getParameterValues(String key)
>> + {
>> + return (String[])parameters.get(key);
>> + }
>> +
>> + public void setupAddParameter(String key, String[] values)
>> + {
>> + parameters.put(key, values);
>> + }
>> +
>> + public void setupAddParameter(String key, String value)
>> + {
>> + setupAddParameter(key, new String[] { value });
>> + }
>> +
>> + public Enumeration getParameterNames()
>> + {
>> + Vector parameterKeys = new Vector(parameters.keySet());
>> + return parameterKeys.elements();
>> + }
>> +
>> + public Map getParameterMap()
>> + {
>> + return Collections.unmodifiableMap(parameters);
>> + }
>> + + public void clearAttributes()
>> + {
>> + attributes.clear();
>> + }
>> +
>> + public Object getAttribute(String key)
>> + {
>> + return attributes.get(key);
>> + }
>> +
>> + public Enumeration getAttributeNames()
>> + {
>> + Vector attKeys = new Vector(attributes.keySet());
>> + return attKeys.elements();
>> + }
>> +
>> + public void removeAttribute(String key)
>> + {
>> + Object value = attributes.get(key);
>> + attributes.remove(key);
>> + if(null != value)
>> + {
>> + //callAttributeListenersRemovedMethod(key, value);
>> + }
>> + }
>> +
>> + public void setAttribute(String key, Object value)
>> + {
>> + Object oldValue = attributes.get(key);
>> + if(null == value)
>> + {
>> + attributes.remove(key);
>> + }
>> + else
>> + {
>> + attributes.put(key, value);
>> + }
>> + //handleAttributeListenerCalls(key, value, oldValue);
>> + }
>> + + public HttpSession getSession()
>> + {
>> + sessionCreated = true;
>> + return session; + }
>> + + public HttpSession getSession(boolean create)
>> + {
>> + if(!create && !sessionCreated) return null;
>> + return getSession();
>> + }
>> +
>> + public void setSession(HttpSession session) + {
>> + this.session = session; + }
>> +
>> + public RequestDispatcher getRequestDispatcher(String path)
>> + {
>> + return null;
>> + }
>> + + /**
>> + * Returns the map of <code>RequestDispatcher</code> objects.
>> The specified path
>> + * maps to the corresponding <code>RequestDispatcher</code> object.
>> + * @return the map of <code>RequestDispatcher</code> objects
>> + */
>> + public Map getRequestDispatcherMap()
>> + {
>> + return Collections.unmodifiableMap(requestDispatchers);
>> + }
>> + + /**
>> + * Clears the map of <code>RequestDispatcher</code> objects.
>> + */
>> + public void clearRequestDispatcherMap()
>> + {
>> + requestDispatchers.clear();
>> + }
>> + + public void setRequestDispatcher(String path,
>> RequestDispatcher dispatcher)
>> + {
>> + }
>> + + public Locale getLocale()
>> + {
>> + if(locales.size() < 1) return Locale.getDefault();
>> + return (Locale)locales.get(0);
>> + }
>> +
>> + public Enumeration getLocales()
>> + {
>> + return locales.elements();
>> + }
>> + + public void addLocale(Locale locale)
>> + {
>> + locales.add(locale);
>> + }
>> + + public void addLocales(List localeList)
>> + {
>> + locales.addAll(localeList);
>> + }
>> + + public String getMethod()
>> + {
>> + return method;
>> + }
>> +
>> + public void setMethod(String method)
>> + {
>> + this.method = method;
>> + }
>> + + public String getAuthType()
>> + {
>> + return authType;
>> + }
>> + + public void setAuthType(String authType)
>> + {
>> + this.authType = authType;
>> + }
>> +
>> + public long getDateHeader(String key)
>> + {
>> + return -1;
>> + }
>> +
>> + public String getHeader(String key)
>> + {
>> + List headerList = (List)headers.get(key);
>> + if(null == headerList || 0 == headerList.size()) return null;
>> + return (String)headerList.get(0);
>> + }
>> +
>> + public Enumeration getHeaderNames()
>> + {
>> + return new Vector(headers.keySet()).elements();
>> + }
>> +
>> + public Enumeration getHeaders(String key)
>> + {
>> + List headerList = (List)headers.get(key);
>> + if(null == headerList) return null;
>> + return new Vector(headerList).elements();
>> + }
>> +
>> + public int getIntHeader(String key)
>> + {
>> + String header = getHeader(key);
>> + if(null == header) return -1;
>> + return new Integer(header).intValue();
>> + }
>> + + public void addHeader(String key, String value)
>> + {
>> + List valueList = (List) headers.get(key);
>> + if (null == valueList)
>> + {
>> + valueList = new ArrayList();
>> + headers.put(key, valueList);
>> + }
>> + valueList.add(value);
>> + }
>> + + public void setHeader(String key, String value)
>> + {
>> + List valueList = new ArrayList();
>> + headers.put(key, valueList);
>> + valueList.add(value);
>> + }
>> + + public void clearHeaders()
>> + {
>> + headers.clear();
>> + }
>> + + public String getContextPath()
>> + {
>> + return contextPath;
>> + }
>> + + public void setContextPath(String contextPath)
>> + {
>> + this.contextPath = contextPath;
>> + }
>> + + public String getPathInfo()
>> + {
>> + return pathInfo;
>> + }
>> + + public void setPathInfo(String pathInfo)
>> + {
>> + this.pathInfo = pathInfo;
>> + }
>> + + public String getPathTranslated()
>> + {
>> + return pathTranslated;
>> + }
>> + + public void setPathTranslated(String pathTranslated)
>> + {
>> + this.pathTranslated = pathTranslated;
>> + }
>> + + public String getQueryString()
>> + {
>> + return queryString;
>> + }
>> + + public void setQueryString(String queryString)
>> + {
>> + this.queryString = queryString;
>> + }
>> + + public String getRequestURI()
>> + {
>> + return requestUri;
>> + }
>> + + public void setRequestURI(String requestUri)
>> + {
>> + this.requestUri = requestUri;
>> + }
>> + + public StringBuffer getRequestURL()
>> + {
>> + return requestUrl;
>> + }
>> + + public void setRequestURL(String requestUrl)
>> + {
>> + this.requestUrl = new StringBuffer(requestUrl);
>> + }
>> + + public String getServletPath()
>> + {
>> + return servletPath;
>> + }
>> + + public void setServletPath(String servletPath)
>> + {
>> + this.servletPath = servletPath;
>> + }
>> + + public Principal getUserPrincipal()
>> + {
>> + return principal;
>> + }
>> + + public void setUserPrincipal(Principal principal)
>> + {
>> + this.principal = principal;
>> + }
>> + + public String getRemoteUser()
>> + {
>> + return remoteUser;
>> + }
>> +
>> + public void setRemoteUser(String remoteUser)
>> + {
>> + this.remoteUser = remoteUser;
>> + }
>> +
>> + public Cookie[] getCookies()
>> + {
>> + return (Cookie[])cookies.toArray(new Cookie[cookies.size()]);
>> + }
>> + + public void addCookie(Cookie cookie)
>> + {
>> + cookies.add(cookie);
>> + }
>> +
>> + public String getRequestedSessionId()
>> + {
>> + HttpSession session = getSession();
>> + if(null == session) return null;
>> + return session.getId();
>> + }
>> +
>> + public boolean isRequestedSessionIdFromCookie()
>> + {
>> + return requestedSessionIdIsFromCookie;
>> + }
>> +
>> + public boolean isRequestedSessionIdFromUrl()
>> + {
>> + return isRequestedSessionIdFromURL();
>> + }
>> +
>> + public boolean isRequestedSessionIdFromURL()
>> + {
>> + return !requestedSessionIdIsFromCookie;
>> + }
>> + + public void setRequestedSessionIdFromCookie(boolean
>> requestedSessionIdIsFromCookie)
>> + {
>> + this.requestedSessionIdIsFromCookie =
>> requestedSessionIdIsFromCookie;
>> + }
>> +
>> + public boolean isRequestedSessionIdValid()
>> + {
>> + HttpSession session = getSession();
>> + if(null == session) return false;
>> + return true;
>> + }
>> +
>> + public boolean isUserInRole(String role)
>> + {
>> + return ((Boolean)roles.get(role)).booleanValue();
>> + }
>> + + public void setUserInRole(String role, boolean isInRole)
>> + {
>> + roles.put(role, new Boolean(isInRole));
>> + }
>> +
>> + public String getCharacterEncoding()
>> + {
>> + return characterEncoding;
>> + }
>> + + public void setCharacterEncoding(String characterEncoding)
>> throws UnsupportedEncodingException
>> + {
>> + this.characterEncoding = characterEncoding;
>> + }
>> +
>> + public int getContentLength()
>> + {
>> + return contentLength;
>> + }
>> + + public void setContentLength(int contentLength)
>> + {
>> + this.contentLength = contentLength;
>> + }
>> +
>> + public String getContentType()
>> + {
>> + return contentType;
>> + }
>> + + public void setContentType(String contentType)
>> + {
>> + this.contentType = contentType;
>> + }
>> +
>> + public String getProtocol()
>> + {
>> + return protocol;
>> + }
>> + + public void setProtocol(String protocol)
>> + {
>> + this.protocol = protocol;
>> + }
>> + + public String getServerName()
>> + {
>> + return serverName;
>> + }
>> + + public void setServerName(String serverName)
>> + {
>> + this.serverName = serverName;
>> + }
>> + + public int getServerPort()
>> + {
>> + return serverPort;
>> + }
>> + + public void setServerPort(int serverPort)
>> + {
>> + this.serverPort = serverPort;
>> + }
>> + + public String getScheme()
>> + {
>> + return scheme;
>> + }
>> + + public void setScheme(String scheme)
>> + {
>> + this.scheme = scheme;
>> + }
>> + + public String getRemoteAddr()
>> + {
>> + return remoteAddr;
>> + }
>> + + public void setRemoteAddr(String remoteAddr)
>> + {
>> + this.remoteAddr = remoteAddr;
>> + }
>> + + public String getRemoteHost()
>> + {
>> + return remoteHost;
>> + }
>> + + public void setRemoteHost(String remoteHost)
>> + {
>> + this.remoteHost = remoteHost;
>> + }
>> +
>> + public BufferedReader getReader() throws IOException
>> + {
>> + return null;
>> + }
>> + + public ServletInputStream getInputStream() throws IOException
>> + {
>> + return null;
>> + }
>> + + public void setBodyContent(byte[] data)
>> + {
>> + }
>> + + public void setBodyContent(String bodyContent)
>> + {
>> + }
>> +
>> + public String getRealPath(String path)
>> + {
>> + HttpSession session = getSession();
>> + if(null == session) return null;
>> + return session.getServletContext().getRealPath(path);
>> + } + + public boolean isSecure()
>> + {
>> + String scheme = getScheme();
>> + if(null == scheme) return false;
>> + return scheme.equals("https");
>> + }
>> + + public String getLocalAddr()
>> + {
>> + return localAddr;
>> + }
>> + + public void setLocalAddr(String localAddr)
>> + {
>> + this.localAddr = localAddr;
>> + }
>> +
>> + public String getLocalName()
>> + {
>> + return localName;
>> + }
>> + + public void setLocalName(String localName)
>> + {
>> + this.localName = localName;
>> + }
>> +
>> + public int getLocalPort()
>> + {
>> + return localPort;
>> + }
>> + + public void setLocalPort(int localPort)
>> + {
>> + this.localPort = localPort;
>> + }
>> +
>> + public int getRemotePort()
>> + {
>> + return remotePort;
>> + }
>> +
>> + public void setRemotePort(int remotePort)
>> + {
>> + this.remotePort = remotePort;
>> + }
>> +}
>>
>> Added:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java?view=auto&rev=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>> (added)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>> Sat Jul 7 07:26:31 2007
>> @@ -0,0 +1,64 @@
>> +package org.apache.pluto.driver.url.impl;
>> +
>> +import junit.framework.TestCase;
>> +
>> +import org.apache.commons.logging.Log;
>> +import org.apache.commons.logging.LogFactory;
>> +import org.apache.pluto.driver.url.PortalURL;
>> +import org.apache.pluto.driver.url.PortalURLParser;
>> +
>> +/**
>> + * TestPortalURLParser.java
>> + * Unit Test for Defect PLUTO-361
>> + */
>> +public class TestPortalURLParser extends TestCase
>> +{
>> + private static final Log LOG = LogFactory.getLog(
>> TestPortalURLParser.class );
>> +
>> + private PortalURLParser parser;
>> + private MockHttpServletRequest request;
>> + private Throwable throwable = null;
>> +
>> + public void test_DefectPLUTO_361()
>> + {
>> + // This is a well formed request.
>> + this.request = new MockHttpServletRequest();
>> + this.request.setContextPath( "/pluto" );
>> + this.request.setRequestURI(
>> "/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0"
>> );
>> + this.request.setRequestURL(
>> "http://localhost:8080/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0"
>> );
>> + this.request.setQueryString(
>> "testId=0&org.apache.pluto.testsuite.PARAM_ACTION_KEY=org.apache.pluto.testsuite.ACTION_VALUE"
>> );
>> + this.request.setPathInfo( "/Test
>> Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
>> +
>> + try
>> + {
>> + PortalURL portalURL = this.parser.parse( this.request );
>> + } catch( Throwable t ) {
>> + this.throwable = t;
>> + LOG.error( "ERROR:", t );
>> + }
>> + assertNull( "No exception should be thrown", this.throwable );
>> + this.throwable = null;
>> +
>> + // Not so well formed request as per defect PLUTO-361
>> + this.request = new MockHttpServletRequest();
>> + this.request.setContextPath( "/pluto" );
>> + this.request.setRequestURI( "/pluto/portal/__" );
>> + this.request.setRequestURL(
>> "http://localhost:8080/pluto/portal/__" );
>> + this.request.setPathInfo( "/__" );
>> +
>> + try
>> + {
>> + PortalURL portalURL = this.parser.parse( this.request );
>> + } catch( Throwable t ) {
>> + this.throwable = t;
>> + LOG.error( "ERROR:", t );
>> + }
>> + assertNull( "No exception should be thrown", this.throwable );
>> + this.throwable = null;
>> + }
>> +
>> + protected void setUp() throws Exception
>> + {
>> + this.parser = PortalURLParserImpl.getParser();
>> + }
>> +}
>>
>>
>>
>
>
>
Re: [ROLLBACK] : Re: svn commit: r554210 - in /portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src:
main/java/org/apache/pluto/driver/url/impl/ test/java/org/apache/pluto/driver/url/impl/
Posted by Elliot Metsger <es...@apache.org>.
Maybe we should add the maven-enforcer plugin to the pom, which may help
fix these things. It breaks the m2eclipse plugin however.
Let me bug the maven devs about that and then we could add the enforcer
plugin which would prevent 1.5 stuff from creeping in.
E
David H. DeWolf wrote:
> Craig,
>
> Please roll back this commit. The String.contains(CharSequence) method
> was not introduced until java 1.5. The 1.1 branch is not supposed to
> rely on 1.5.
>
>
> Of course, if you can fix the 1.5 dependencies without giving up the
> included fix, that would be ideal, but 1.4 compat is more important than
> the fix.
>
> David
>
> cdoremus@apache.org wrote:
>> Author: cdoremus
>> Date: Sat Jul 7 07:26:31 2007
>> New Revision: 554210
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=554210
>> Log:
>> Fix for PLUTO-361. Thank you Marc Veary for the patch! Also applied
>> trunk diffs in PortalURLParserImpl and RelativePortalURLImpl.
>>
>> Added:
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>>
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>>
>> Modified:
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>>
>>
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>>
>>
>> Modified:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?view=diff&rev=554210&r1=554209&r2=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>> (original)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
>> Sat Jul 7 07:26:31 2007
>> @@ -104,16 +104,16 @@
>> String servletName = request.getServletPath();
>>
>> // Construct portal URL using info retrieved from servlet
>> request.
>> - PortalURL portalURL = new RelativePortalURLImpl(contextPath,
>> servletName, this);
>> + PortalURL portalURL = new RelativePortalURLImpl(contextPath,
>> servletName);
>>
>> // Support added for filter. Should we seperate into a
>> different impl?
>> String pathInfo = request.getPathInfo();
>> if (pathInfo == null) {
>> - if(servletName.indexOf(".jsp") > 0 &&
>> !servletName.endsWith(".jsp")) {
>> + if(servletName.contains(".jsp") &&
>> !servletName.endsWith(".jsp")) {
>> int idx = servletName.indexOf(".jsp")+".jsp".length();
>> pathInfo = servletName.substring(idx);
>> servletName = servletName.substring(0, idx);
>> - portalURL = new RelativePortalURLImpl(contextPath,
>> servletName, this);
>> + portalURL = new RelativePortalURLImpl(contextPath,
>> servletName);
>> } else {
>> return portalURL;
>> }
>> @@ -154,7 +154,16 @@
>> if (st.hasMoreTokens()) {
>> value = st.nextToken();
>> }
>> - portalURL.addParameter(decodeParameter(token, value));
>> +
>> + // Defect PLUTO-361
>> + // ADDED
>> + PortalURLParameter param = decodeParameter( token,
>> value );
>> + if( param != null )
>> + {
>> + portalURL.addParameter( param );
>> + }
>> + // REMOVED
>> + // portalURL.addParameter(decodeParameter(token,
>> value));
>> }
>> }
>> if (renderPath.length() > 0) {
>> @@ -249,9 +258,9 @@
>> // Fix for PLUTO-247 - check if query string contains parameters
>> if ( query.length() > 1 ) {
>> return buffer.append(query).toString();
>> - } else {
>> - return buffer.toString();
>> }
>> +
>> + return buffer.toString();
>> }
>>
>> private String encodeQueryParam(String param) {
>> @@ -350,6 +359,13 @@
>> if (LOG.isDebugEnabled()) {
>> LOG.debug("Decoding parameter: name=" + name
>> + ", value=" + value);
>> + }
>> +
>> + // Defect PLUTO-361
>> + // ADDED: if the length is less than this, there is no
>> parameter...
>> + if( name.length() < (PREFIX + PORTLET_ID).length() )
>> + {
>> + return null;
>> }
>>
>> // Decode the name into window ID and parameter name.
>>
>> Modified:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java?view=diff&rev=554210&r1=554209&r2=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>> (original)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>> Sat Jul 7 07:26:31 2007
>> @@ -16,20 +16,18 @@
>> */
>> package org.apache.pluto.driver.url.impl;
>>
>> -import java.util.Collection;
>> -import java.util.Collections;
>> -import java.util.HashMap;
>> -import java.util.Iterator;
>> -import java.util.Map;
>> +import org.apache.pluto.driver.url.PortalURL;
>> +import org.apache.pluto.driver.url.PortalURLParameter;
>> +import org.apache.commons.logging.Log;
>> +import org.apache.commons.logging.LogFactory;
>>
>> import javax.portlet.PortletMode;
>> import javax.portlet.WindowState;
>> -
>> -import org.apache.commons.logging.Log;
>> -import org.apache.commons.logging.LogFactory;
>> -import org.apache.pluto.driver.url.PortalURL;
>> -import org.apache.pluto.driver.url.PortalURLParameter;
>> -import org.apache.pluto.driver.url.PortalURLParser;
>> +import java.util.Map;
>> +import java.util.HashMap;
>> +import java.util.Collection;
>> +import java.util.Collections;
>> +import java.util.Iterator;
>>
>> /**
>> * The portal URL.
>> @@ -41,13 +39,7 @@
>>
>> private String servletPath;
>> private String renderPath;
>> - private String actionWindow; - - /** - *
>> PortalURLParser used to construct the string
>> - * representation of this portal url.
>> - */
>> - private PortalURLParser urlParser;
>> + private String actionWindow;
>>
>> /** The window states: key is the window ID, value is
>> WindowState. */
>> private Map windowStates = new HashMap();
>> @@ -61,14 +53,12 @@
>> * Constructs a PortalURLImpl instance using customized port.
>> * @param contextPath the servlet context path.
>> * @param servletName the servlet name.
>> - * @param urlParser the {@link PortalURLParser} used to
>> construct a string representation of the url.
>> */
>> - public RelativePortalURLImpl(String contextPath, String
>> servletName, PortalURLParser urlParser) {
>> + public RelativePortalURLImpl(String contextPath, String
>> servletName) {
>> StringBuffer buffer = new StringBuffer();
>> buffer.append(contextPath);
>> buffer.append(servletName);
>> servletPath = buffer.toString();
>> - this.urlParser = urlParser;
>> }
>>
>> /**
>> @@ -167,7 +157,7 @@
>> * @see
>> PortalURLParserImpl#toString(org.apache.pluto.driver.url.PortalURL)
>> */
>> public String toString() {
>> - return urlParser.toString(this);
>> + return PortalURLParserImpl.getParser().toString(this);
>> }
>>
>>
>> @@ -200,7 +190,6 @@
>> portalURL.windowStates = new HashMap(windowStates);
>> portalURL.renderPath = renderPath;
>> portalURL.actionWindow = actionWindow;
>> - portalURL.urlParser = urlParser;
>> return portalURL;
>> }
>> }
>>
>> Added:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java?view=auto&rev=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>> (added)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
>> Sat Jul 7 07:26:31 2007
>> @@ -0,0 +1,621 @@
>> +package org.apache.pluto.driver.url.impl;
>> +
>> +import java.io.BufferedReader;
>> +import java.io.IOException;
>> +import java.io.UnsupportedEncodingException;
>> +import java.security.Principal;
>> +import java.util.ArrayList;
>> +import java.util.Collections;
>> +import java.util.Enumeration;
>> +import java.util.HashMap;
>> +import java.util.List;
>> +import java.util.Locale;
>> +import java.util.Map;
>> +import java.util.Vector;
>> +
>> +import javax.servlet.RequestDispatcher;
>> +import javax.servlet.ServletInputStream;
>> +import javax.servlet.http.Cookie;
>> +import javax.servlet.http.HttpServletRequest;
>> +import javax.servlet.http.HttpSession;
>> +
>> +/**
>> + * Copied from mockrunner 0.3.8
>> + * Mock implementation of <code>HttpServletRequest</code>.
>> + */
>> +public class MockHttpServletRequest implements HttpServletRequest
>> +{
>> + private Map attributes;
>> + private Map parameters;
>> + private Vector locales;
>> + private Map requestDispatchers;
>> + private HttpSession session;
>> + private String method;
>> + private String authType;
>> + private Map headers;
>> + private String contextPath;
>> + private String pathInfo;
>> + private String pathTranslated;
>> + private String queryString;
>> + private StringBuffer requestUrl;
>> + private String requestUri;
>> + private String servletPath;
>> + private Principal principal;
>> + private String remoteUser;
>> + private boolean requestedSessionIdIsFromCookie;
>> + private String protocol;
>> + private String serverName;
>> + private int serverPort;
>> + private String scheme;
>> + private String remoteHost;
>> + private String remoteAddr;
>> + private Map roles;
>> + private String characterEncoding;
>> + private int contentLength;
>> + private String contentType;
>> + private List cookies;
>> + private String localAddr;
>> + private String localName;
>> + private int localPort;
>> + private int remotePort;
>> + private boolean sessionCreated;
>> + + public MockHttpServletRequest()
>> + {
>> + resetAll();
>> + }
>> +
>> + /**
>> + * Resets the state of this object to the default values
>> + */
>> + public void resetAll()
>> + {
>> + this.attributes = new HashMap();
>> + this.parameters = new HashMap();
>> + this.locales = new Vector();
>> + this.requestDispatchers = new HashMap();
>> + this.method = "GET";
>> + headers = new HashMap();
>> + requestedSessionIdIsFromCookie = true;
>> + protocol = "HTTP/1.1";
>> + serverName = "localhost";
>> + serverPort = 8080;
>> + scheme = "http";
>> + remoteHost = "localhost";
>> + remoteAddr = "127.0.0.1";
>> + roles = new HashMap();
>> + contentLength = -1;
>> + cookies = new ArrayList();
>> + localAddr = "127.0.0.1";
>> + localName = "localhost";
>> + localPort = 8080;
>> + remotePort = 5000;
>> + sessionCreated = false;
>> + }
>> + + public String getParameter(String key)
>> + {
>> + String[] values = getParameterValues(key);
>> + if (null != values && 0 < values.length)
>> + {
>> + return values[0];
>> + }
>> + return null;
>> + }
>> + + public void clearParameters()
>> + {
>> + parameters.clear();
>> + }
>> +
>> + public String[] getParameterValues(String key)
>> + {
>> + return (String[])parameters.get(key);
>> + }
>> +
>> + public void setupAddParameter(String key, String[] values)
>> + {
>> + parameters.put(key, values);
>> + }
>> +
>> + public void setupAddParameter(String key, String value)
>> + {
>> + setupAddParameter(key, new String[] { value });
>> + }
>> +
>> + public Enumeration getParameterNames()
>> + {
>> + Vector parameterKeys = new Vector(parameters.keySet());
>> + return parameterKeys.elements();
>> + }
>> +
>> + public Map getParameterMap()
>> + {
>> + return Collections.unmodifiableMap(parameters);
>> + }
>> + + public void clearAttributes()
>> + {
>> + attributes.clear();
>> + }
>> +
>> + public Object getAttribute(String key)
>> + {
>> + return attributes.get(key);
>> + }
>> +
>> + public Enumeration getAttributeNames()
>> + {
>> + Vector attKeys = new Vector(attributes.keySet());
>> + return attKeys.elements();
>> + }
>> +
>> + public void removeAttribute(String key)
>> + {
>> + Object value = attributes.get(key);
>> + attributes.remove(key);
>> + if(null != value)
>> + {
>> + //callAttributeListenersRemovedMethod(key, value);
>> + }
>> + }
>> +
>> + public void setAttribute(String key, Object value)
>> + {
>> + Object oldValue = attributes.get(key);
>> + if(null == value)
>> + {
>> + attributes.remove(key);
>> + }
>> + else
>> + {
>> + attributes.put(key, value);
>> + }
>> + //handleAttributeListenerCalls(key, value, oldValue);
>> + }
>> + + public HttpSession getSession()
>> + {
>> + sessionCreated = true;
>> + return session; + }
>> + + public HttpSession getSession(boolean create)
>> + {
>> + if(!create && !sessionCreated) return null;
>> + return getSession();
>> + }
>> +
>> + public void setSession(HttpSession session) + {
>> + this.session = session; + }
>> +
>> + public RequestDispatcher getRequestDispatcher(String path)
>> + {
>> + return null;
>> + }
>> + + /**
>> + * Returns the map of <code>RequestDispatcher</code> objects. The
>> specified path
>> + * maps to the corresponding <code>RequestDispatcher</code> object.
>> + * @return the map of <code>RequestDispatcher</code> objects
>> + */
>> + public Map getRequestDispatcherMap()
>> + {
>> + return Collections.unmodifiableMap(requestDispatchers);
>> + }
>> + + /**
>> + * Clears the map of <code>RequestDispatcher</code> objects.
>> + */
>> + public void clearRequestDispatcherMap()
>> + {
>> + requestDispatchers.clear();
>> + }
>> + + public void setRequestDispatcher(String path,
>> RequestDispatcher dispatcher)
>> + {
>> + }
>> + + public Locale getLocale()
>> + {
>> + if(locales.size() < 1) return Locale.getDefault();
>> + return (Locale)locales.get(0);
>> + }
>> +
>> + public Enumeration getLocales()
>> + {
>> + return locales.elements();
>> + }
>> + + public void addLocale(Locale locale)
>> + {
>> + locales.add(locale);
>> + }
>> + + public void addLocales(List localeList)
>> + {
>> + locales.addAll(localeList);
>> + }
>> + + public String getMethod()
>> + {
>> + return method;
>> + }
>> +
>> + public void setMethod(String method)
>> + {
>> + this.method = method;
>> + }
>> + + public String getAuthType()
>> + {
>> + return authType;
>> + }
>> + + public void setAuthType(String authType)
>> + {
>> + this.authType = authType;
>> + }
>> +
>> + public long getDateHeader(String key)
>> + {
>> + return -1;
>> + }
>> +
>> + public String getHeader(String key)
>> + {
>> + List headerList = (List)headers.get(key);
>> + if(null == headerList || 0 == headerList.size()) return null;
>> + return (String)headerList.get(0);
>> + }
>> +
>> + public Enumeration getHeaderNames()
>> + {
>> + return new Vector(headers.keySet()).elements();
>> + }
>> +
>> + public Enumeration getHeaders(String key)
>> + {
>> + List headerList = (List)headers.get(key);
>> + if(null == headerList) return null;
>> + return new Vector(headerList).elements();
>> + }
>> +
>> + public int getIntHeader(String key)
>> + {
>> + String header = getHeader(key);
>> + if(null == header) return -1;
>> + return new Integer(header).intValue();
>> + }
>> + + public void addHeader(String key, String value)
>> + {
>> + List valueList = (List) headers.get(key);
>> + if (null == valueList)
>> + {
>> + valueList = new ArrayList();
>> + headers.put(key, valueList);
>> + }
>> + valueList.add(value);
>> + }
>> + + public void setHeader(String key, String value)
>> + {
>> + List valueList = new ArrayList();
>> + headers.put(key, valueList);
>> + valueList.add(value);
>> + }
>> + + public void clearHeaders()
>> + {
>> + headers.clear();
>> + }
>> + + public String getContextPath()
>> + {
>> + return contextPath;
>> + }
>> + + public void setContextPath(String contextPath)
>> + {
>> + this.contextPath = contextPath;
>> + }
>> + + public String getPathInfo()
>> + {
>> + return pathInfo;
>> + }
>> + + public void setPathInfo(String pathInfo)
>> + {
>> + this.pathInfo = pathInfo;
>> + }
>> + + public String getPathTranslated()
>> + {
>> + return pathTranslated;
>> + }
>> + + public void setPathTranslated(String pathTranslated)
>> + {
>> + this.pathTranslated = pathTranslated;
>> + }
>> + + public String getQueryString()
>> + {
>> + return queryString;
>> + }
>> + + public void setQueryString(String queryString)
>> + {
>> + this.queryString = queryString;
>> + }
>> + + public String getRequestURI()
>> + {
>> + return requestUri;
>> + }
>> + + public void setRequestURI(String requestUri)
>> + {
>> + this.requestUri = requestUri;
>> + }
>> + + public StringBuffer getRequestURL()
>> + {
>> + return requestUrl;
>> + }
>> + + public void setRequestURL(String requestUrl)
>> + {
>> + this.requestUrl = new StringBuffer(requestUrl);
>> + }
>> + + public String getServletPath()
>> + {
>> + return servletPath;
>> + }
>> + + public void setServletPath(String servletPath)
>> + {
>> + this.servletPath = servletPath;
>> + }
>> + + public Principal getUserPrincipal()
>> + {
>> + return principal;
>> + }
>> + + public void setUserPrincipal(Principal principal)
>> + {
>> + this.principal = principal;
>> + }
>> + + public String getRemoteUser()
>> + {
>> + return remoteUser;
>> + }
>> +
>> + public void setRemoteUser(String remoteUser)
>> + {
>> + this.remoteUser = remoteUser;
>> + }
>> +
>> + public Cookie[] getCookies()
>> + {
>> + return (Cookie[])cookies.toArray(new Cookie[cookies.size()]);
>> + }
>> + + public void addCookie(Cookie cookie)
>> + {
>> + cookies.add(cookie);
>> + }
>> +
>> + public String getRequestedSessionId()
>> + {
>> + HttpSession session = getSession();
>> + if(null == session) return null;
>> + return session.getId();
>> + }
>> +
>> + public boolean isRequestedSessionIdFromCookie()
>> + {
>> + return requestedSessionIdIsFromCookie;
>> + }
>> +
>> + public boolean isRequestedSessionIdFromUrl()
>> + {
>> + return isRequestedSessionIdFromURL();
>> + }
>> +
>> + public boolean isRequestedSessionIdFromURL()
>> + {
>> + return !requestedSessionIdIsFromCookie;
>> + }
>> + + public void setRequestedSessionIdFromCookie(boolean
>> requestedSessionIdIsFromCookie)
>> + {
>> + this.requestedSessionIdIsFromCookie =
>> requestedSessionIdIsFromCookie;
>> + }
>> +
>> + public boolean isRequestedSessionIdValid()
>> + {
>> + HttpSession session = getSession();
>> + if(null == session) return false;
>> + return true;
>> + }
>> +
>> + public boolean isUserInRole(String role)
>> + {
>> + return ((Boolean)roles.get(role)).booleanValue();
>> + }
>> + + public void setUserInRole(String role, boolean isInRole)
>> + {
>> + roles.put(role, new Boolean(isInRole));
>> + }
>> +
>> + public String getCharacterEncoding()
>> + {
>> + return characterEncoding;
>> + }
>> + + public void setCharacterEncoding(String characterEncoding)
>> throws UnsupportedEncodingException
>> + {
>> + this.characterEncoding = characterEncoding;
>> + }
>> +
>> + public int getContentLength()
>> + {
>> + return contentLength;
>> + }
>> + + public void setContentLength(int contentLength)
>> + {
>> + this.contentLength = contentLength;
>> + }
>> +
>> + public String getContentType()
>> + {
>> + return contentType;
>> + }
>> + + public void setContentType(String contentType)
>> + {
>> + this.contentType = contentType;
>> + }
>> +
>> + public String getProtocol()
>> + {
>> + return protocol;
>> + }
>> + + public void setProtocol(String protocol)
>> + {
>> + this.protocol = protocol;
>> + }
>> + + public String getServerName()
>> + {
>> + return serverName;
>> + }
>> + + public void setServerName(String serverName)
>> + {
>> + this.serverName = serverName;
>> + }
>> + + public int getServerPort()
>> + {
>> + return serverPort;
>> + }
>> + + public void setServerPort(int serverPort)
>> + {
>> + this.serverPort = serverPort;
>> + }
>> + + public String getScheme()
>> + {
>> + return scheme;
>> + }
>> + + public void setScheme(String scheme)
>> + {
>> + this.scheme = scheme;
>> + }
>> + + public String getRemoteAddr()
>> + {
>> + return remoteAddr;
>> + }
>> + + public void setRemoteAddr(String remoteAddr)
>> + {
>> + this.remoteAddr = remoteAddr;
>> + }
>> + + public String getRemoteHost()
>> + {
>> + return remoteHost;
>> + }
>> + + public void setRemoteHost(String remoteHost)
>> + {
>> + this.remoteHost = remoteHost;
>> + }
>> +
>> + public BufferedReader getReader() throws IOException
>> + {
>> + return null;
>> + }
>> + + public ServletInputStream getInputStream() throws IOException
>> + {
>> + return null;
>> + }
>> + + public void setBodyContent(byte[] data)
>> + {
>> + }
>> + + public void setBodyContent(String bodyContent)
>> + {
>> + }
>> +
>> + public String getRealPath(String path)
>> + {
>> + HttpSession session = getSession();
>> + if(null == session) return null;
>> + return session.getServletContext().getRealPath(path);
>> + } + + public boolean isSecure()
>> + {
>> + String scheme = getScheme();
>> + if(null == scheme) return false;
>> + return scheme.equals("https");
>> + }
>> + + public String getLocalAddr()
>> + {
>> + return localAddr;
>> + }
>> + + public void setLocalAddr(String localAddr)
>> + {
>> + this.localAddr = localAddr;
>> + }
>> +
>> + public String getLocalName()
>> + {
>> + return localName;
>> + }
>> + + public void setLocalName(String localName)
>> + {
>> + this.localName = localName;
>> + }
>> +
>> + public int getLocalPort()
>> + {
>> + return localPort;
>> + }
>> + + public void setLocalPort(int localPort)
>> + {
>> + this.localPort = localPort;
>> + }
>> +
>> + public int getRemotePort()
>> + {
>> + return remotePort;
>> + }
>> +
>> + public void setRemotePort(int remotePort)
>> + {
>> + this.remotePort = remotePort;
>> + }
>> +}
>>
>> Added:
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>>
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java?view=auto&rev=554210
>>
>> ==============================================================================
>>
>> ---
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>> (added)
>> +++
>> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
>> Sat Jul 7 07:26:31 2007
>> @@ -0,0 +1,64 @@
>> +package org.apache.pluto.driver.url.impl;
>> +
>> +import junit.framework.TestCase;
>> +
>> +import org.apache.commons.logging.Log;
>> +import org.apache.commons.logging.LogFactory;
>> +import org.apache.pluto.driver.url.PortalURL;
>> +import org.apache.pluto.driver.url.PortalURLParser;
>> +
>> +/**
>> + * TestPortalURLParser.java
>> + * Unit Test for Defect PLUTO-361
>> + */
>> +public class TestPortalURLParser extends TestCase
>> +{
>> + private static final Log LOG = LogFactory.getLog(
>> TestPortalURLParser.class );
>> +
>> + private PortalURLParser parser;
>> + private MockHttpServletRequest request;
>> + private Throwable throwable = null;
>> +
>> + public void test_DefectPLUTO_361()
>> + {
>> + // This is a well formed request.
>> + this.request = new MockHttpServletRequest();
>> + this.request.setContextPath( "/pluto" );
>> + this.request.setRequestURI(
>> "/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0"
>> );
>> + this.request.setRequestURL(
>> "http://localhost:8080/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0"
>> );
>> + this.request.setQueryString(
>> "testId=0&org.apache.pluto.testsuite.PARAM_ACTION_KEY=org.apache.pluto.testsuite.ACTION_VALUE"
>> );
>> + this.request.setPathInfo( "/Test
>> Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
>> +
>> + try
>> + {
>> + PortalURL portalURL = this.parser.parse( this.request );
>> + } catch( Throwable t ) {
>> + this.throwable = t;
>> + LOG.error( "ERROR:", t );
>> + }
>> + assertNull( "No exception should be thrown", this.throwable );
>> + this.throwable = null;
>> +
>> + // Not so well formed request as per defect PLUTO-361
>> + this.request = new MockHttpServletRequest();
>> + this.request.setContextPath( "/pluto" );
>> + this.request.setRequestURI( "/pluto/portal/__" );
>> + this.request.setRequestURL(
>> "http://localhost:8080/pluto/portal/__" );
>> + this.request.setPathInfo( "/__" );
>> +
>> + try
>> + {
>> + PortalURL portalURL = this.parser.parse( this.request );
>> + } catch( Throwable t ) {
>> + this.throwable = t;
>> + LOG.error( "ERROR:", t );
>> + }
>> + assertNull( "No exception should be thrown", this.throwable );
>> + this.throwable = null;
>> + }
>> +
>> + protected void setUp() throws Exception
>> + {
>> + this.parser = PortalURLParserImpl.getParser();
>> + }
>> +}
>>
>>
>>
[ROLLBACK] : Re: svn commit: r554210 - in /portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src:
main/java/org/apache/pluto/driver/url/impl/ test/java/org/apache/pluto/driver/url/impl/
Posted by "David H. DeWolf" <dd...@apache.org>.
Craig,
Please roll back this commit. The String.contains(CharSequence) method
was not introduced until java 1.5. The 1.1 branch is not supposed to
rely on 1.5.
Of course, if you can fix the 1.5 dependencies without giving up the
included fix, that would be ideal, but 1.4 compat is more important than
the fix.
David
cdoremus@apache.org wrote:
> Author: cdoremus
> Date: Sat Jul 7 07:26:31 2007
> New Revision: 554210
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=554210
> Log:
> Fix for PLUTO-361. Thank you Marc Veary for the patch! Also applied trunk diffs in PortalURLParserImpl and RelativePortalURLImpl.
>
> Added:
> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
> Modified:
> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
> portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
>
> Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
> URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?view=diff&rev=554210&r1=554209&r2=554210
> ==============================================================================
> --- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java (original)
> +++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java Sat Jul 7 07:26:31 2007
> @@ -104,16 +104,16 @@
> String servletName = request.getServletPath();
>
> // Construct portal URL using info retrieved from servlet request.
> - PortalURL portalURL = new RelativePortalURLImpl(contextPath, servletName, this);
> + PortalURL portalURL = new RelativePortalURLImpl(contextPath, servletName);
>
> // Support added for filter. Should we seperate into a different impl?
> String pathInfo = request.getPathInfo();
> if (pathInfo == null) {
> - if(servletName.indexOf(".jsp") > 0 && !servletName.endsWith(".jsp")) {
> + if(servletName.contains(".jsp") && !servletName.endsWith(".jsp")) {
> int idx = servletName.indexOf(".jsp")+".jsp".length();
> pathInfo = servletName.substring(idx);
> servletName = servletName.substring(0, idx);
> - portalURL = new RelativePortalURLImpl(contextPath, servletName, this);
> + portalURL = new RelativePortalURLImpl(contextPath, servletName);
> } else {
> return portalURL;
> }
> @@ -154,7 +154,16 @@
> if (st.hasMoreTokens()) {
> value = st.nextToken();
> }
> - portalURL.addParameter(decodeParameter(token, value));
> +
> + // Defect PLUTO-361
> + // ADDED
> + PortalURLParameter param = decodeParameter( token, value );
> + if( param != null )
> + {
> + portalURL.addParameter( param );
> + }
> + // REMOVED
> + // portalURL.addParameter(decodeParameter(token, value));
> }
> }
> if (renderPath.length() > 0) {
> @@ -249,9 +258,9 @@
> // Fix for PLUTO-247 - check if query string contains parameters
> if ( query.length() > 1 ) {
> return buffer.append(query).toString();
> - } else {
> - return buffer.toString();
> }
> +
> + return buffer.toString();
> }
>
> private String encodeQueryParam(String param) {
> @@ -350,6 +359,13 @@
> if (LOG.isDebugEnabled()) {
> LOG.debug("Decoding parameter: name=" + name
> + ", value=" + value);
> + }
> +
> + // Defect PLUTO-361
> + // ADDED: if the length is less than this, there is no parameter...
> + if( name.length() < (PREFIX + PORTLET_ID).length() )
> + {
> + return null;
> }
>
> // Decode the name into window ID and parameter name.
>
> Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
> URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java?view=diff&rev=554210&r1=554209&r2=554210
> ==============================================================================
> --- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java (original)
> +++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java Sat Jul 7 07:26:31 2007
> @@ -16,20 +16,18 @@
> */
> package org.apache.pluto.driver.url.impl;
>
> -import java.util.Collection;
> -import java.util.Collections;
> -import java.util.HashMap;
> -import java.util.Iterator;
> -import java.util.Map;
> +import org.apache.pluto.driver.url.PortalURL;
> +import org.apache.pluto.driver.url.PortalURLParameter;
> +import org.apache.commons.logging.Log;
> +import org.apache.commons.logging.LogFactory;
>
> import javax.portlet.PortletMode;
> import javax.portlet.WindowState;
> -
> -import org.apache.commons.logging.Log;
> -import org.apache.commons.logging.LogFactory;
> -import org.apache.pluto.driver.url.PortalURL;
> -import org.apache.pluto.driver.url.PortalURLParameter;
> -import org.apache.pluto.driver.url.PortalURLParser;
> +import java.util.Map;
> +import java.util.HashMap;
> +import java.util.Collection;
> +import java.util.Collections;
> +import java.util.Iterator;
>
> /**
> * The portal URL.
> @@ -41,13 +39,7 @@
>
> private String servletPath;
> private String renderPath;
> - private String actionWindow;
> -
> - /**
> - * PortalURLParser used to construct the string
> - * representation of this portal url.
> - */
> - private PortalURLParser urlParser;
> + private String actionWindow;
>
> /** The window states: key is the window ID, value is WindowState. */
> private Map windowStates = new HashMap();
> @@ -61,14 +53,12 @@
> * Constructs a PortalURLImpl instance using customized port.
> * @param contextPath the servlet context path.
> * @param servletName the servlet name.
> - * @param urlParser the {@link PortalURLParser} used to construct a string representation of the url.
> */
> - public RelativePortalURLImpl(String contextPath, String servletName, PortalURLParser urlParser) {
> + public RelativePortalURLImpl(String contextPath, String servletName) {
> StringBuffer buffer = new StringBuffer();
> buffer.append(contextPath);
> buffer.append(servletName);
> servletPath = buffer.toString();
> - this.urlParser = urlParser;
> }
>
> /**
> @@ -167,7 +157,7 @@
> * @see PortalURLParserImpl#toString(org.apache.pluto.driver.url.PortalURL)
> */
> public String toString() {
> - return urlParser.toString(this);
> + return PortalURLParserImpl.getParser().toString(this);
> }
>
>
> @@ -200,7 +190,6 @@
> portalURL.windowStates = new HashMap(windowStates);
> portalURL.renderPath = renderPath;
> portalURL.actionWindow = actionWindow;
> - portalURL.urlParser = urlParser;
> return portalURL;
> }
> }
>
> Added: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java
> URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java?view=auto&rev=554210
> ==============================================================================
> --- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java (added)
> +++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/MockHttpServletRequest.java Sat Jul 7 07:26:31 2007
> @@ -0,0 +1,621 @@
> +package org.apache.pluto.driver.url.impl;
> +
> +import java.io.BufferedReader;
> +import java.io.IOException;
> +import java.io.UnsupportedEncodingException;
> +import java.security.Principal;
> +import java.util.ArrayList;
> +import java.util.Collections;
> +import java.util.Enumeration;
> +import java.util.HashMap;
> +import java.util.List;
> +import java.util.Locale;
> +import java.util.Map;
> +import java.util.Vector;
> +
> +import javax.servlet.RequestDispatcher;
> +import javax.servlet.ServletInputStream;
> +import javax.servlet.http.Cookie;
> +import javax.servlet.http.HttpServletRequest;
> +import javax.servlet.http.HttpSession;
> +
> +/**
> + * Copied from mockrunner 0.3.8
> + * Mock implementation of <code>HttpServletRequest</code>.
> + */
> +public class MockHttpServletRequest implements HttpServletRequest
> +{
> + private Map attributes;
> + private Map parameters;
> + private Vector locales;
> + private Map requestDispatchers;
> + private HttpSession session;
> + private String method;
> + private String authType;
> + private Map headers;
> + private String contextPath;
> + private String pathInfo;
> + private String pathTranslated;
> + private String queryString;
> + private StringBuffer requestUrl;
> + private String requestUri;
> + private String servletPath;
> + private Principal principal;
> + private String remoteUser;
> + private boolean requestedSessionIdIsFromCookie;
> + private String protocol;
> + private String serverName;
> + private int serverPort;
> + private String scheme;
> + private String remoteHost;
> + private String remoteAddr;
> + private Map roles;
> + private String characterEncoding;
> + private int contentLength;
> + private String contentType;
> + private List cookies;
> + private String localAddr;
> + private String localName;
> + private int localPort;
> + private int remotePort;
> + private boolean sessionCreated;
> +
> + public MockHttpServletRequest()
> + {
> + resetAll();
> + }
> +
> + /**
> + * Resets the state of this object to the default values
> + */
> + public void resetAll()
> + {
> + this.attributes = new HashMap();
> + this.parameters = new HashMap();
> + this.locales = new Vector();
> + this.requestDispatchers = new HashMap();
> + this.method = "GET";
> + headers = new HashMap();
> + requestedSessionIdIsFromCookie = true;
> + protocol = "HTTP/1.1";
> + serverName = "localhost";
> + serverPort = 8080;
> + scheme = "http";
> + remoteHost = "localhost";
> + remoteAddr = "127.0.0.1";
> + roles = new HashMap();
> + contentLength = -1;
> + cookies = new ArrayList();
> + localAddr = "127.0.0.1";
> + localName = "localhost";
> + localPort = 8080;
> + remotePort = 5000;
> + sessionCreated = false;
> + }
> +
> + public String getParameter(String key)
> + {
> + String[] values = getParameterValues(key);
> + if (null != values && 0 < values.length)
> + {
> + return values[0];
> + }
> + return null;
> + }
> +
> + public void clearParameters()
> + {
> + parameters.clear();
> + }
> +
> + public String[] getParameterValues(String key)
> + {
> + return (String[])parameters.get(key);
> + }
> +
> + public void setupAddParameter(String key, String[] values)
> + {
> + parameters.put(key, values);
> + }
> +
> + public void setupAddParameter(String key, String value)
> + {
> + setupAddParameter(key, new String[] { value });
> + }
> +
> + public Enumeration getParameterNames()
> + {
> + Vector parameterKeys = new Vector(parameters.keySet());
> + return parameterKeys.elements();
> + }
> +
> + public Map getParameterMap()
> + {
> + return Collections.unmodifiableMap(parameters);
> + }
> +
> + public void clearAttributes()
> + {
> + attributes.clear();
> + }
> +
> + public Object getAttribute(String key)
> + {
> + return attributes.get(key);
> + }
> +
> + public Enumeration getAttributeNames()
> + {
> + Vector attKeys = new Vector(attributes.keySet());
> + return attKeys.elements();
> + }
> +
> + public void removeAttribute(String key)
> + {
> + Object value = attributes.get(key);
> + attributes.remove(key);
> + if(null != value)
> + {
> + //callAttributeListenersRemovedMethod(key, value);
> + }
> + }
> +
> + public void setAttribute(String key, Object value)
> + {
> + Object oldValue = attributes.get(key);
> + if(null == value)
> + {
> + attributes.remove(key);
> + }
> + else
> + {
> + attributes.put(key, value);
> + }
> + //handleAttributeListenerCalls(key, value, oldValue);
> + }
> +
> + public HttpSession getSession()
> + {
> + sessionCreated = true;
> + return session;
> + }
> +
> + public HttpSession getSession(boolean create)
> + {
> + if(!create && !sessionCreated) return null;
> + return getSession();
> + }
> +
> + public void setSession(HttpSession session)
> + {
> + this.session = session;
> + }
> +
> + public RequestDispatcher getRequestDispatcher(String path)
> + {
> + return null;
> + }
> +
> + /**
> + * Returns the map of <code>RequestDispatcher</code> objects. The specified path
> + * maps to the corresponding <code>RequestDispatcher</code> object.
> + * @return the map of <code>RequestDispatcher</code> objects
> + */
> + public Map getRequestDispatcherMap()
> + {
> + return Collections.unmodifiableMap(requestDispatchers);
> + }
> +
> + /**
> + * Clears the map of <code>RequestDispatcher</code> objects.
> + */
> + public void clearRequestDispatcherMap()
> + {
> + requestDispatchers.clear();
> + }
> +
> + public void setRequestDispatcher(String path, RequestDispatcher dispatcher)
> + {
> + }
> +
> + public Locale getLocale()
> + {
> + if(locales.size() < 1) return Locale.getDefault();
> + return (Locale)locales.get(0);
> + }
> +
> + public Enumeration getLocales()
> + {
> + return locales.elements();
> + }
> +
> + public void addLocale(Locale locale)
> + {
> + locales.add(locale);
> + }
> +
> + public void addLocales(List localeList)
> + {
> + locales.addAll(localeList);
> + }
> +
> + public String getMethod()
> + {
> + return method;
> + }
> +
> + public void setMethod(String method)
> + {
> + this.method = method;
> + }
> +
> + public String getAuthType()
> + {
> + return authType;
> + }
> +
> + public void setAuthType(String authType)
> + {
> + this.authType = authType;
> + }
> +
> + public long getDateHeader(String key)
> + {
> + return -1;
> + }
> +
> + public String getHeader(String key)
> + {
> + List headerList = (List)headers.get(key);
> + if(null == headerList || 0 == headerList.size()) return null;
> + return (String)headerList.get(0);
> + }
> +
> + public Enumeration getHeaderNames()
> + {
> + return new Vector(headers.keySet()).elements();
> + }
> +
> + public Enumeration getHeaders(String key)
> + {
> + List headerList = (List)headers.get(key);
> + if(null == headerList) return null;
> + return new Vector(headerList).elements();
> + }
> +
> + public int getIntHeader(String key)
> + {
> + String header = getHeader(key);
> + if(null == header) return -1;
> + return new Integer(header).intValue();
> + }
> +
> + public void addHeader(String key, String value)
> + {
> + List valueList = (List) headers.get(key);
> + if (null == valueList)
> + {
> + valueList = new ArrayList();
> + headers.put(key, valueList);
> + }
> + valueList.add(value);
> + }
> +
> + public void setHeader(String key, String value)
> + {
> + List valueList = new ArrayList();
> + headers.put(key, valueList);
> + valueList.add(value);
> + }
> +
> + public void clearHeaders()
> + {
> + headers.clear();
> + }
> +
> + public String getContextPath()
> + {
> + return contextPath;
> + }
> +
> + public void setContextPath(String contextPath)
> + {
> + this.contextPath = contextPath;
> + }
> +
> + public String getPathInfo()
> + {
> + return pathInfo;
> + }
> +
> + public void setPathInfo(String pathInfo)
> + {
> + this.pathInfo = pathInfo;
> + }
> +
> + public String getPathTranslated()
> + {
> + return pathTranslated;
> + }
> +
> + public void setPathTranslated(String pathTranslated)
> + {
> + this.pathTranslated = pathTranslated;
> + }
> +
> + public String getQueryString()
> + {
> + return queryString;
> + }
> +
> + public void setQueryString(String queryString)
> + {
> + this.queryString = queryString;
> + }
> +
> + public String getRequestURI()
> + {
> + return requestUri;
> + }
> +
> + public void setRequestURI(String requestUri)
> + {
> + this.requestUri = requestUri;
> + }
> +
> + public StringBuffer getRequestURL()
> + {
> + return requestUrl;
> + }
> +
> + public void setRequestURL(String requestUrl)
> + {
> + this.requestUrl = new StringBuffer(requestUrl);
> + }
> +
> + public String getServletPath()
> + {
> + return servletPath;
> + }
> +
> + public void setServletPath(String servletPath)
> + {
> + this.servletPath = servletPath;
> + }
> +
> + public Principal getUserPrincipal()
> + {
> + return principal;
> + }
> +
> + public void setUserPrincipal(Principal principal)
> + {
> + this.principal = principal;
> + }
> +
> + public String getRemoteUser()
> + {
> + return remoteUser;
> + }
> +
> + public void setRemoteUser(String remoteUser)
> + {
> + this.remoteUser = remoteUser;
> + }
> +
> + public Cookie[] getCookies()
> + {
> + return (Cookie[])cookies.toArray(new Cookie[cookies.size()]);
> + }
> +
> + public void addCookie(Cookie cookie)
> + {
> + cookies.add(cookie);
> + }
> +
> + public String getRequestedSessionId()
> + {
> + HttpSession session = getSession();
> + if(null == session) return null;
> + return session.getId();
> + }
> +
> + public boolean isRequestedSessionIdFromCookie()
> + {
> + return requestedSessionIdIsFromCookie;
> + }
> +
> + public boolean isRequestedSessionIdFromUrl()
> + {
> + return isRequestedSessionIdFromURL();
> + }
> +
> + public boolean isRequestedSessionIdFromURL()
> + {
> + return !requestedSessionIdIsFromCookie;
> + }
> +
> + public void setRequestedSessionIdFromCookie(boolean requestedSessionIdIsFromCookie)
> + {
> + this.requestedSessionIdIsFromCookie = requestedSessionIdIsFromCookie;
> + }
> +
> + public boolean isRequestedSessionIdValid()
> + {
> + HttpSession session = getSession();
> + if(null == session) return false;
> + return true;
> + }
> +
> + public boolean isUserInRole(String role)
> + {
> + return ((Boolean)roles.get(role)).booleanValue();
> + }
> +
> + public void setUserInRole(String role, boolean isInRole)
> + {
> + roles.put(role, new Boolean(isInRole));
> + }
> +
> + public String getCharacterEncoding()
> + {
> + return characterEncoding;
> + }
> +
> + public void setCharacterEncoding(String characterEncoding) throws UnsupportedEncodingException
> + {
> + this.characterEncoding = characterEncoding;
> + }
> +
> + public int getContentLength()
> + {
> + return contentLength;
> + }
> +
> + public void setContentLength(int contentLength)
> + {
> + this.contentLength = contentLength;
> + }
> +
> + public String getContentType()
> + {
> + return contentType;
> + }
> +
> + public void setContentType(String contentType)
> + {
> + this.contentType = contentType;
> + }
> +
> + public String getProtocol()
> + {
> + return protocol;
> + }
> +
> + public void setProtocol(String protocol)
> + {
> + this.protocol = protocol;
> + }
> +
> + public String getServerName()
> + {
> + return serverName;
> + }
> +
> + public void setServerName(String serverName)
> + {
> + this.serverName = serverName;
> + }
> +
> + public int getServerPort()
> + {
> + return serverPort;
> + }
> +
> + public void setServerPort(int serverPort)
> + {
> + this.serverPort = serverPort;
> + }
> +
> + public String getScheme()
> + {
> + return scheme;
> + }
> +
> + public void setScheme(String scheme)
> + {
> + this.scheme = scheme;
> + }
> +
> + public String getRemoteAddr()
> + {
> + return remoteAddr;
> + }
> +
> + public void setRemoteAddr(String remoteAddr)
> + {
> + this.remoteAddr = remoteAddr;
> + }
> +
> + public String getRemoteHost()
> + {
> + return remoteHost;
> + }
> +
> + public void setRemoteHost(String remoteHost)
> + {
> + this.remoteHost = remoteHost;
> + }
> +
> + public BufferedReader getReader() throws IOException
> + {
> + return null;
> + }
> +
> + public ServletInputStream getInputStream() throws IOException
> + {
> + return null;
> + }
> +
> + public void setBodyContent(byte[] data)
> + {
> + }
> +
> + public void setBodyContent(String bodyContent)
> + {
> + }
> +
> + public String getRealPath(String path)
> + {
> + HttpSession session = getSession();
> + if(null == session) return null;
> + return session.getServletContext().getRealPath(path);
> + }
> +
> + public boolean isSecure()
> + {
> + String scheme = getScheme();
> + if(null == scheme) return false;
> + return scheme.equals("https");
> + }
> +
> + public String getLocalAddr()
> + {
> + return localAddr;
> + }
> +
> + public void setLocalAddr(String localAddr)
> + {
> + this.localAddr = localAddr;
> + }
> +
> + public String getLocalName()
> + {
> + return localName;
> + }
> +
> + public void setLocalName(String localName)
> + {
> + this.localName = localName;
> + }
> +
> + public int getLocalPort()
> + {
> + return localPort;
> + }
> +
> + public void setLocalPort(int localPort)
> + {
> + this.localPort = localPort;
> + }
> +
> + public int getRemotePort()
> + {
> + return remotePort;
> + }
> +
> + public void setRemotePort(int remotePort)
> + {
> + this.remotePort = remotePort;
> + }
> +}
>
> Added: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java
> URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java?view=auto&rev=554210
> ==============================================================================
> --- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java (added)
> +++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/url/impl/TestPortalURLParser.java Sat Jul 7 07:26:31 2007
> @@ -0,0 +1,64 @@
> +package org.apache.pluto.driver.url.impl;
> +
> +import junit.framework.TestCase;
> +
> +import org.apache.commons.logging.Log;
> +import org.apache.commons.logging.LogFactory;
> +import org.apache.pluto.driver.url.PortalURL;
> +import org.apache.pluto.driver.url.PortalURLParser;
> +
> +/**
> + * TestPortalURLParser.java
> + * Unit Test for Defect PLUTO-361
> + */
> +public class TestPortalURLParser extends TestCase
> +{
> + private static final Log LOG = LogFactory.getLog( TestPortalURLParser.class );
> +
> + private PortalURLParser parser;
> + private MockHttpServletRequest request;
> + private Throwable throwable = null;
> +
> + public void test_DefectPLUTO_361()
> + {
> + // This is a well formed request.
> + this.request = new MockHttpServletRequest();
> + this.request.setContextPath( "/pluto" );
> + this.request.setRequestURI( "/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
> + this.request.setRequestURL( "http://localhost:8080/pluto/portal//Test%20Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
> + this.request.setQueryString( "testId=0&org.apache.pluto.testsuite.PARAM_ACTION_KEY=org.apache.pluto.testsuite.ACTION_VALUE" );
> + this.request.setPathInfo( "/Test Page/__ac0x3testsuite0x2TestPortlet1!764587357|0" );
> +
> + try
> + {
> + PortalURL portalURL = this.parser.parse( this.request );
> + } catch( Throwable t ) {
> + this.throwable = t;
> + LOG.error( "ERROR:", t );
> + }
> + assertNull( "No exception should be thrown", this.throwable );
> + this.throwable = null;
> +
> + // Not so well formed request as per defect PLUTO-361
> + this.request = new MockHttpServletRequest();
> + this.request.setContextPath( "/pluto" );
> + this.request.setRequestURI( "/pluto/portal/__" );
> + this.request.setRequestURL( "http://localhost:8080/pluto/portal/__" );
> + this.request.setPathInfo( "/__" );
> +
> + try
> + {
> + PortalURL portalURL = this.parser.parse( this.request );
> + } catch( Throwable t ) {
> + this.throwable = t;
> + LOG.error( "ERROR:", t );
> + }
> + assertNull( "No exception should be thrown", this.throwable );
> + this.throwable = null;
> + }
> +
> + protected void setUp() throws Exception
> + {
> + this.parser = PortalURLParserImpl.getParser();
> + }
> +}
>
>
>