Folded httpmime into httpclient proper
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1724977 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski
parent
16812c91a3
commit
fdfb2a894f
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -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.
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
|
|
@ -29,8 +29,6 @@ package org.apache.hc.client5.http.entity.mime;
|
|||
|
||||
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;
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -29,7 +29,6 @@ package org.apache.hc.client5.http.entity.mime;
|
|||
|
||||
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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -30,8 +30,6 @@ package org.apache.hc.client5.http.entity.mime;
|
|||
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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
147
httpmime/pom.xml
147
httpmime/pom.xml
|
|
@ -1,147 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
====================================================================
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
====================================================================
|
||||
|
||||
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 />.
|
||||
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcomponents-client</artifactId>
|
||||
<version>5.0-alpha1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>httpmime</artifactId>
|
||||
<name>Apache HttpClient Mime</name>
|
||||
<description>
|
||||
Apache HttpComponents HttpClient - MIME coded entities
|
||||
</description>
|
||||
<url>http://hc.apache.org/httpcomponents-client</url>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<!-- Not currently used
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.rat</groupId>
|
||||
<artifactId>apache-rat-plugin</artifactId>
|
||||
<version>${hc.rat.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<exclude>.externalToolBuilders/**</exclude>
|
||||
<exclude>maven-eclipse.xml</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>**/*.properties</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
</build>
|
||||
|
||||
<reporting>
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>${hc.javadoc.version}</version>
|
||||
<configuration>
|
||||
<!-- reduce console output. Can override with -Dquiet=false -->
|
||||
<quiet>true</quiet>
|
||||
<source>${maven.compiler.source}</source>
|
||||
<links>
|
||||
<link>http://docs.oracle.com/javase/6/docs/api/</link>
|
||||
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
|
||||
</links>
|
||||
</configuration>
|
||||
<reportSets>
|
||||
<reportSet>
|
||||
<reports>
|
||||
<report>javadoc</report>
|
||||
</reports>
|
||||
</reportSet>
|
||||
</reportSets>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||
<version>${hc.project-info.version}</version>
|
||||
<inherited>false</inherited>
|
||||
<reportSets>
|
||||
<reportSet>
|
||||
<reports>
|
||||
<report>dependencies</report>
|
||||
<report>dependency-info</report>
|
||||
<report>summary</report>
|
||||
</reports>
|
||||
</reportSet>
|
||||
</reportSets>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-jxr-plugin</artifactId>
|
||||
<version>${hc.jxr.version}</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-report-plugin</artifactId>
|
||||
<version>${hc.surefire-report.version}</version>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</reporting>
|
||||
|
||||
</project>
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
/*
|
||||
* ====================================================================
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* MIME body part implementations.
|
||||
*/
|
||||
package org.apache.hc.client5.http.entity.mime.content;
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
info.module = HttpMime
|
||||
info.release = ${pom.version}
|
||||
info.timestamp = ${mvn.timestamp}
|
||||
# timestamp requires Maven 2.1
|
||||
Loading…
Reference in New Issue