Return-Path: 
 <axis-cvs-return-27425-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 89057 invoked from network); 16 Mar 2008 17:37:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Mar 2008 17:37:41 -0000
Received: (qmail 85597 invoked by uid 500); 16 Mar 2008 17:37:38 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 85475 invoked by uid 500); 16 Mar 2008 17:37:37 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 85464 invoked by uid 500); 16 Mar 2008 17:37:37 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 85461 invoked by uid 99); 16 Mar 2008 17:37:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Mar 2008 10:37:37 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Mar 2008 17:36:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BC3301A9832; Sun, 16 Mar 2008 10:37:15 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r637615 - in /webservices/axis2/trunk/java/modules:
 kernel/pom.xml
 kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
 kernel/src/org/apache/axis2/transport/nhttp/ClientHandler.java
 parent/pom.xml samples/pom.xml
Date: Sun, 16 Mar 2008 17:37:14 -0000
To: axis2-cvs@ws.apache.org
From: dims@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080316173715.BC3301A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dims
Date: Sun Mar 16 10:36:55 2008
New Revision: 637615

URL: http://svn.apache.org/viewvc?rev=637615&view=rev
Log:
Fix for AXIS2-3614 -  Upgrade simple http and nhttp transports to HttpComponents Core 4.0-beta1

Modified:
    webservices/axis2/trunk/java/modules/kernel/pom.xml
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientHandler.java
    webservices/axis2/trunk/java/modules/parent/pom.xml
    webservices/axis2/trunk/java/modules/samples/pom.xml

Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?rev=637615&r1=637614&r2=637615&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Sun Mar 16 10:36:55 2008
@@ -140,40 +140,13 @@
                         <inherited>true</inherited>
                         <configuration>
                             <excludes>
-                                <exclude>**/*NIOSSL*.java</exclude>
-                                <exclude>**/HttpCoreNIOListener*.java</exclude>
-                                <exclude>**/SSLServerIOEventDispatch.java</exclude>
-                                <exclude>**/SSLClientIOEventDispatch.java</exclude>
+                                <exclude>**/nhttp/**</exclude>
                                 <exclude>**/XMPP*.java</exclude>
                             </excludes>
                         </configuration>
                     </plugin>
                 </plugins>
             </build>
-        </profile>
-        <profile>
-            <id>java15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore-niossl</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>java16</id>
-            <activation>
-                <jdk>1.6</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore-niossl</artifactId>
-                </dependency>
-            </dependencies>
         </profile>
     </profiles>
     <build>

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java?rev=637615&r1=637614&r2=637615&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Sun Mar 16 10:36:55 2008
@@ -50,8 +50,8 @@
 import org.apache.http.ProtocolVersion;
 import org.apache.http.RequestLine;
 import org.apache.http.UnsupportedHttpVersionException;
+import org.apache.http.params.DefaultedHttpParams;
 import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpParamsLinker;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
 
@@ -144,7 +144,8 @@
             if (requestLine != null) {
                 msgContext.setProperty(HTTPConstants.HTTP_METHOD, requestLine.getMethod());
             }
-            HttpParamsLinker.link(request, this.params);
+            request.setParams(
+                new DefaultedHttpParams(request.getParams(), this.params));
             ProtocolVersion ver = request.getRequestLine().getProtocolVersion();
             if (!ver.lessEquals(HttpVersion.HTTP_1_1)) {
                 // Downgrade protocol version if greater than HTTP/1.1 
@@ -153,13 +154,15 @@
 
             response = this.responseFactory.newHttpResponse
                     (ver, HttpStatus.SC_OK, context);
-            HttpParamsLinker.link(response, this.params);
+            response.setParams(
+                new DefaultedHttpParams(response.getParams(), this.params));
 
             if (request instanceof HttpEntityEnclosingRequest) {
                 if (((HttpEntityEnclosingRequest) request).expectContinue()) {
                     HttpResponse ack = this.responseFactory.newHttpResponse
                             (ver, HttpStatus.SC_CONTINUE, context);
-                    HttpParamsLinker.link(ack, this.params);
+                    ack.setParams(
+                        new DefaultedHttpParams(ack.getParams(), this.params));
                     conn.sendResponse(ack);
                     conn.flush();
                 }
@@ -204,7 +207,8 @@
             response = this.responseFactory.newHttpResponse
                     (HttpVersion.HTTP_1_0, HttpStatus.SC_INTERNAL_SERVER_ERROR,
                      context);
-            HttpParamsLinker.link(response, this.params);
+            response.setParams(
+                new DefaultedHttpParams(response.getParams(), this.params));
             handleException(ex, response);
             this.httpProcessor.process(response, context);
             conn.sendResponse(response);
@@ -329,7 +333,7 @@
 
     class SimpleHTTPRequestResponseTransport implements RequestResponseTransport {
 
-		private CountDownLatch responseReadySignal = new CountDownLatch(1);
+        private CountDownLatch responseReadySignal = new CountDownLatch(1);
         RequestResponseTransportStatus status = RequestResponseTransportStatus.WAITING;
         AxisFault faultToBeThrownOut = null;
         private boolean responseWritten = false;
@@ -363,12 +367,12 @@
         }
         
         public boolean isResponseWritten() {
-			return responseWritten;
-		}
+            return responseWritten;
+        }
 
-		public void setResponseWritten(boolean responseWritten) {
-			this.responseWritten = responseWritten;
-		}
+        public void setResponseWritten(boolean responseWritten) {
+            this.responseWritten = responseWritten;
+        }
 
     }
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientHandler.java?rev=637615&r1=637614&r2=637615&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientHandler.java Sun Mar 16 10:36:55 2008
@@ -47,8 +47,8 @@
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.NHttpClientConnection;
 import org.apache.http.nio.NHttpClientHandler;
+import org.apache.http.params.DefaultedHttpParams;
 import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpParamsLinker;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
@@ -140,7 +140,8 @@
             context.setAttribute(REQUEST_SOURCE_CHANNEL, axis2Req.getSourceChannel());
 
             HttpRequest request = axis2Req.getRequest();
-            HttpParamsLinker.link(request, this.params);
+            request.setParams(
+                new DefaultedHttpParams(request.getParams(), this.params));
             this.httpProcessor.process(request, context);
 
             conn.submitRequest(request);
@@ -174,7 +175,8 @@
             context.setAttribute(REQUEST_SOURCE_CHANNEL, axis2Req.getSourceChannel());
 
             HttpRequest request = axis2Req.getRequest();
-            HttpParamsLinker.link(request, this.params);
+            request.setParams(
+                new DefaultedHttpParams(request.getParams(), this.params));
             this.httpProcessor.process(request, context);
 
             conn.submitRequest(request);

Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=637615&r1=637614&r2=637615&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sun Mar 16 10:36:55 2008
@@ -113,7 +113,7 @@
         <geronimo.spec.stax.version>1.0.1</geronimo.spec.stax.version>
         <geronimo.spec.jms.version>1.1</geronimo.spec.jms.version>
         <groovy.all.version>1.0</groovy.all.version>
-        <httpcore.version>4.0-alpha6</httpcore.version>
+        <httpcore.version>4.0-beta1</httpcore.version>
         <intellij.version>5.0</intellij.version>
         <jalopy.version>1.5rc3</jalopy.version>
         <jaxb.api.version>2.1</jaxb.api.version>

Modified: webservices/axis2/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/pom.xml?rev=637615&r1=637614&r2=637615&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/pom.xml Sun Mar 16 10:36:55 2008
@@ -137,30 +137,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>java15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore-niossl</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>java16</id>
-            <activation>
-                <jdk>1.6</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore-niossl</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
     <build>
         <sourceDirectory>src</sourceDirectory>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org