You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2013/07/26 14:20:10 UTC
svn commit: r1507280 - in /httpcomponents/httpcore/trunk: httpcore-ab/
httpcore-nio/src/main/java/org/apache/http/nio/entity/
httpcore-nio/src/main/resources/org/apache/http/nio/ httpcore-osgi/
httpcore/src/main/java/org/apache/http/protocol/ httpcore/...
Author: sebb
Date: Fri Jul 26 12:20:10 2013
New Revision: 1507280
URL: http://svn.apache.org/r1507280
Log:
Trailing spaces tidyup
Modified:
httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html
httpcomponents/httpcore/trunk/httpcore-nio/src/main/resources/org/apache/http/nio/version.properties
httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html
httpcomponents/httpcore/trunk/httpcore/src/main/resources/org/apache/http/version.properties
httpcomponents/httpcore/trunk/src/docbkx/fundamentals.xml
httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml
Modified: httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/pom.xml?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/pom.xml Fri Jul 26 12:20:10 2013
@@ -38,7 +38,7 @@
AB clone based on HttpCore
</description>
<url>http://hc.apache.org/httpcomponents-core-ga</url>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<properties>
<!-- default compiler and surefire plugin settings for "java" profiles -->
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html Fri Jul 26 12:20:10 2013
@@ -30,7 +30,7 @@
-->
</head>
<body>
-Common HTTP entity implementations with extensions for
+Common HTTP entity implementations with extensions for
asynchronous (non-blocking) data transfer.
This package provides a basic selection of entity implementations
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/resources/org/apache/http/nio/version.properties
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/resources/org/apache/http/nio/version.properties?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/resources/org/apache/http/nio/version.properties (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/resources/org/apache/http/nio/version.properties Fri Jul 26 12:20:10 2013
@@ -14,7 +14,7 @@
# "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.
+# under the License.
#
info.module = Httpcore-nio
info.release = ${pom.version}
Modified: httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml Fri Jul 26 12:20:10 2013
@@ -1,5 +1,5 @@
<?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
@@ -39,7 +39,7 @@
HttpComponents Core (OSGi bundle)
</description>
<url>http://hc.apache.org/httpcomponents-core-ga</url>
- <packaging>bundle</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html Fri Jul 26 12:20:10 2013
@@ -30,7 +30,7 @@
-->
</head>
<body>
-HTTP protocol execution framework and synchronous HTTP protocol handlers
+HTTP protocol execution framework and synchronous HTTP protocol handlers
based on the blocking I/O model.
</body>
</html>
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/resources/org/apache/http/version.properties
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/resources/org/apache/http/version.properties?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/resources/org/apache/http/version.properties (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/resources/org/apache/http/version.properties Fri Jul 26 12:20:10 2013
@@ -14,7 +14,7 @@
# "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.
+# under the License.
#
info.module = httpcore
info.release = ${pom.version}
Modified: httpcomponents/httpcore/trunk/src/docbkx/fundamentals.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/docbkx/fundamentals.xml?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/docbkx/fundamentals.xml (original)
+++ httpcomponents/httpcore/trunk/src/docbkx/fundamentals.xml Fri Jul 26 12:20:10 2013
@@ -228,7 +228,7 @@ c3 = c
</listitem>
</itemizedlist>
<para>
- This distinction is important for connection management with incoming entities. For
+ This distinction is important for connection management with incoming entities. For
an application that creates entities and only sends them using the HttpCore framework,
the difference between streamed and self-contained is of little importance. In that
case, we suggest you consider non-repeatable entities as streamed, and those that
@@ -261,7 +261,7 @@ c3 = c
return once all content has been written to the given stream.
</para>
<para>
- The <classname>EntityUtils</classname> class exposes several static methods to read
+ The <classname>EntityUtils</classname> class exposes several static methods to read
more easily the content or information from an entity. Instead of reading
the <classname>java.io.InputStream</classname> directly, one can retrieve the complete
content body in a string or byte array by using the methods from this class.
@@ -401,7 +401,7 @@ if (entity != null) {
<section id="basic-entity">
<title><classname>BasicHttpEntity</classname></title>
<para>
- Exactly as the name implies, this basic entity represents an underlying stream.
+ Exactly as the name implies, this basic entity represents an underlying stream.
In general, use this class for entities received from HTTP messages.
</para>
<para>
@@ -424,7 +424,7 @@ myEntity.setContentLength(340); // sets
<title><classname>ByteArrayEntity</classname></title>
<para>
<classname>ByteArrayEntity</classname> is a self-contained, repeatable entity
- that obtains its content from a given byte array. Supply the byte array to the
+ that obtains its content from a given byte array. Supply the byte array to the
constructor.
</para>
<programlisting><![CDATA[
@@ -470,7 +470,7 @@ HttpEntity myEntity3 = new StringEntity(
read from the <classname>java.io.InputStream</classname>. If the length matches
the content length available on the input stream, then all data will be sent.
Alternatively, a negative content length will read all data from the input stream,
- which is the same as supplying the exact content length, so use the length to limit
+ which is the same as supplying the exact content length, so use the length to limit
the amount of data to read.
</para>
<programlisting><![CDATA[
@@ -482,7 +482,7 @@ InputStreamEntity myEntity = new InputSt
<title><classname>FileEntity</classname></title>
<para>
<classname>FileEntity</classname> is a self-contained, repeatable entity that
- obtains its content from a file. Use this mostly to stream large files of different
+ obtains its content from a file. Use this mostly to stream large files of different
types, where you need to supply the content type of the file, for
instance, sending a zip file would require the content type <literal>
application/zip</literal>, for XML <literal>application/xml</literal>.
@@ -510,7 +510,7 @@ HttpEntity entity = new FileEntity(stati
</para>
<para>
This makes it possible to make a repeatable entity, from a non-repeatable entity.
- If the supplied entity is already repeatable, it simply passes calls through to
+ If the supplied entity is already repeatable, it simply passes calls through to
the underlying entity.
</para>
<programlisting><![CDATA[
@@ -532,7 +532,7 @@ BufferedHttpEntity myBufferedEntity = ne
addresses.
</para>
<para>
- It is important to bear in mind that HTTP connections are not thread-safe. We strongly
+ It is important to bear in mind that HTTP connections are not thread-safe. We strongly
recommend limiting all interactions with HTTP connection objects to one thread. The only
method of <interfacename>HttpConnection</interfacename> interface and its sub-interfaces
which is safe to invoke from another thread is <methodname> HttpConnection#shutdown()
@@ -564,7 +564,7 @@ System.out.println(metrics.getSentBytesC
head, a message body may follow it. Please note it is very important to always
close the underlying content stream in order to signal that the processing of
the message is complete. HTTP entities that stream out their content directly from the
- input stream of the underlying connection must ensure they fully consume the content
+ input stream of the underlying connection must ensure they fully consume the content
of the message body for that connection to be potentially re-usable.
</para>
<para>
@@ -765,7 +765,7 @@ conn.sendResponseEntity(response);
<section>
<title><classname>RequestConnControl</classname></title>
<para>
- <classname>RequestConnControl</classname> is responsible for adding the
+ <classname>RequestConnControl</classname> is responsible for adding the
<literal>Connection</literal> header to the outgoing requests, which is essential
for managing persistence of <literal>HTTP/1.0</literal> connections. This
interceptor is recommended for client side protocol processors.
@@ -807,7 +807,7 @@ conn.sendResponseEntity(response);
<section>
<title><classname>RequestTargetHost</classname></title>
<para>
- <classname>RequestTargetHost</classname> is responsible for adding the
+ <classname>RequestTargetHost</classname> is responsible for adding the
<literal>Host</literal> header. This interceptor is required for client side
protocol processors.
</para>
@@ -815,7 +815,7 @@ conn.sendResponseEntity(response);
<section>
<title><classname>RequestUserAgent</classname></title>
<para>
- <classname>RequestUserAgent</classname> is responsible for adding the
+ <classname>RequestUserAgent</classname> is responsible for adding the
<literal>User-Agent</literal> header. This interceptor is recommended for client
side protocol processors.
</para>
@@ -823,7 +823,7 @@ conn.sendResponseEntity(response);
<section>
<title><classname>ResponseServer</classname></title>
<para>
- <classname>ResponseServer</classname> is responsible for adding the
+ <classname>ResponseServer</classname> is responsible for adding the
<literal>Server</literal> header. This interceptor is recommended for server side
protocol processors.
</para>
Modified: httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml?rev=1507280&r1=1507279&r2=1507280&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml (original)
+++ httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml Fri Jul 26 12:20:10 2013
@@ -871,15 +871,15 @@ if (encoder instanceof FileContentEncode
Triggered when the underlying channel is ready for reading a new portion of
the request entity through the corresponding content decoder. If the content
consumer is unable to process the incoming content, input event notifications can
- temporarily suspended using <interfacename>IOControl</interfacename> interface
+ temporarily suspended using <interfacename>IOControl</interfacename> interface
(super interface of <interfacename>NHttpServerConnection</interfacename>).
</para>
<para>
- Please note that the <interfacename>NHttpServerConnection</interfacename> and
- <interfacename>ContentDecoder</interfacename> objects are not thread-safe and
+ Please note that the <interfacename>NHttpServerConnection</interfacename> and
+ <interfacename>ContentDecoder</interfacename> objects are not thread-safe and
should only be used within the context of this method call. The <interfacename>
- IOControl</interfacename> object can be shared and used on other thread to resume
- input event notifications when the handler is capable of processing more content.
+ IOControl</interfacename> object can be shared and used on other thread to resume
+ input event notifications when the handler is capable of processing more content.
</para>
</formalpara>
</listitem>
@@ -903,11 +903,11 @@ if (encoder instanceof FileContentEncode
(super interface of <interfacename>NHttpServerConnection</interfacename>).
</para>
<para>
- Please note that the <interfacename>NHttpServerConnection</interfacename> and
- <interfacename>ContentEncoder</interfacename> objects are not thread-safe and
+ Please note that the <interfacename>NHttpServerConnection</interfacename> and
+ <interfacename>ContentEncoder</interfacename> objects are not thread-safe and
should only be used within the context of this method call. The <interfacename>
- IOControl</interfacename> object can be shared and used on other thread to resume
- output event notifications when more content is made available.
+ IOControl</interfacename> object can be shared and used on other thread to resume
+ output event notifications when more content is made available.
</para>
</formalpara>
</listitem>
@@ -947,8 +947,8 @@ if (encoder instanceof FileContentEncode
<formalpara>
<title><methodname>connected</methodname>:</title>
<para>
- Triggered when a new outgoing connection has been created. The attachment object
- passed as a parameter to this event is an arbitrary object that was attached to
+ Triggered when a new outgoing connection has been created. The attachment object
+ passed as a parameter to this event is an arbitrary object that was attached to
the session request.
</para>
</formalpara>
@@ -957,7 +957,7 @@ if (encoder instanceof FileContentEncode
<formalpara>
<title><methodname>requestReady</methodname>:</title>
<para>
- Triggered when the connection is ready to accept new HTTP request. The protocol
+ Triggered when the connection is ready to accept new HTTP request. The protocol
handler does not have to submit a request if it is not ready.
</para>
</formalpara>
@@ -967,17 +967,17 @@ if (encoder instanceof FileContentEncode
<title><methodname>outputReady</methodname>:</title>
<para>
Triggered when the underlying channel is ready for writing a next portion of the
- request entity through the corresponding content encoder. If the content producer
- is unable to generate the outgoing content, output event notifications can be
+ request entity through the corresponding content encoder. If the content producer
+ is unable to generate the outgoing content, output event notifications can be
temporarily suspended using <interfacename>IOControl</interfacename> interface
(super interface of <interfacename>NHttpClientConnection</interfacename>).
</para>
<para>
- Please note that the <interfacename>NHttpClientConnection</interfacename> and
- <interfacename>ContentEncoder</interfacename> objects are not thread-safe and
+ Please note that the <interfacename>NHttpClientConnection</interfacename> and
+ <interfacename>ContentEncoder</interfacename> objects are not thread-safe and
should only be used within the context of this method call. The <interfacename>
- IOControl</interfacename> object can be shared and used on other thread to resume
- output event notifications when more content is made available.
+ IOControl</interfacename> object can be shared and used on other thread to resume
+ output event notifications when more content is made available.
</para>
</formalpara>
</listitem>
@@ -997,17 +997,17 @@ if (encoder instanceof FileContentEncode
<title><methodname>inputReady</methodname>:</title>
<para>
Triggered when the underlying channel is ready for reading a new portion of the
- response entity through the corresponding content decoder. If the content consumer
- is unable to process the incoming content, input event notifications can be
- temporarily suspended using <interfacename>IOControl</interfacename> interface
+ response entity through the corresponding content decoder. If the content consumer
+ is unable to process the incoming content, input event notifications can be
+ temporarily suspended using <interfacename>IOControl</interfacename> interface
(super interface of <interfacename>NHttpClientConnection</interfacename>).
</para>
<para>
- Please note that the <interfacename>NHttpClientConnection</interfacename> and
- <interfacename>ContentDecoder</interfacename> objects are not thread-safe and
+ Please note that the <interfacename>NHttpClientConnection</interfacename> and
+ <interfacename>ContentDecoder</interfacename> objects are not thread-safe and
should only be used within the context of this method call. The <interfacename>
- IOControl</interfacename> object can be shared and used on other thread to resume
- input event notifications when the handler is capable of processing more content.
+ IOControl</interfacename> object can be shared and used on other thread to resume
+ input event notifications when the handler is capable of processing more content.
</para>
</formalpara>
</listitem>
@@ -1068,10 +1068,10 @@ if (encoder instanceof FileContentEncode
the entity to be incorrectly delimited.
</para>
<para>
- Please note that the <interfacename>ContentEncoder</interfacename> object is
- not thread-safe and should only be used within the context of this method call.
- The <interfacename>IOControl</interfacename> object can be shared and used on other
- thread resume output event notifications when more content is made available.
+ Please note that the <interfacename>ContentEncoder</interfacename> object is
+ not thread-safe and should only be used within the context of this method call.
+ The <interfacename>IOControl</interfacename> object can be shared and used on other
+ thread resume output event notifications when more content is made available.
</para>
</formalpara>
</listitem>
@@ -1405,10 +1405,10 @@ HttpAsyncRequestHandler<HttpRequest> rh
has been fully consumed.
</para>
<para>
- Please note that the <interfacename>ContentDecoder</interfacename> object
- is not thread-safe and should only be used within the context of this
- method call. The <interfacename>IOControl</interfacename> object can be
- shared and used on other thread to resume input event notifications
+ Please note that the <interfacename>ContentDecoder</interfacename> object
+ is not thread-safe and should only be used within the context of this
+ method call. The <interfacename>IOControl</interfacename> object can be
+ shared and used on other thread to resume input event notifications
when the consumer is capable of processing more content.
</para>
<para>
@@ -1520,11 +1520,11 @@ HttpAsyncRequestHandler<HttpRequest> rh
the entity to be incorrectly delimited.
</para>
<para>
- Please note that the <interfacename>ContentEncoder</interfacename> object
- is not thread-safe and should only be used within the context of this
- method call. The <interfacename>IOControl</interfacename> object can be
- shared and used on other thread resume output event notifications when
- more content is made available.
+ Please note that the <interfacename>ContentEncoder</interfacename> object
+ is not thread-safe and should only be used within the context of this
+ method call. The <interfacename>IOControl</interfacename> object can be
+ shared and used on other thread resume output event notifications when
+ more content is made available.
</para>
<para>
This event is invoked only for if the outgoing response message has
@@ -1710,11 +1710,11 @@ HttpResponse response = future.get();
the entity to be incorrectly delimited
</para>
<para>
- Please note that the <interfacename>ContentEncoder</interfacename> object
- is not thread-safe and should only be used within the context of this
- method call. The <interfacename>IOControl</interfacename> object can be
- shared and used on other thread resume output event notifications when
- more content is made available.
+ Please note that the <interfacename>ContentEncoder</interfacename> object
+ is not thread-safe and should only be used within the context of this
+ method call. The <interfacename>IOControl</interfacename> object can be
+ shared and used on other thread resume output event notifications when
+ more content is made available.
</para>
<para>
This event is invoked only for if the outgoing request message has
@@ -1808,10 +1808,10 @@ HttpResponse response = future.get();
has been fully consumed.
</para>
<para>
- Please note that the <interfacename>ContentDecoder</interfacename> object
- is not thread-safe and should only be used within the context of this
- method call. The <interfacename>IOControl</interfacename> object can be
- shared and used on other thread to resume input event notifications
+ Please note that the <interfacename>ContentDecoder</interfacename> object
+ is not thread-safe and should only be used within the context of this
+ method call. The <interfacename>IOControl</interfacename> object can be
+ shared and used on other thread to resume input event notifications
when the consumer is capable of processing more content.
</para>
<para>