svn commit: r938061 - in /ofbiz/trunk: ./ framework/base/lib/j2eespecs/ framework/catalina/lib/ framework/catalina/src/org/ofbiz/catalina/container/

[erwan]

Author: erwan
Date: Mon Apr 26 14:33:43 2010
New Revision: 938061

URL: http://svn.apache.org/viewvc?rev=938061&view=rev
Log:
Migration to Tomcat 6.0.26. Tests are running well

Added:
    ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar   (with props)
    ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar   (with props)
    ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar   (with props)
    ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-el.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-jdt.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar   (with props)
Removed:
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-el.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=938061&r1=938060&r2=938061&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon Apr 26 14:33:43 2010
@@ -73,10 +73,10 @@
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
@@ -104,15 +104,15 @@
     <classpathentry kind="lib" path="framework/birt/lib/saaj.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/scriptapi.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-el.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-catalina.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-jasper-el.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-jasper-jdt.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>

Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-el.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-el.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-el.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-jdt.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-jdt.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-jdt.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar?rev=938061&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=938061&r1=938060&r2=938061&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java Mon Apr 26 14:33:43 2010
@@ -114,7 +114,7 @@ public class CrossSubdomainSessionValve
                     if (value.indexOf(cookie.getName()) >= 0) {
                         StringBuffer buffer = new StringBuffer();
                         ServerCookie.appendCookieValue(buffer, newCookie.getVersion(), newCookie.getName(), newCookie.getValue(), newCookie.getPath(),
-                                newCookie.getDomain(), newCookie.getComment(), newCookie.getMaxAge(), newCookie.getSecure());
+                                newCookie.getDomain(), newCookie.getComment(), newCookie.getMaxAge(), newCookie.getSecure(), true);
                         Debug.logVerbose("CrossSubdomainSessionValve: old Set-Cookie value: " + value.toString(), module);
                         Debug.logVerbose("CrossSubdomainSessionValve: new Set-Cookie value: " + buffer, module);
                         value.setString(buffer.toString());