ate         2005/03/23 14:39:15

  Modified:    installer/src build.xml
  Log:
  Resolving http://issues.apache.org/jira/browse/JS2-210:
  Tomcat 4 is now no longer supported
  
  Revision  Changes    Path
  1.2       +3 -4      jakarta-jetspeed-2/installer/src/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/installer/src/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml 8 Dec 2004 16:57:02 -0000       1.1
  +++ build.xml 23 Mar 2005 22:39:15 -0000      1.2
  @@ -56,13 +56,12 @@
        </copy>
        
        <!-- Set up tomcat's local security -->
  -     <copy file="${basedir}/resources/jetspeed.xml" 
tofile="${tomcat.home}/conf/Catalina/localhost/jetspeed.xml" overwrite="true">
  +     <copy file="${basedir}/resources/jetspeed-tomcat-5.xml" 
tofile="${tomcat.home}/conf/Catalina/localhost/jetspeed.xml" overwrite="true">
           <filterset begintoken="@" endtoken="@">
           <filter token="USERNAME" value="${db.username}"/>
           <filter token="PASSWORD" value="${db.password}"/>
           <filter token="DRIVER" value="${jdbc.driver}"/>
           <filter token="URL" value="${db.url}"/>
  -        <filter token="USE_CONTEXTCLASSLOADER" value=""/>
         </filterset>
        </copy>
        
  @@ -84,7 +83,7 @@
                   in a test failure (TestSpringEngine)
                   This property therefore MUST remain defined EXACTLY as 
specified for this filter to be able to work
              -->
  -           <filterset begintoken="autodeployment.catalina.version.major" 
endtoken="4">
  +           <filterset begintoken="autodeployment.catalina.version.major" 
endtoken="5">
                <filter token="=" 
value="autodeployment.catalina.version.major=5"/>
              </filterset>
              <filterset begintoken="autodeployment.port" endtoken="8080">
  @@ -110,4 +109,4 @@
        
     </target>
   
  -</project>
  \ No newline at end of file
  +</project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to