vmassol 2003/06/22 08:25:19
Modified: framework/src/java/share/org/apache/cactus/client/connector/http
JdkConnectionHelper.java
HttpClientConnectionHelper.java
Added: framework/src/java/share/org/apache/cactus/client/connector/http
HttpUtil.java
Removed: framework/src/java/share/org/apache/cactus/client/connector/http
AbstractConnectionHelper.java
Log:
- Added HttpUtil class for HTTP related utility methods
- Removed not eeded AbstractConnectionHelper class
Revision Changes Path
1.6 +5 -5
jakarta-cactus/framework/src/java/share/org/apache/cactus/client/connector/http/JdkConnectionHelper.java
Index: JdkConnectionHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/client/connector/http/JdkConnectionHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JdkConnectionHelper.java 22 Jun 2003 15:03:54 -0000 1.5
+++ JdkConnectionHelper.java 22 Jun 2003 15:25:19 -0000 1.6
@@ -85,7 +85,7 @@
*
* @version $Id$
*/
-public class JdkConnectionHelper extends AbstractConnectionHelper
+public class JdkConnectionHelper implements ConnectionHelper
{
/**
* The logger
@@ -133,7 +133,7 @@
}
// Add the parameters that need to be passed as part of the URL
- url = addParametersGet(theRequest, url);
+ url = HttpUtil.addHttpGetParameters(theRequest, url);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@@ -178,7 +178,7 @@
}
else
{
- addParametersPost(theRequest, connection);
+ addHttpPostParameters(theRequest, connection);
}
@@ -230,7 +230,7 @@
* redirector.
* @param theConnection the HTTP connection
*/
- private void addParametersPost(WebRequest theRequest,
+ private void addHttpPostParameters(WebRequest theRequest,
URLConnection theConnection)
{
// If no parameters, then exit
1.7 +5 -5
jakarta-cactus/framework/src/java/share/org/apache/cactus/client/connector/http/HttpClientConnectionHelper.java
Index: HttpClientConnectionHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/client/connector/http/HttpClientConnectionHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpClientConnectionHelper.java 22 Jun 2003 15:03:54 -0000 1.6
+++ HttpClientConnectionHelper.java 22 Jun 2003 15:25:19 -0000 1.7
@@ -86,7 +86,7 @@
*
* @version $Id$
*/
-public class HttpClientConnectionHelper extends AbstractConnectionHelper
+public class HttpClientConnectionHelper implements ConnectionHelper
{
/**
* The <code>HttpMethod</code> used to connect to the HTTP server. It is
@@ -126,7 +126,7 @@
}
// Add the parameters that need to be passed as part of the URL
- url = addParametersGet(theRequest, url);
+ url = HttpUtil.addHttpGetParameters(theRequest, url);
// Choose the method that we will use to post data :
// - If at least one parameter is to be sent in the request body, then
@@ -161,7 +161,7 @@
}
else
{
- addParametersPost(theRequest);
+ addHttpPostParameters(theRequest);
}
// Add the cookies
@@ -187,7 +187,7 @@
* @param theRequest the request containing all data to pass to the server
* redirector.
*/
- private void addParametersPost(WebRequest theRequest)
+ private void addHttpPostParameters(WebRequest theRequest)
{
// If no parameters, then exit
if (!theRequest.getParameterNamesPost().hasMoreElements())
1.1
jakarta-cactus/framework/src/java/share/org/apache/cactus/client/connector/http/HttpUtil.java
Index: HttpUtil.java
===================================================================
/*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Cactus" and "Apache Software
* Foundation" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.cactus.client.connector.http;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Enumeration;
import org.apache.cactus.WebRequest;
/**
* Utility methods to manipulate HTTP requests.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
* @version $Id: HttpUtil.java,v 1.1 2003/06/22 15:25:19 vmassol Exp $
* @since 1.5
*/
public class HttpUtil
{
/**
* Add HTTP GET parameters to the URL passed as parameter.
*
* @param theRequest the request containing the HTTP GET parameters to add
* @param theURL the URL that will be enriched with the HTTP GET parameters
* @return the enriched URL
* @exception MalformedURLException if the URL is malformed
*/
public static URL addHttpGetParameters(WebRequest theRequest, URL theURL)
throws MalformedURLException
{
// If no parameters, then exit
if (!theRequest.getParameterNamesGet().hasMoreElements())
{
return theURL;
}
StringBuffer queryString = new StringBuffer();
Enumeration keys = theRequest.getParameterNamesGet();
if (keys.hasMoreElements())
{
String key = (String) keys.nextElement();
String[] values = theRequest.getParameterValuesGet(key);
queryString.append(key);
queryString.append('=');
queryString.append(URLEncoder.encode(values[0]));
for (int i = 1; i < values.length; i++)
{
queryString.append('&');
queryString.append(key);
queryString.append('=');
queryString.append(URLEncoder.encode(values[i]));
}
}
while (keys.hasMoreElements())
{
String key = (String) keys.nextElement();
String[] values = theRequest.getParameterValuesGet(key);
for (int i = 0; i < values.length; i++)
{
queryString.append('&');
queryString.append(key);
queryString.append('=');
queryString.append(URLEncoder.encode(values[i]));
}
}
String file = theURL.getFile();
// Remove the trailing "/" if there is one
if (file.endsWith("/"))
{
file = file.substring(0, file.length() - 1);
}
if (theURL.toString().indexOf("?") > 0)
{
file = file + "&" + queryString.toString();
}
else
{
file = file + "?" + queryString.toString();
}
return new URL(theURL.getProtocol(), theURL.getHost(),
theURL.getPort(), file);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
