From 0f68582bfba6423535ab7d608cf5a3f475887f82 Mon Sep 17 00:00:00 2001
From: Roland Weber <rolandw@apache.org>
Date: Sat, 27 Jan 2007 14:27:33 +0000
Subject: [PATCH] changed package o.a.httpclient to o.a.http.client

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@500535 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                       | 17 +++++++----------
 .../client}/impl/AutoCloseInputStream.java      |  2 +-
 .../impl/DefaultResponseConsumedWatcher.java    |  2 +-
 .../client}/impl/ResponseConsumedWatcher.java   |  2 +-
 .../{httpclient => http/client}/TestAll.java    |  4 ++--
 .../client}/impl/TestAllHttpClientImpl.java     |  2 +-
 .../client}/impl/TestAutoCloseInputStream.java  |  2 +-
 .../TestDefaultResponseConsumedWatcher.java     |  2 +-
 8 files changed, 15 insertions(+), 18 deletions(-)
 rename src/java/org/apache/{httpclient => http/client}/impl/AutoCloseInputStream.java (99%)
 rename src/java/org/apache/{httpclient => http/client}/impl/DefaultResponseConsumedWatcher.java (98%)
 rename src/java/org/apache/{httpclient => http/client}/impl/ResponseConsumedWatcher.java (98%)
 rename src/test/org/apache/{httpclient => http/client}/TestAll.java (95%)
 rename src/test/org/apache/{httpclient => http/client}/impl/TestAllHttpClientImpl.java (97%)
 rename src/test/org/apache/{httpclient => http/client}/impl/TestAutoCloseInputStream.java (99%)
 rename src/test/org/apache/{httpclient => http/client}/impl/TestDefaultResponseConsumedWatcher.java (99%)

diff --git a/build.xml b/build.xml
index 172a90627..d916a4144 100644
--- a/build.xml
+++ b/build.xml
@@ -362,7 +362,7 @@ Output
         <java classname="junit.textui.TestRunner"
               fork="yes" failonerror="yes"
         >
-          <arg value="org.apache.httpclient.TestAll"/>
+          <arg value="org.apache.http.client.TestAll"/>
           <classpath>
             <path refid="classpath.client.compile"/>
             <pathelement location="${junit.jar}"/>
@@ -408,7 +408,6 @@ Output
         >
           <packageset dir="${comp.client.src}">
             <include name="org/apache/http/**" />
-            <include name="org/apache/httpclient/**" />
           </packageset>
 
           <group title="API">
@@ -418,13 +417,13 @@ Output
             <package name="org.apache.http.conn.ssl" />
             <package name="org.apache.http.cookie" />
             <package name="org.apache.http.cookie.params" />
-            <package name="org.apache.httpclient" />
+            <package name="org.apache.http.client" />
           </group>
           <group title="Implementation">
             <package name="org.apache.http.auth.impl*" />
             <package name="org.apache.http.conn.impl*" />
             <package name="org.apache.http.cookie.impl*" />
-            <package name="org.apache.httpclient.impl*" />
+            <package name="org.apache.http.client.impl*" />
           </group>
     
           <classpath refid="classpath.client.javadoc"/>
@@ -450,11 +449,9 @@ Output
         >
           <packageset dir="${comp.client.src}">
             <include name="org/apache/http/**" />
-            <include name="org/apache/httpclient/**" />
           </packageset>
           <packageset dir="${comp.client.xmpls}">
             <include name="org/apache/http/**" />
-            <include name="org/apache/httpclient/**" />
           </packageset>
           <packageset dir="${comp.client.contr}">
             <include name="org/apache/http/**" />
@@ -468,22 +465,22 @@ Output
             <package name="org.apache.http.conn.ssl" />
             <package name="org.apache.http.cookie" />
             <package name="org.apache.http.cookie.params" />
-            <package name="org.apache.httpclient" />
+            <package name="org.apache.http.client" />
           </group>
           <group title="Implementation">
             <package name="org.apache.http.auth.impl*" />
             <package name="org.apache.http.conn.impl*" />
             <package name="org.apache.http.cookie.impl*" />
-            <package name="org.apache.httpclient.impl*" />
+            <package name="org.apache.http.client.impl*" />
           </group>
 
           <group title="Examples">
             <package name="org.apache.http.examples*" />
-            <package name="org.apache.httpclient.examples*" />
+            <package name="org.apache.http.client.examples*" />
           </group>
           <group title="Contributions (unsupported)">
             <package name="org.apache.http.contrib*" />
-            <package name="org.apache.httpclient.contrib*" />
+            <package name="org.apache.http.client.contrib*" />
           </group>
     
           <classpath refid="classpath.client.javadoc"/>
diff --git a/src/java/org/apache/httpclient/impl/AutoCloseInputStream.java b/src/java/org/apache/http/client/impl/AutoCloseInputStream.java
similarity index 99%
rename from src/java/org/apache/httpclient/impl/AutoCloseInputStream.java
rename to src/java/org/apache/http/client/impl/AutoCloseInputStream.java
index d730209bf..32af14b29 100644
--- a/src/java/org/apache/httpclient/impl/AutoCloseInputStream.java
+++ b/src/java/org/apache/http/client/impl/AutoCloseInputStream.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.httpclient.impl;
+package org.apache.http.client.impl;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java b/src/java/org/apache/http/client/impl/DefaultResponseConsumedWatcher.java
similarity index 98%
rename from src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
rename to src/java/org/apache/http/client/impl/DefaultResponseConsumedWatcher.java
index a8b02bb96..bb22d6af8 100644
--- a/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
+++ b/src/java/org/apache/http/client/impl/DefaultResponseConsumedWatcher.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.httpclient.impl;
+package org.apache.http.client.impl;
 
 import java.io.IOException;
 
diff --git a/src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java b/src/java/org/apache/http/client/impl/ResponseConsumedWatcher.java
similarity index 98%
rename from src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java
rename to src/java/org/apache/http/client/impl/ResponseConsumedWatcher.java
index c15d6f999..6ad8bc80c 100644
--- a/src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java
+++ b/src/java/org/apache/http/client/impl/ResponseConsumedWatcher.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.httpclient.impl;
+package org.apache.http.client.impl;
 
 /**
  * When a response stream has been consumed, various parts of the HttpClient
diff --git a/src/test/org/apache/httpclient/TestAll.java b/src/test/org/apache/http/client/TestAll.java
similarity index 95%
rename from src/test/org/apache/httpclient/TestAll.java
rename to src/test/org/apache/http/client/TestAll.java
index a6a840fdc..f4908ea52 100644
--- a/src/test/org/apache/httpclient/TestAll.java
+++ b/src/test/org/apache/http/client/TestAll.java
@@ -28,12 +28,12 @@
  *
  */
 
-package org.apache.httpclient;
+package org.apache.http.client;
 
 import org.apache.http.cookie.TestAllCookie;
 import org.apache.http.cookie.impl.TestAllCookieImpl;
 import org.apache.http.conn.ssl.TestAllSSL;
-import org.apache.httpclient.impl.TestAllHttpClientImpl;
+import org.apache.http.client.impl.TestAllHttpClientImpl;
 
 import junit.framework.*;
 
diff --git a/src/test/org/apache/httpclient/impl/TestAllHttpClientImpl.java b/src/test/org/apache/http/client/impl/TestAllHttpClientImpl.java
similarity index 97%
rename from src/test/org/apache/httpclient/impl/TestAllHttpClientImpl.java
rename to src/test/org/apache/http/client/impl/TestAllHttpClientImpl.java
index 824afb2d9..dafc63e7c 100644
--- a/src/test/org/apache/httpclient/impl/TestAllHttpClientImpl.java
+++ b/src/test/org/apache/http/client/impl/TestAllHttpClientImpl.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.httpclient.impl;
+package org.apache.http.client.impl;
 
 import junit.framework.*;
 
diff --git a/src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java b/src/test/org/apache/http/client/impl/TestAutoCloseInputStream.java
similarity index 99%
rename from src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java
rename to src/test/org/apache/http/client/impl/TestAutoCloseInputStream.java
index f12a17ba7..d0b951186 100644
--- a/src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java
+++ b/src/test/org/apache/http/client/impl/TestAutoCloseInputStream.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.httpclient.impl;
+package org.apache.http.client.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java b/src/test/org/apache/http/client/impl/TestDefaultResponseConsumedWatcher.java
similarity index 99%
rename from src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
rename to src/test/org/apache/http/client/impl/TestDefaultResponseConsumedWatcher.java
index 277c9b0da..0dbcf5c86 100644
--- a/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
+++ b/src/test/org/apache/http/client/impl/TestDefaultResponseConsumedWatcher.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.httpclient.impl;
+package org.apache.http.client.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;