Author: trustin
Date: Thu Sep 13 01:07:46 2007
New Revision: 575211
URL: http://svn.apache.org/viewvc?rev=575211&view=rev
Log:
* Renamed package org.apache.mina.http to org.apache.mina.filter.codec.http
* Merged util classes into the http package and adjusted their access modifiers.
Added:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/
- copied from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/AsyncHttpClientException.java
- copied, changed from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/AsyncHttpClientException.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/Cookie.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/Cookie.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateParseException.java
- copied, changed from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateParseException.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateUtil.java
- copied, changed from r575204,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateUtil.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/EncodingUtil.java
- copied, changed from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/EncodingUtil.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpMessage.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpMessage.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpProtocolCodecFactory.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpProtocolCodecFactory.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestMessage.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestMessage.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseDecoder.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseMessage.java
- copied, changed from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseMessage.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/LangUtils.java
- copied, changed from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/LangUtils.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/NameValuePair.java
- copied, changed from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/NameValuePair.java
mina/trunk/filter-codec-http/src/test/java/org/apache/mina/filter/
mina/trunk/filter-codec-http/src/test/java/org/apache/mina/filter/codec/
mina/trunk/filter-codec-http/src/test/java/org/apache/mina/filter/codec/http/
- copied from r575191,
mina/trunk/filter-codec-http/src/test/java/org/apache/mina/http/codec/
Removed:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/
mina/trunk/filter-codec-http/src/test/java/org/apache/mina/http/
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/HttpIoHandler.java
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java?rev=575211&r1=575210&r2=575211&view=diff
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java
Thu Sep 13 01:07:46 2007
@@ -23,10 +23,10 @@
import java.net.URL;
+import org.apache.mina.filter.codec.http.HttpRequestMessage;
+import org.apache.mina.filter.codec.http.HttpResponseMessage;
import org.apache.mina.http.client.AsyncHttpClient;
import org.apache.mina.http.client.AsyncHttpClientCallback;
-import org.apache.mina.http.codec.HttpRequestMessage;
-import org.apache.mina.http.codec.HttpResponseMessage;
/**
@@ -98,7 +98,7 @@
/**
* What to do when a response has come from the server
*
- * @see
org.apache.mina.http.client.AsyncHttpClientCallback#onResponse(org.apache.mina.http.codec.HttpResponseMessage)
+ * @see
org.apache.mina.http.client.AsyncHttpClientCallback#onResponse(org.apache.mina.filter.codec.http.HttpResponseMessage)
*/
public void onResponse( HttpResponseMessage message )
{
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/AsyncHttpClientException.java
(from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/AsyncHttpClientException.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/AsyncHttpClientException.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/AsyncHttpClientException.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/AsyncHttpClientException.java&r1=575191&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/AsyncHttpClientException.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/AsyncHttpClientException.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.util;
+package org.apache.mina.filter.codec.http;
/**
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/Cookie.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/Cookie.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/Cookie.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/Cookie.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/Cookie.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/Cookie.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/Cookie.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
import java.util.Date;
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateParseException.java
(from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateParseException.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateParseException.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateParseException.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateParseException.java&r1=575191&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateParseException.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateParseException.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.util;
+package org.apache.mina.filter.codec.http;
/**
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateUtil.java
(from r575204,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateUtil.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateUtil.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateUtil.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateUtil.java&r1=575204&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/DateUtil.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/DateUtil.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.util;
+package org.apache.mina.filter.codec.http;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -38,7 +38,7 @@
* @author Christopher Brown
* @author Michael Becke
*/
-public class DateUtil {
+class DateUtil {
/**
* Date format pattern used to parse HTTP date headers in RFC 1123 format.
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/EncodingUtil.java
(from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/EncodingUtil.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/EncodingUtil.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/EncodingUtil.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/EncodingUtil.java&r1=575191&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/EncodingUtil.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/EncodingUtil.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.util;
+package org.apache.mina.filter.codec.http;
import java.io.UnsupportedEncodingException;
@@ -33,7 +33,7 @@
*
* @since 2.0 final
*/
-public class EncodingUtil {
+class EncodingUtil {
final static Logger LOG = LoggerFactory.getLogger(EncodingUtil.class);
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
import java.io.IOException;
@@ -26,7 +26,6 @@
import java.util.Date;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.http.util.DateUtil;
/**
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpMessage.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpMessage.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpMessage.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpMessage.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpMessage.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpMessage.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpMessage.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
import java.io.ByteArrayOutputStream;
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.mina.http.util.NameValuePair;
/**
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpProtocolCodecFactory.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpProtocolCodecFactory.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpProtocolCodecFactory.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpProtocolCodecFactory.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpProtocolCodecFactory.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpProtocolCodecFactory.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpProtocolCodecFactory.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java
Thu Sep 13 01:07:46 2007
@@ -17,15 +17,13 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
import java.net.URL;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -34,8 +32,6 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-import org.apache.mina.http.util.EncodingUtil;
-import org.apache.mina.http.util.NameValuePair;
/**
@@ -46,29 +42,14 @@
*/
public class HttpRequestEncoder extends ProtocolEncoderAdapter
{
- private static final Set<Class<HttpRequestMessage>> TYPES;
private static final byte[] CRLF = new byte[]
{ 0x0D, 0x0A };
private static final String POST_CONTENT_TYPE =
"application/x-www-form-urlencoded";
private URL url;
- static
- {
- Set<Class<HttpRequestMessage>> types = new
HashSet<Class<HttpRequestMessage>>();
- types.add( HttpRequestMessage.class );
- TYPES = Collections.unmodifiableSet( types );
- }
-
-
public HttpRequestEncoder( URL url )
{
this.url = url;
- }
-
-
- Set<Class<HttpRequestMessage>> getMessageTypes()
- {
- return TYPES;
}
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestMessage.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestMessage.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestMessage.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestMessage.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestMessage.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestMessage.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestMessage.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
import java.net.ProtocolException;
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseDecoder.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseDecoder.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseDecoder.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
import org.apache.mina.common.ByteBuffer;
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseMessage.java
(from r575210,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseMessage.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseMessage.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseMessage.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseMessage.java&r1=575210&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpResponseMessage.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseMessage.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.codec;
+package org.apache.mina.filter.codec.http;
/**
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/LangUtils.java
(from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/LangUtils.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/LangUtils.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/LangUtils.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/LangUtils.java&r1=575191&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/LangUtils.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/LangUtils.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.util;
+package org.apache.mina.filter.codec.http;
/**
* A set of utility methods to help produce consistent Object#equals(Object)
and
@@ -26,7 +26,7 @@
* @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
*
*/
-public class LangUtils {
+class LangUtils {
public static final int HASH_SEED = 17;
public static final int HASH_OFFSET = 37;
Copied:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/NameValuePair.java
(from r575191,
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/NameValuePair.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/NameValuePair.java?p2=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/NameValuePair.java&p1=mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/NameValuePair.java&r1=575191&r2=575211&rev=575211&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/http/util/NameValuePair.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/NameValuePair.java
Thu Sep 13 01:07:46 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.util;
+package org.apache.mina.filter.codec.http;
import java.io.Serializable;
Modified:
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java?rev=575211&r1=575210&r2=575211&view=diff
==============================================================================
---
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java
(original)
+++
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java
Thu Sep 13 01:07:46 2007
@@ -30,10 +30,10 @@
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.codec.http.HttpProtocolCodecFactory;
+import org.apache.mina.filter.codec.http.HttpRequestMessage;
import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.http.client.ssl.TrustManagerFactoryImpl;
-import org.apache.mina.http.codec.HttpProtocolCodecFactory;
-import org.apache.mina.http.codec.HttpRequestMessage;
import org.apache.mina.transport.socket.nio.SocketConnector;
Modified:
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java?rev=575211&r1=575210&r2=575211&view=diff
==============================================================================
---
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java
(original)
+++
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java
Thu Sep 13 01:07:46 2007
@@ -20,7 +20,7 @@
package org.apache.mina.http.client;
-import org.apache.mina.http.codec.HttpResponseMessage;
+import org.apache.mina.filter.codec.http.HttpResponseMessage;
public interface AsyncHttpClientCallback
Modified:
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/HttpIoHandler.java
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/HttpIoHandler.java?rev=575211&r1=575210&r2=575211&view=diff
==============================================================================
---
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/HttpIoHandler.java
(original)
+++
mina/trunk/protocol-client-http/src/main/java/org/apache/mina/http/client/HttpIoHandler.java
Thu Sep 13 01:07:46 2007
@@ -22,8 +22,8 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.http.codec.HttpResponseDecoder;
-import org.apache.mina.http.codec.HttpResponseMessage;
+import org.apache.mina.filter.codec.http.HttpResponseDecoder;
+import org.apache.mina.filter.codec.http.HttpResponseMessage;
public class HttpIoHandler extends IoHandlerAdapter
Modified:
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java?rev=575211&r1=575210&r2=575211&view=diff
==============================================================================
---
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java
(original)
+++
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java
Thu Sep 13 01:07:46 2007
@@ -25,8 +25,8 @@
import java.net.URL;
import java.util.Arrays;
-import org.apache.mina.http.codec.HttpRequestMessage;
-import org.apache.mina.http.codec.HttpResponseMessage;
+import org.apache.mina.filter.codec.http.HttpRequestMessage;
+import org.apache.mina.filter.codec.http.HttpResponseMessage;
public class AsyncHttpClientTest extends AbstractTest
Modified:
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java?rev=575211&r1=575210&r2=575211&view=diff
==============================================================================
---
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java
(original)
+++
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java
Thu Sep 13 01:07:46 2007
@@ -26,8 +26,8 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
-import org.apache.mina.http.codec.HttpResponseDecoder;
-import org.apache.mina.http.codec.HttpResponseMessage;
+import org.apache.mina.filter.codec.http.HttpResponseDecoder;
+import org.apache.mina.filter.codec.http.HttpResponseMessage;
public class ChunkedTest extends TestCase
