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 de...@apache.org on 2007/02/12 09:22:28 UTC

svn commit: r506367 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: ./ transport/http/ transport/http/server/

Author: deepal
Date: Mon Feb 12 00:22:27 2007
New Revision: 506367

URL: http://svn.apache.org/viewvc?view=rev&rev=506367
Log:
- made the changes as suggested in AXIS2-2042

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java?view=diff&rev=506367&r1=506366&r2=506367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java Mon Feb 12 00:22:27 2007
@@ -220,6 +220,7 @@
      */
     public static final String COOKIE_STRING = "Cookie";
     public static final String SESSION_COOKIE = "axis_session";
+    public static final String SESSION_COOKIE_JSESSIONID = "JSESSIONID";
 
     /**
      * Addressing Constants

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?view=diff&rev=506367&r1=506366&r2=506367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Mon Feb 12 00:22:27 2007
@@ -241,7 +241,8 @@
             HeaderElement[] elements = cookieHeaders[i].getElements();
             for (int e = 0; e < elements.length; e++) {
                 HeaderElement element = elements[e];
-                if (Constants.SESSION_COOKIE.equalsIgnoreCase(element.getName())) {
+                if (Constants.SESSION_COOKIE.equalsIgnoreCase(element.getName())||
+                        Constants.SESSION_COOKIE_JSESSIONID.equalsIgnoreCase(element.getName())) {
                     sessionCookie = element.getValue();
                 }
             }
@@ -252,7 +253,8 @@
             HeaderElement[] elements = cookieHeaders[i].getElements();
             for (int e = 0; e < elements.length; e++) {
                 HeaderElement element = elements[e];
-                if (Constants.SESSION_COOKIE.equalsIgnoreCase(element.getName())) {
+                if (Constants.SESSION_COOKIE.equalsIgnoreCase(element.getName())||
+                        Constants.SESSION_COOKIE_JSESSIONID.equalsIgnoreCase(element.getName())) {
                     sessionCookie = element.getValue();
                 }
             }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java?view=diff&rev=506367&r1=506366&r2=506367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java Mon Feb 12 00:22:27 2007
@@ -148,7 +148,7 @@
         Object cookieString = msgContext.getProperty(HTTPConstants.COOKIE_STRING);
         if (cookieString != null) {
             StringBuffer buffer = new StringBuffer();
-            buffer.append(Constants.SESSION_COOKIE);
+            buffer.append(Constants.SESSION_COOKIE_JSESSIONID);
             buffer.append("=");
             buffer.append(cookieString);
             postMethod.setRequestHeader(HTTPConstants.HEADER_COOKIE, buffer.toString());

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java?view=diff&rev=506367&r1=506366&r2=506367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java Mon Feb 12 00:22:27 2007
@@ -57,7 +57,8 @@
             HeaderElement[] elements = headers[i].getElements();
             for (int e = 0; e < elements.length; e++) {
                 HeaderElement element = elements[e];
-                if (Constants.SESSION_COOKIE.equalsIgnoreCase(element.getName())) {
+                if (Constants.SESSION_COOKIE.equalsIgnoreCase(element.getName())||
+                        Constants.SESSION_COOKIE_JSESSIONID.equalsIgnoreCase(element.getName())) {
                     sessionCookie = element.getValue();
                 }
             }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java?view=diff&rev=506367&r1=506366&r2=506367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java Mon Feb 12 00:22:27 2007
@@ -65,7 +65,7 @@
             CharArrayBuffer buffer1 = new CharArrayBuffer(sessionCookie.length() + 40);
             buffer1.append(HTTPConstants.HEADER_SET_COOKIE);
             buffer1.append(": ");
-            buffer1.append(Constants.SESSION_COOKIE);
+            buffer1.append(Constants.SESSION_COOKIE_JSESSIONID);
             buffer1.append("=");
             buffer1.append(sessionCookie);
             response.addHeader(new BufferedHeader(buffer1));
@@ -74,7 +74,7 @@
             CharArrayBuffer buffer2 = new CharArrayBuffer(sessionCookie.length() + 50);
             buffer2.append(HTTPConstants.HEADER_SET_COOKIE2);
             buffer2.append(": ");
-            buffer2.append(Constants.SESSION_COOKIE);
+            buffer2.append(Constants.SESSION_COOKIE_JSESSIONID);
             buffer2.append("=");
             buffer2.append(sessionCookie);
             buffer2.append("; ");



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