1.1 --- a/tomcat5.bundled/build.xml	Thu Jun 03 08:52:40 2004 +0000
     1.2 +++ b/tomcat5.bundled/build.xml	Thu Jun 03 13:36:08 2004 +0000
     1.3 @@ -15,7 +15,7 @@
     1.4  <project name="tomcatint-tomcat5-bundled" basedir="." default="netbeans">
     1.5    <import file="../../../nbbuild/default.xml"/> 
     1.6  
     1.7 -  <property name="tomcat.filename" value="jakarta-tomcat-5.0.24"/>
     1.8 +  <property name="tomcat.filename" value="jakarta-tomcat-5.0.25"/>
     1.9  
    1.10    <target name="init" depends="default.init">
    1.11      <ant dir="${nb_all}/tomcatint/external" target="unscramble"/>
    1.12 @@ -42,9 +42,9 @@
    1.13      <unzip src="../../external/${tomcat.filename}.zip" dest="${netbeans.dest.dir}/${cluster.dir}" />
    1.14      <!-- monitor -->
    1.15      <copy file="${schema2beans/rt.dir}/${nb.modules.dir}/org-netbeans-modules-schema2beans.jar" 
    1.16 -          tofile="${netbeans.dest.dir}/${cluster.dir}/jakarta-tomcat-5.0.24/common/lib/schema2beans.jar"/>
    1.17 +          tofile="${netbeans.dest.dir}/${cluster.dir}/jakarta-tomcat-5.0.25/common/lib/schema2beans.jar"/>
    1.18      <copy file="${monitor.dir}/${nb.modules.dir}/ext/httpmonitor.jar"
    1.19 -          tofile="${netbeans.dest.dir}/${cluster.dir}/jakarta-tomcat-5.0.24/common/lib/httpmonitor.jar"/>
    1.20 +          tofile="${netbeans.dest.dir}/${cluster.dir}/jakarta-tomcat-5.0.25/common/lib/httpmonitor.jar"/>
    1.21      <chmod perm="ugo+x">
    1.22        <fileset dir="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/bin">
    1.23          <include name="*.sh"/>

     2.1 --- a/tomcat5.bundled/src/org/netbeans/modules/tomcat5/bundled/Bundle.properties	Thu Jun 03 08:52:40 2004 +0000
     2.2 +++ b/tomcat5.bundled/src/org/netbeans/modules/tomcat5/bundled/Bundle.properties	Thu Jun 03 13:36:08 2004 +0000
     2.3 @@ -13,5 +13,5 @@
     2.4  OpenIDE-Module-Name=Bundled Tomcat 5 Server
     2.5  OpenIDE-Module-Display-Category=Web
     2.6  OpenIDE-Module-Short-Description=Tomcat 5 server software distributed with the IDE.
     2.7 -OpenIDE-Module-Long-Description=This module adds the Tomcat 5.0.24 server to the IDE distribution, facilitating out-of-the-box experience when developing web applications.
     2.8 +OpenIDE-Module-Long-Description=This module adds the Tomcat 5.0.25 server to the IDE distribution, facilitating out-of-the-box experience when developing web applications.
     2.9  

     3.1 --- a/tomcat5.bundled/src/org/netbeans/modules/tomcat5/bundled/layer.xml	Thu Jun 03 08:52:40 2004 +0000
     3.2 +++ b/tomcat5.bundled/src/org/netbeans/modules/tomcat5/bundled/layer.xml	Thu Jun 03 13:36:08 2004 +0000
     3.3 @@ -18,7 +18,7 @@
     3.4      <folder name="J2EE">
     3.5          <folder name="InstalledServers">
     3.6              <file name="Tomcat_instance">
     3.7 -                <attr name="url" stringvalue="tomcat:home=jakarta-tomcat-5.0.24:base=jakarta-tomcat-5.0.24_base"/>
     3.8 +                <attr name="url" stringvalue="tomcat:home=jakarta-tomcat-5.0.25:base=jakarta-tomcat-5.0.25_base"/>
     3.9                  <attr name="host" stringvalue="localhost"/>
    3.10                  <attr name="server_port" stringvalue="8084"/>
    3.11                  <attr name="admin_port" stringvalue="8025"/>