pnever      2003/01/15 08:36:55

  Modified:    .        build.xml
  Log:
  Adapted to changes in the src/wrappers structure
  
  Revision  Changes    Path
  1.177     +6 -6      jakarta-slide/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/build.xml,v
  retrieving revision 1.176
  retrieving revision 1.177
  diff -u -r1.176 -r1.177
  --- build.xml 18 Dec 2002 15:59:41 -0000      1.176
  +++ build.xml 15 Jan 2003 16:36:54 -0000      1.177
  @@ -900,7 +900,7 @@
       <!-- This target requires the JMX libraries                              -->
       <!-- =================================================================== -->
       <target name="jmx-wrapper" depends="wrappers" if="jmx.present">
  -        <copy file="src/wrappers/jmx/mbeans-descriptors.xml" 
tofile="${slide.build}/classes/wrappers/jmx/mbeans-descriptors.xml"/>
  +        <copy file="src/wrappers/wrappers/jmx/mbeans-descriptors.xml" 
tofile="${slide.build}/classes/wrappers/jmx/mbeans-descriptors.xml"/>
           <jar jarfile="${slide.dist}/slide/wrappers/slide-jmxwrapper.jar" 
basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF">
               <include name="wrappers/jmx/**"/>
           </jar>
  @@ -921,7 +921,7 @@
               </fileset>
           </copy>
           <copy todir="${slide.build}/classes/wrappers/catalina">
  -            <fileset dir="src/wrappers/catalina">
  +            <fileset dir="src/wrappers/wrappers/catalina">
                   <include name="slide-descriptors.xml"/>
               </fileset>
           </copy>
  @@ -975,9 +975,9 @@
           <copy file="${slide.dist}/slide/wrappers/slide-catalinawrapper.jar" 
tofile="${slide.dist}/server/server/lib/slide-catalinawrapper.jar"/>
           <copy file="${slide.dist}/slide/wrappers/slide-jndiwrapper.jar" 
tofile="${slide.dist}/server/server/lib/slide-jndiwrapper.jar"/>
           <copy file="${slide.dist}/slide/wrappers/slide-jmxwrapper.jar" 
tofile="${slide.dist}/server/server/lib/slide-jmxwrapper.jar"/>
  -        <copy file="src/wrappers/catalina/server.xml" 
tofile="${slide.dist}/server/conf/server.xml" overwrite="yes"/>
  +        <copy file="src/wrappers/wrappers/catalina/server.xml" 
tofile="${slide.dist}/server/conf/server.xml" overwrite="yes"/>
           <copy todir="${slide.dist}/server/conf">
  -            <fileset dir="src/wrappers/catalina/conf">
  +            <fileset dir="src/wrappers/wrappers/catalina/conf">
         </fileset>
           </copy>
           <mkdir dir="${slide.dist}/server/webapps"/>
  @@ -987,7 +987,7 @@
           <mkdir dir="${slide.dist}/server/slide"/>
           <mkdir dir="${slide.dist}/server/temp"/>
           <!-- Welcome web application -->
  -        <war warfile="${slide.dist}/server/slide/slide-welcome.war" 
webxml="src/wrappers/catalina/root/WEB-INF/web.xml" 
basedir="src/wrappers/catalina/root">
  +        <war warfile="${slide.dist}/server/slide/slide-welcome.war" 
webxml="src/wrappers/wrappers/catalina/root/WEB-INF/web.xml" 
basedir="src/wrappers/wrappers/catalina/root">
               <zipfileset dir="${struts.lib}" prefix="WEB-INF">
                   <include name="struts-bean.tld"/>
                   <include name="struts-html.tld"/>
  @@ -1012,7 +1012,7 @@
           <!-- Slide documentation -->
           <copy file="${slide.dist}/slide/webapp/slide-doc.war" 
tofile="${slide.dist}/server/webapps/slide-doc.war"/>
           <!-- WebDAV view of the server -->
  -        <war warfile="${slide.dist}/server/slide/slide-webdav.war" 
webxml="src/wrappers/catalina/web.xml">
  +        <war warfile="${slide.dist}/server/slide/slide-webdav.war" 
webxml="src/wrappers/wrappers/catalina/web.xml">
       </war>
           <!-- Slide manager -->
           <copy file="${slide.dist}/slide/webapp/slide-admin.war" 
tofile="${slide.dist}/server/slide/slide-admin.war"/>
  
  
  

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

Reply via email to