You are viewing a plain text version of this content. The canonical link for it is here.

Posted to pluto-scm@portals.apache.org by at...@apache.org on 2011/09/15 04:07:04 UTC

svn commit: r1170926 - /portals/pluto/branches/pluto-2.0.x/dist-build.xml

Author: ate
Date: Thu Sep 15 02:07:04 2011
New Revision: 1170926

URL: http://svn.apache.org/viewvc?rev=1170926&view=rev
Log:
PLUTO-611: Upgrade binary distribution to use latest Tomcat 7.0.21
See: http://issues.apache.org/jira/browse/PLUTO-611

Modified:
    portals/pluto/branches/pluto-2.0.x/dist-build.xml

Modified: portals/pluto/branches/pluto-2.0.x/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/dist-build.xml?rev=1170926&r1=1170925&r2=1170926&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/dist-build.xml (original)
+++ portals/pluto/branches/pluto-2.0.x/dist-build.xml Thu Sep 15 02:07:04 2011
@@ -45,7 +45,7 @@
 <project name="PlutoDistributions" default="bundle-dist">
 
     <property name="tomcat.major.version" value="6" description="Major version of Tomcat to deploy Pluto war files."/>
-    <property name="tomcat.full.version" value="6.0.26" description="Full version of Tomcat to deploy Pluto war files."/>
+    <property name="tomcat.full.version" value="6.0.33" description="Full version of Tomcat to deploy Pluto war files."/>
 
     <xmlproperty file="pom.xml"/> <!-- picks up pluto build version from pom file -->
     <property name="pluto.version" value="${project.version}" description="Version of Pluto to build"/>
@@ -125,10 +125,11 @@
             </fileset>
         </copy>
 
-         <!-- Add emptySessionPath="true" to Connector element in server.xml -->
-		<replace file="${dist.dir}/conf/server.xml"
-			token="redirectPort=&quot;8443&quot; /&gt;" 
-			value="redirectPort=&quot;8443&quot; emptySessionPath=&quot;true&quot; /&gt;" 
+         <!-- Add sessionCookiePath="/" to root Context in context.xml
+             (Tomcat 6.0.27+ replacement for emptySessionPath="true" attribute of Connector element in server.xml) -->
+		<replace file="${dist.dir}/conf/context.xml"
+			token="&lt;Context&gt;" 
+			value="&lt;Context sessionCookiePath=&quot;/&quot;&gt;" 
 			summary="true"
 		/>