You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/06/22 20:34:42 UTC

svn commit: r549925 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/

Author: dims
Date: Fri Jun 22 11:34:41 2007
New Revision: 549925

URL: http://svn.apache.org/viewvc?view=rev&rev=549925
Log:
s/Synapse/Axis2/g and added a TODO for Asankha - Asankha, what's the best fix here? for the workaround

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientWorker.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainClientIOEventDispatch.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainServerIOEventDispatch.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLClientIOEventDispatch.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLServerIOEventDispatch.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientWorker.java?view=diff&rev=549925&r1=549924&r2=549925
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientWorker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientWorker.java Fri Jun 22 11:34:41 2007
@@ -147,6 +147,7 @@
                 responseMsgCtx.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
                     MessageContext.DEFAULT_CHAR_SET_ENCODING);
             }
+            // TODO: FIXME:
             // workaround for Axis2 TransportUtils.createSOAPMessage() issue, where a response
             // of content type "text/xml" is thought to be REST if !MC.isServerSide(). This
             // question is still under debate and due to the timelines, I am commiting this

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java?view=diff&rev=549925&r1=549924&r2=549925
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java Fri Jun 22 11:34:41 2007
@@ -118,7 +118,7 @@
                 cfg.getProperty(HttpConnectionParams.STALE_CONNECTION_CHECK, 0) == 1)
             .setBooleanParameter(HttpConnectionParams.TCP_NODELAY,
                 cfg.getProperty(HttpConnectionParams.TCP_NODELAY, 1) == 1)
-            .setParameter(HttpProtocolParams.ORIGIN_SERVER, "Synapse-HttpComponents-NIO");
+            .setParameter(HttpProtocolParams.ORIGIN_SERVER, "Axis2-HttpComponents-NIO");
         return params;
     }
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java?view=diff&rev=549925&r1=549924&r2=549925
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java Fri Jun 22 11:34:41 2007
@@ -188,7 +188,7 @@
                 cfg.getProperty(HttpConnectionParams.STALE_CONNECTION_CHECK, 0) == 1)
             .setBooleanParameter(HttpConnectionParams.TCP_NODELAY,
                 cfg.getProperty(HttpConnectionParams.TCP_NODELAY, 1) == 1)
-            .setParameter(HttpProtocolParams.USER_AGENT, "Synapse-HttpComponents-NIO");
+            .setParameter(HttpProtocolParams.USER_AGENT, "Axis2-HttpComponents-NIO");
         return params;
     }
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainClientIOEventDispatch.java?view=diff&rev=549925&r1=549924&r2=549925
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainClientIOEventDispatch.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainClientIOEventDispatch.java Fri Jun 22 11:34:41 2007
@@ -27,7 +27,7 @@
 
 public class PlainClientIOEventDispatch implements IOEventDispatch {
 
-    private static final String NHTTP_CONN = "SYNAPSE.NHTTP_CONN";
+    private static final String NHTTP_CONN = "AXIS2.NHTTP_CONN";
     
     private final NHttpClientHandler handler;
     private final HttpParams params;

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainServerIOEventDispatch.java?view=diff&rev=549925&r1=549924&r2=549925
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainServerIOEventDispatch.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/PlainServerIOEventDispatch.java Fri Jun 22 11:34:41 2007
@@ -27,7 +27,7 @@
 
 public class PlainServerIOEventDispatch implements IOEventDispatch {
 
-    private static final String NHTTP_CONN = "SYNAPSE.NHTTP_CONN";
+    private static final String NHTTP_CONN = "AXIS2.NHTTP_CONN";
     
     private final NHttpServiceHandler handler;
     private final HttpParams params;

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLClientIOEventDispatch.java?view=diff&rev=549925&r1=549924&r2=549925
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLClientIOEventDispatch.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLClientIOEventDispatch.java Fri Jun 22 11:34:41 2007
@@ -35,8 +35,8 @@
 
 public class SSLClientIOEventDispatch implements IOEventDispatch {
 
-    private static final String NHTTP_CONN = "SYNAPSE.NHTTP_CONN";
-    private static final String SSL_SESSION = "SYNAPSE.SSL_SESSION";
+    private static final String NHTTP_CONN = "AXIS2.NHTTP_CONN";
+    private static final String SSL_SESSION = "AXIS2.SSL_SESSION";
 
     private final NHttpClientHandler handler;
     private final HttpParams params;

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLServerIOEventDispatch.java?view=diff&rev=549925&r1=549924&r2=549925
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLServerIOEventDispatch.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/SSLServerIOEventDispatch.java Fri Jun 22 11:34:41 2007
@@ -35,8 +35,8 @@
 
 public class SSLServerIOEventDispatch implements IOEventDispatch {
 
-    private static final String NHTTP_CONN = "SYNAPSE.NHTTP_CONN";
-    private static final String SSL_SESSION = "SYNAPSE.SSL_SESSION";
+    private static final String NHTTP_CONN = "AXIS2.NHTTP_CONN";
+    private static final String SSL_SESSION = "AXIS2.SSL_SESSION";
 
     private final NHttpServiceHandler handler;
     private final SSLContext sslcontext;



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