hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1232896 - in /httpcomponents/httpcore/trunk: ./ httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/ httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/ httpcore-nio/src/main/java/org/apache/http/nio/ httpcore-nio/src/main/java/o...
Date Wed, 18 Jan 2012 14:19:33 GMT
Author: olegk
Date: Wed Jan 18 14:19:32 2012
New Revision: 1232896

URL: http://svn.apache.org/viewvc?rev=1232896&view=rev
Log:
Updated NOTICE and javadocs

Added:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/package.html
      - copied, changed from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
Modified:
    httpcomponents/httpcore/trunk/NOTICE.txt
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/package.html
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html

Modified: httpcomponents/httpcore/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/NOTICE.txt?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/NOTICE.txt (original)
+++ httpcomponents/httpcore/trunk/NOTICE.txt Wed Jan 18 14:19:32 2012
@@ -1,5 +1,8 @@
 Apache HttpComponents Core
-Copyright 2005-2011 The Apache Software Foundation
+Copyright 2005-2012 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
\ No newline at end of file

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/package.html?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,7 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Basic implementations for interfaces in
+{@link org.apache.http.nio.pool org.apache.http.nio.pool}.
 </body>
 </html>

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/package.html?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,6 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Deprecated
 </body>
 </html>

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=1232896&r1=1232895&r2=1232896&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
Wed Jan 18 14:19:32 2012
@@ -30,19 +30,13 @@
 -->
 </head>
 <body>
-Representations for non-blocking HTTP message entities.
+Common HTTP entity implementations with extensions for 
+asynchronous (non-blocking) data transfer.
 
-An {@link org.apache.http.HttpEntity entity} is the optional content of a
-{@link org.apache.http.HttpMessage message}.
 This package provides a basic selection of entity implementations
 that can obtain content from
 {@link org.apache.http.nio.entity.NByteArrayEntity byte array},
 {@link org.apache.http.nio.entity.NStringEntity string},
 {@link org.apache.http.nio.entity.NFileEntity file}, or through an
-{@link org.apache.http.nio.entity.NHttpEntityWrapper compatibility adaptor}
-for blocking HTTP entities.
-If a message is received from an open non-blocking connection, usually it is
-represented by
-{@link org.apache.http.nio.entity.ConsumingNHttpEntity consuming} entity.
 </body>
 </html>

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html
Wed Jan 18 14:19:32 2012
@@ -30,10 +30,9 @@
 -->
 </head>
 <body>
-The core HTTP components based on non-blocking I/O model (HttpCore NIO).
+Core HTTP components based on the non-blocking I/O model.
 <p/>
 This layer defines interfaces for transferring HTTP messages over non-blocking
-HTTP connections and protocol handlers for processing HTTP messages
-asynchronously.
+HTTP connections and event handlers for processing HTTP messages asynchronously.
 </body>
 </html>

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/package.html?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,6 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Asynchronous (non-blocking) connection pool components.
 </body>
 </html>

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,6 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Asynchronous HTTP protocol handlers based on the non-blocking I/O model.
 </body>
 </html>

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
Wed Jan 18 14:19:32 2012
@@ -47,8 +47,19 @@ import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 
 /**
- * A decorator class intended to transparently extend an {@link IOSession}
- * with transport layer security capabilities based on the SSL/TLS protocol.
+ * <tt>SSLIOSession</tt> is a decorator class intended to transparently extend

+ * an {@link IOSession} with transport layer security capabilities based on 
+ * the SSL/TLS protocol.
+ * <p/>
+ * The resultant instance of <tt>SSLIOSession</tt> must be added to the original

+ * I/O session as an attribute with the {@link #SESSION_KEY} key.  
+ * <pre>
+ *  SSLContext sslcontext = SSLContext.getInstance("SSL");
+ *  sslcontext.init(null, null, null);
+ *  SSLIOSession sslsession = new SSLIOSession(
+ *      iosession, SSLMode.CLIENT, sslcontext, null);
+ *  iosession.setAttribute(SSLIOSession.SESSION_KEY, sslsession); 
+ * </pre>
  *
  * @since 4.2
  */
@@ -78,6 +89,14 @@ public class SSLIOSession implements IOS
     private volatile int status;
     private volatile boolean initialized;
 
+    /**
+     * Creates new instance of <tt>SSLIOSession</tt> class.
+     *  
+     * @param session I/O session to be decorated with the TLS/SSL capabilities.
+     * @param defaultMode default mode (client or server)
+     * @param sslContext SSL context to use for this I/O session.
+     * @param handler optional SSL setup handler. May be <code>null</code>.
+     */
     public SSLIOSession(
             final IOSession session,
             final SSLMode defaultMode,
@@ -123,10 +142,24 @@ public class SSLIOSession implements IOS
         return this.handler;
     }
 
+    /**
+     * Returns <code>true</code> is the session has been fully initialized, 
+     * <code>false</code> otherwise. 
+     */
     public boolean isInitialized() {
         return this.initialized;
     }
 
+    /**
+     * Initializes the session in the given {@link SSLMode}. This method 
+     * invokes the {@link SSLSetupHandler#initalize(SSLEngine)} callback
+     * if an instance of {@link SSLSetupHandler} was specified at 
+     * the construction time.
+     * 
+     * @param mode mode of operation (client or server).
+     * @throws SSLException in case of a SSL protocol exception.
+     * @throws IllegalStateException if the session has already been initialized.
+     */
     public synchronized void initialize(final SSLMode mode) throws SSLException {
         if (this.initialized) {
             throw new IllegalStateException("SSL I/O session already initialized");
@@ -150,6 +183,15 @@ public class SSLIOSession implements IOS
         doHandshake();
     }
 
+    /**
+     * Initializes the session in the default operation mode. This method 
+     * invokes the {@link SSLSetupHandler#initalize(SSLEngine)} callback
+     * if an instance of {@link SSLSetupHandler} was specified at 
+     * the construction time.
+     * 
+     * @throws SSLException in case of a SSL protocol exception.
+     * @throws IllegalStateException if the session has already been initialized.
+     */
     public void initialize() throws SSLException {
         initialize(this.defaultMode);
     }
@@ -312,6 +354,12 @@ public class SSLIOSession implements IOS
         return decrypted;
     }
 
+    /**
+     * Reads encrypted data and returns whether the channel associated with 
+     * this session has any decrypted inbound data available for reading.
+     *  
+     * @throws IOException in case of an I/O error.
+     */
     public synchronized boolean isAppInputReady() throws IOException {
         int bytesRead = receiveEncryptedData();
         if (bytesRead == -1) {
@@ -327,6 +375,9 @@ public class SSLIOSession implements IOS
     }
 
     /**
+     * Returns whether the channel associated with this session is ready to 
+     * accept outbound unecrypted data for writing.
+     *  
      * @throws IOException - not thrown currently
      */
     public synchronized boolean isAppOutputReady() throws IOException {
@@ -336,18 +387,39 @@ public class SSLIOSession implements IOS
     }
 
     /**
+     * Executes inbound SSL transport operations.
+     * 
      * @throws IOException - not thrown currently
      */
     public synchronized void inboundTransport() throws IOException {
         updateEventMask();
     }
 
+    /**
+     * Sends encrypted data and executes outbound SSL transport operations.
+     * 
+     * @throws IOException in case of an I/O error.
+     */
     public synchronized void outboundTransport() throws IOException {
         sendEncryptedData();
         doHandshake();
         updateEventMask();
     }
 
+    /**
+     * Returns whether the session will produce any more inbound data. 
+     */
+    public synchronized boolean isInboundDone() {
+        return this.sslEngine.isInboundDone();
+    }
+
+    /**
+     * Returns whether the session will accept any more outbound data. 
+     */
+    public synchronized boolean isOutboundDone() {
+        return this.sslEngine.isOutboundDone();
+    }
+
     private synchronized int writePlain(final ByteBuffer src) throws SSLException {
         if (src == null) {
             throw new IllegalArgumentException("Byte buffer may not be null");
@@ -371,10 +443,7 @@ public class SSLIOSession implements IOS
         }
     }
 
-    /**
-     * @throws SSLException - not thrown currently
-     */
-    private synchronized int readPlain(final ByteBuffer dst) throws SSLException {
+    private synchronized int readPlain(final ByteBuffer dst) {
         if (dst == null) {
             throw new IllegalArgumentException("Byte buffer may not be null");
         }
@@ -420,14 +489,6 @@ public class SSLIOSession implements IOS
         return this.status >= CLOSING;
     }
 
-    public synchronized boolean isInboundDone() {
-        return this.sslEngine.isInboundDone();
-    }
-
-    public synchronized boolean isOutboundDone() {
-        return this.sslEngine.isOutboundDone();
-    }
-
     public ByteChannel channel() {
         return this.channel;
     }

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/package.html?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,6 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Non-blocking TLS/SSL session implementation.
 </body>
 </html>

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/package.html?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,8 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Thread-safety annotations based on JCIP-ANNOTATIONS
+<br/>
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
 </body>
 </html>

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/package.html?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,6 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Common concurrency components.
 </body>
 </html>

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/package.html?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,7 @@
 -->
 </head>
 <body>
-Representations for HTTP message entities.
+Common HTTP entity implementations.
 
 An {@link org.apache.http.HttpEntity entity} is the optional content of a
 {@link org.apache.http.HttpMessage message}.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/package.html?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,7 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Basic implementations for interfaces in
+{@link org.apache.http.pool org.apache.http.pool}.
 </body>
 </html>

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/package.html?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/package.html Wed
Jan 18 14:19:32 2012
@@ -30,7 +30,7 @@
 -->
 </head>
 <body>
-The blocking I/O abstraction of the HTTP components.
+Blocking I/O session buffer, message parser / writer interfaces.
 <p/>
 This layer defines interfaces for transferring basic elements of
 HTTP messages over connections.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/package.html?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/package.html
Wed Jan 18 14:19:32 2012
@@ -30,14 +30,6 @@
 -->
 </head>
 <body>
-A selection of HTTP message implementations.
-
-There are basic implementations for HTTP requests
-{@link org.apache.http.message.BasicHttpEntityEnclosingRequest with}
-and {@link org.apache.http.message.BasicHttpRequest without}
-an entity, and for
-{@link org.apache.http.message.BasicHttpResponse responses}.
-
-
+Basic HTTP message implementations.
 </body>
 </html>

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/package.html?rev=1232896&r1=1232895&r2=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/package.html Wed
Jan 18 14:19:32 2012
@@ -30,7 +30,7 @@
 -->
 </head>
 <body>
-The core HTTP components (HttpCore).
+Core HTTP components based on the blocking I/O model.
 
 These deal with the fundamental things required for using the
 HTTP protocol, such as representing a

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/package.html
(from r1232562, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/package.html?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/package.html&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html&r1=1232562&r2=1232896&rev=1232896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/package.html
Wed Jan 18 14:19:32 2012
@@ -30,7 +30,6 @@
 -->
 </head>
 <body>
-Non-blocking HTTP protocol execution framework. This package contains protocol
-handler implementations based on NIO model.
+Synchronous (blocking) connection pool components.
 </body>
 </html>

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=1232896&r1=1232895&r2=1232896&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
Wed Jan 18 14:19:32 2012
@@ -30,8 +30,7 @@
 -->
 </head>
 <body>
-HTTP protocol execution framework. This package contains common protocol
-aspects implemented as protocol interceptors  as well as protocol handler
-implementations based on classic (blocking) I/O model.
+HTTP protocol execution framework and synchronous HTTP protocol handlers 
+based on the blocking I/O model.
 </body>
 </html>



Mime
View raw message