cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: xml-cocoon2 build.xml
Date Sun, 23 Feb 2003 15:14:33 GMT
stefano     2003/02/23 07:14:33

  Modified:    .        build.xml
  Log:
  removed the 'run' target which had several drawbacks:
  1) even without dependencies, running ant before jetty is slow
  2) ant remains idle and uses some 10mb of memory for nothing
  3) ant intercepts the CTRL-C signals and jetty cannot shutdown properly
  
  The functionality is moved into the new 'cocoon' launch system that is
  landing right after this
  
  Revision  Changes    Path
  1.328     +8 -37     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.327
  retrieving revision 1.328
  diff -u -r1.327 -r1.328
  --- build.xml	22 Feb 2003 19:37:18 -0000	1.327
  +++ build.xml	23 Feb 2003 15:14:32 -0000	1.328
  @@ -186,10 +186,12 @@
              nowarn="${compiler.nowarn}"
              compiler="${compiler}"
              classpathref="classpath">
  -      <src path="${java}"/>
  -      <src path="${build.src}"/>
  -      <!-- [FIXME] THIS DEPENDENCY SHOULD GO AWAY!!!! -->
  -      <src path="${deprecated.src}"/>
  +         <src>
  +          <!-- [FIXME] THE DEPENDENCY ON DEPRECATED SHOULD GO AWAY!!!! -->
  +          <path location="${deprecated.src}"/>
  +          <path location="${build.src}"/>
  +          <path location="${java}"/>
  +         </src>
       </javac>
     </target>
   
  @@ -621,37 +623,6 @@
       </jar>
     </target>
   
  -<!-- Run targets =========================================================== -->
  -
  -  <target name="run" depends="init">
  -    <dirname property="antfile.dir" file="${ant.file}"/>
  -
  -    <echo message="-------------------------------------------------------------"/>
  -    <echo message="Starting Jetty:"/>
  -    <echo message="  - make sure to have executed the webapp target before"/>
  -    <echo message="  - browse to http://localhost:8888/"/>
  -    <echo message="-------------------------------------------------------------"/>
  -
  -    <java classname="org.mortbay.jetty.Server" dir="${tools.jetty}" fork="yes" failonerror="yes">
  -       <classpath>
  -         <fileset dir="${tools.jetty}/lib">
  -           <include name="*.jar"/>
  -         </fileset>
  -         <fileset dir="${lib.endorsed}">
  -           <include name="*.jar"/>
  -         </fileset>
  -       </classpath>
  -
  -       <jvmarg value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${antfile.dir}/${lib.endorsed}"/>
  -
  -       <sysproperty key="webapp" value="${antfile.dir}/${build.webapp}"/>
  -       <sysproperty key="org.xml.sax.parser" value="org.apache.xerces.parsers.SAXParser"/>
  -       <sysproperty key="jetty.port" value="${tools.jetty.port}"/>
  -
  -       <arg line="./conf/jettyconf.xml"/>
  -    </java>
  -  </target>
  -
   <!-- Validation targets ==================================================== -->
   
     <!-- Check if all the JAR files are properly declared in lib/jars.xml    -->
  @@ -938,7 +909,7 @@
     </target>
   
     <!-- Clean the distribution -->
  -  <target name="distclean" depends="clean">
  +  <target name="distclean" depends="clean,clean-webapp">
       <delete dir="${build.root}"/>
       <delete dir="${tools.tasks}"/>
       <delete file="${dist}/${Name}-${version}.tar.gz"/>
  
  
  

Mime
View raw message