hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724977 - in /httpcomponents/httpclient/trunk: ./ httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/ httpclient/src/examples/org/apache/hc/client5/http/examples/ httpclient/src/main/java/org/apache/hc/client5/http/entity/m...
Date Sat, 16 Jan 2016 14:08:14 GMT
Author: olegk
Date: Sat Jan 16 14:08:13 2016
New Revision: 1724977

URL: http://svn.apache.org/viewvc?rev=1724977&view=rev
Log:
Folded httpmime into httpclient proper

Added:
    httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java
      - copied, changed from r1724976, httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java
      - copied, changed from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java
      - copied, changed from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java
      - copied, changed from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java
      - copied unchanged from r1724949, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java
      - copied, changed from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java
Removed:
    httpcomponents/httpclient/trunk/httpmime/
Modified:
    httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
    httpcomponents/httpclient/trunk/pom.xml

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java?rev=1724977&r1=1724976&r2=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
Sat Jan 16 14:08:13 2016
@@ -39,8 +39,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
-import org.apache.hc.client5.http.entity.mime.content.ByteArrayBody;
-import org.apache.hc.client5.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.entity.mime.ByteArrayBody;
+import org.apache.hc.client5.http.entity.mime.StringBody;
 import org.apache.hc.client5.http.methods.HttpPost;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.ContentType;

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java
(from r1724976, httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java&p1=httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java&r1=1724976&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java
Sat Jan 16 14:08:13 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.entity.mime;
+package org.apache.hc.client5.http.examples;
 
 import java.io.File;
 
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
-import org.apache.hc.client5.http.entity.mime.content.FileBody;
-import org.apache.hc.client5.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.entity.mime.FileBody;
+import org.apache.hc.client5.http.entity.mime.StringBody;
 import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.sync.HttpClients;
 import org.apache.hc.client5.http.methods.CloseableHttpResponse;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java
(from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java&r1=1724949&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java
Sat Jan 16 14:08:13 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.nio.charset.Charset;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java
Sat Jan 16 14:08:13 2016
@@ -36,7 +36,6 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import org.apache.hc.client5.http.entity.mime.content.ContentBody;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.ByteArrayBuffer;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java
Sat Jan 16 14:08:13 2016
@@ -24,12 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.hc.client5.http.entity.mime.MIME;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java
(from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java&r1=1724949&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java
Sat Jan 16 14:08:13 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.IOException;
 import java.io.OutputStream;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java
(from r1724949, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java&r1=1724949&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java
Sat Jan 16 14:08:13 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime;
 
 /**
  * Represents common content properties.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java
Sat Jan 16 14:08:13 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,7 +33,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.hc.client5.http.entity.mime.MIME;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
Sat Jan 16 14:08:13 2016
@@ -27,7 +27,6 @@
 
 package org.apache.hc.client5.http.entity.mime;
 
-import org.apache.hc.client5.http.entity.mime.content.ContentBody;
 import org.apache.hc.core5.util.Args;
 
 /**

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java
Sat Jan 16 14:08:13 2016
@@ -29,8 +29,6 @@ package org.apache.hc.client5.http.entit
 
 import java.util.List;
 
-import org.apache.hc.client5.http.entity.mime.content.AbstractContentBody;
-import org.apache.hc.client5.http.entity.mime.content.ContentBody;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java
Sat Jan 16 14:08:13 2016
@@ -25,13 +25,12 @@
  *
  */
 
-package org.apache.hc.client5.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.hc.client5.http.entity.mime.MIME;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
Sat Jan 16 14:08:13 2016
@@ -35,11 +35,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.hc.client5.http.entity.mime.content.ByteArrayBody;
-import org.apache.hc.client5.http.entity.mime.content.ContentBody;
-import org.apache.hc.client5.http.entity.mime.content.FileBody;
-import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
-import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.entity.ContentType;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java&p1=httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java
Sat Jan 16 14:08:13 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -36,7 +36,6 @@ import java.io.Reader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.hc.client5.http.entity.mime.MIME;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java&p1=httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java
Sat Jan 16 14:08:13 2016
@@ -29,7 +29,6 @@ package org.apache.hc.client5.http.entit
 
 import java.io.File;
 
-import org.apache.hc.client5.http.entity.mime.content.FileBody;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.junit.Assert;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java&p1=httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java
Sat Jan 16 14:08:13 2016
@@ -31,8 +31,6 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.hc.client5.http.entity.mime.content.FileBody;
-import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.junit.Assert;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java&p1=httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java
Sat Jan 16 14:08:13 2016
@@ -30,8 +30,6 @@ package org.apache.hc.client5.http.entit
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
-import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.junit.Assert;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java&p1=httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java
Sat Jan 16 14:08:13 2016
@@ -36,9 +36,6 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
-import org.apache.hc.client5.http.entity.mime.content.FileBody;
-import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
-import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.junit.After;
 import org.junit.Assert;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java
(from r1724967, httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java&p1=httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java&r1=1724967&r2=1724977&rev=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java
Sat Jan 16 14:08:13 2016
@@ -31,7 +31,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.NameValuePair;

Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1724977&r1=1724976&r2=1724977&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Sat Jan 16 14:08:13 2016
@@ -151,7 +151,6 @@
 
   <modules>
     <module>httpclient</module>
-    <module>httpmime</module>
     <module>fluent-hc</module>
     <module>httpclient-cache</module>
     <module>httpclient-win</module>



Mime
View raw message