[Ecforms-commit] ECF-JSF build.xml,1.2,1.3

[Francisco C. <fca...@us...>]

Update of /cvsroot/ecforms/ECF-JSF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19546

Modified Files:
	build.xml 
Log Message:
Added task descriptions, filters for appbase property, zip and tgz release files

Index: build.xml
===================================================================
RCS file: /cvsroot/ecforms/ECF-JSF/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	18 Nov 2005 01:22:55 -0000	1.2
--- build.xml	18 Nov 2005 18:47:48 -0000	1.3
***************
*** 8,20 ****
      <property name="webapps" value="${tomcat.home}/webapps"/>
      <property name="dist.war" value="${app.name}.war"/>
!     <property name="doc.dir" value="doc"/>
      <property name="dist.dir" value="dist"/>
      <property name="build.dir" value="build"/>
  
!     <target name="components">
          <ant dir="components"/>
      </target>
  
!     <target name="prepare" depends="components">
          <mkdir dir="${deploy.home}"/>
          <mkdir dir="${deploy.home}/WEB-INF"/>
--- 8,24 ----
      <property name="webapps" value="${tomcat.home}/webapps"/>
      <property name="dist.war" value="${app.name}.war"/>
!     <property name="doc.dir" value="docs"/>
      <property name="dist.dir" value="dist"/>
      <property name="build.dir" value="build"/>
  
!     <target name="components" description="Build JSF components">
          <ant dir="components"/>
      </target>
  
!     <filterset id="filters">
!         <filter token="app.name" value="${app.name}"/>
!     </filterset>
! 
!     <target name="prepare" depends="components" description="Create working directories">
          <mkdir dir="${deploy.home}"/>
          <mkdir dir="${deploy.home}/WEB-INF"/>
***************
*** 23,26 ****
--- 27,31 ----
          <copy todir="${deploy.home}/WEB-INF">
              <fileset dir="config"/>
+             <filterset refid="filters"/>
          </copy>
          <copy todir="${deploy.home}">
***************
*** 29,32 ****
--- 34,38 ----
          <copy todir="${deploy.home}/WEB-INF/ipl">
              <fileset dir="ipl" includes="**/*.ipl"/>
+             <filterset refid="filters"/>
          </copy>
          <mkdir dir="${deploy.home}/WEB-INF/classes"/>
***************
*** 34,37 ****
--- 40,44 ----
              <fileset dir="src" includes="**/*.ipl"/>
              <fileset dir="src" includes="**/*.properties"/>
+             <filterset refid="filters"/>
          </copy>
          <mkdir dir="${deploy.home}/WEB-INF/lib"/>
***************
*** 50,54 ****
      </target>
  
!     <target name="clean">
          <ant dir="components" target="clean"/>
          <delete dir="${deploy.home}"/>
--- 57,61 ----
      </target>
  
!     <target name="clean" description="Clean working directories">
          <ant dir="components" target="clean"/>
          <delete dir="${deploy.home}"/>
***************
*** 68,72 ****
      </path>
  
!     <target name="compile" depends="prepare">
          <javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes"
              debug="on" optimize="off" deprecation="on" source="1.4">
--- 75,79 ----
      </path>
  
!     <target name="compile" depends="prepare" description="Compile Java source files">
          <javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes"
              debug="on" optimize="off" deprecation="on" source="1.4">
***************
*** 75,79 ****
      </target>
  
!     <target name="compiletests" depends="compile">
          <javac srcdir="tests" destdir="build.tests"
              debug="on" optimize="off" deprecation="on" source="1.4">
--- 82,86 ----
      </target>
  
!     <target name="compiletests" depends="compile" description="Compile JUnit test files">
          <javac srcdir="tests" destdir="build.tests"
              debug="on" optimize="off" deprecation="on" source="1.4">
***************
*** 82,89 ****
          <copy todir="build.tests/WEB-INF/ipl">
              <fileset dir="ipl" includes="**/*.ipl"/>
          </copy>
      </target>
  
!     <target name="test" depends="compiletests">
          <junit printsummary="no" haltonfailure="yes" showoutput="yes">
              <formatter type="plain"/>
--- 89,97 ----
          <copy todir="build.tests/WEB-INF/ipl">
              <fileset dir="ipl" includes="**/*.ipl"/>
+             <filterset refid="filters"/>
          </copy>
      </target>
  
!     <target name="test" depends="compiletests" description="Run JUnit tests">
          <junit printsummary="no" haltonfailure="yes" showoutput="yes">
              <formatter type="plain"/>
***************
*** 93,102 ****
      </target>
  
!     <target name="javadoc" depends="prepare">
          <javadoc sourcepath="src" destdir="${doc.dir}" packagenames="com.nexus.*"
              source="1.4" classpathref="project.class.path"/>
      </target>
  
!     <target name="ecf-jar" depends="compile,test">
          <jar jarfile="${dist}.jar" basedir="${deploy.home}/WEB-INF/classes"/>
      </target>
--- 101,110 ----
      </target>
  
!     <target name="javadoc" depends="prepare" description="Generate JavaDoc">
          <javadoc sourcepath="src" destdir="${doc.dir}" packagenames="com.nexus.*"
              source="1.4" classpathref="project.class.path"/>
      </target>
  
!     <target name="ecf-jar" depends="compile,test" description="Bundle Java classes and IPL files in a jar file">
          <jar jarfile="${dist}.jar" basedir="${deploy.home}/WEB-INF/classes"/>
      </target>
***************
*** 104,112 ****
      <target name="all" depends="clean,prepare,compile,javadoc,ecf-jar"/>
  
!     <target name="package" depends="prepare,compile,test">
          <jar jarfile="${dist.dir}/${dist.war}" basedir="${deploy.home}"/>
      </target>
  
!     <target name="generate-dist" depends="ecf-jar">
          <mkdir dir="${dist}"/>
          <copy file="build_projects.xml" tofile="${dist}/build.xml"/>
--- 112,120 ----
      <target name="all" depends="clean,prepare,compile,javadoc,ecf-jar"/>
  
!     <target name="package" depends="prepare,compile,test" description="Generate WAR file">
          <jar jarfile="${dist.dir}/${dist.war}" basedir="${deploy.home}"/>
      </target>
  
!     <target name="generate-dist" depends="ecf-jar" description="Create compressed files for distribution">
          <mkdir dir="${dist}"/>
          <copy file="build_projects.xml" tofile="${dist}/build.xml"/>
***************
*** 131,141 ****
              </fileset>
          </copy>
      </target>
  
!     <target name="run-ipl">
          <java classpathref="project.class.path" jar="lib/ipl.jar" fork="true"/>
      </target>
  
!     <target name="run-idb">
          <java classpathref="project.class.path" classname="com.ienjinia.db.DBUI" fork="true">
              <arg line="-g /tmp/ECFDB"/>
--- 139,152 ----
              </fileset>
          </copy>
+         <zip destfile="${dist.dir}/${dist}.zip" basedir="${dist}"/>
+         <tar destfile="${dist.dir}/${dist}.tgz" basedir="${dist}" compression="gzip"/>
+         <delete dir="${dist}"/>
      </target>
  
!     <target name="run-ipl" description="Run interactive IPL console">
          <java classpathref="project.class.path" jar="lib/ipl.jar" fork="true"/>
      </target>
  
!     <target name="run-idb" description="Run interactive IPL console, with IDB built-in functions">
          <java classpathref="project.class.path" classname="com.ienjinia.db.DBUI" fork="true">
              <arg line="-g /tmp/ECFDB"/>