[Dynxform-commits] dynxform build.number,1.1,1.2 build.properties,1.1,1.2 build.xml,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9736

Modified Files:
	build.number build.properties build.xml 
Log Message:
build refactoring

Index: build.number
===================================================================
RCS file: /cvsroot/dynxform/dynxform/build.number,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.number	19 Jul 2004 11:47:30 -0000	1.1
--- build.number	11 Aug 2004 17:34:28 -0000	1.2
***************
*** 1,3 ****
  #Build Number for ANT. Do not edit!
! #Mon Jul 19 11:51:51 MSD 2004
! build.number=29
--- 1,3 ----
  #Build Number for ANT. Do not edit!
! #Sun Aug 08 21:40:33 MSD 2004
! build.number=57

Index: build.xml
===================================================================
RCS file: /cvsroot/dynxform/dynxform/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	19 Jul 2004 11:47:30 -0000	1.1
--- build.xml	11 Aug 2004 17:34:28 -0000	1.2
***************
*** 1,204 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <project default="" name="dynxform">
!   <property name="base.dir" value="."/>
!   <property name="src.dir" value="${base.dir}/src"/>
!   <property name="web.src.dir" value="${src.dir}"/>
!   <property name="lib.dir" value="${base.dir}/lib"/>
!   <property name="var.dir" value="${base.dir}/var"/>
!   <property name="lib.cocoon.dir" value="${base.dir}/lib/cocoon"/>
!   <property name="xmltestsuite.dir" value="${lib.dir}/tests/xmltestsuite"/>
! 
!   <property name="lib.src.dir" value="${base.dir}/lib/src"/>
!   <property name="build.dir" value="${base.dir}/build"/>
!   <property name="build.classes.dir" value="${build.dir}/classes"/>
!   <property name="junit.results.dir" value="${var.dir}/reports/"/>
! 
!   <property name="src.java.dir" value="${src.dir}/java"/>
!   <property name="resources.dir" value="${src.dir}/resources"/>
!   <property name="properties.dir" value="${resources.dir}/properties"/>
!   <property name="xsd.resources.dir" value="${resources.dir}/xsd"/>
!   <property file="build.properties"/>
!   <property name="dist.dir" value="${base.dir}/distr"/>
! 
!   <property name="cocoon.dir" value="${tomcat.webapp.path}/cocoon"/>
! 
!   <property name="dynxform.jar.file" value="dynxform.jar"/>
! 
!   <path id="classpath">
!     <fileset dir="${lib.dir}">
!       <include name="*.jar"/>
!       <include name="cocoon/*.jar"/>
!       <include name="tests/*.jar"/>
!     </fileset>
!     <pathelement path="${build.classes.dir}"/>
!     <pathelement path="${src.java.dir}"/>
!   </path>
! 
!   <target name="clean">
!     <delete includeemptydirs="true" failonerror="false">
!       <fileset dir="${build.dir}">
!         <include name="**/**"/>
!       </fileset>
!     </delete>
!     <mkdir dir="${build.dir}"/>
!     <mkdir dir="${build.dir}/classes"/>
!     <mkdir dir="${build.dir}/output"/>
!   </target>
!   <target name="compile" depends="clean">
!     <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" deprecation="true" classpathref="classpath" source="1.3">
!       <exclude name="advsearch/*.java"/>
!       <exclude name="**/database/sp/**"/>
!       <exclude name="**/canoo/**"/>
!     </javac>
!     <buildnumber/>
! 
!     <jar jarfile="${build.dir}/${dynxform.jar.file}">
!       <!--      package version identification: http://java.sun.com/products/jdk/1.2/docs/guide/versioning/index.html-->
!       <manifest>
!         <attribute name="Implementation-Version" value="${MajorVersion}.${MinorVersion}.${ReleaseVersion} build ${build.number}"/>
!         <attribute name="Built-By" value="${user.name}"/>
!       </manifest>
!       <fileset dir="${build.classes.dir}">
!         <exclude name="net/sf/dynxform/container/test/**"/>
!         <exclude name="net/sf/dynxform/test/**"/>
!         <exclude name="net/sf/dynxform/database/sp/**"/>
!         <exclude name="net/sf/dynxform/canoo/**"/>
!       </fileset>
!     </jar>
!   </target>
! 
!   <target name="xsd2java.form">
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/form/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <!--
!     Castor
!     Usage: -i filename [-package package-name] [-dest dest-dir] [-line-separator ( unix | mac | win)] [-f ] [-h ] [-verbose ] [-nodesc ] [-types types] [-type-factory classname] [-nomarshall ] [-testable ] [-sax1 ] [-binding-file filename]
!                                     -package net.sf.dynxform.schema
!         -->
!     <java classpathref="classpath" classname="org.exolab.castor.builder.SourceGenerator" fork="true" dir="${src.java.dir}">
!       <arg line=" -i ../resources/xsd/dynform.xsd -types j2 -package net.sf.dynxform.form.schema"/>
!     </java>
!   </target>
! 
!   <target name="xsd2java.action">
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/action/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/report/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <java classpathref="classpath" classname="org.exolab.castor.builder.SourceGenerator" fork="true" dir="${src.java.dir}">
!       <arg line=" -i ../resources/xsd/action.xsd -types j2 -binding-file ../resources/xsd/binding.xml"/>
!     </java>
!   </target>
! 
!   <target name="xsd2java.report">
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/report/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <java classpathref="classpath" classname="org.exolab.castor.builder.SourceGenerator" fork="true" dir="${src.java.dir}">
!       <arg line=" -i ../resources/xsd/report.xsd -types j2 -package net.sf.dynxform.report.schema "/>
!     </java>
!   </target>
! 
!   <target name="xsd2java.generation" depends="xsd2java.report,xsd2java.action,xsd2java.form"/>
! 
!   <target name="junit.tests" depends="compile">
!     <junit fork="yes" haltonfailure="false">
!       <classpath>
!         <path refid="classpath"/>
!         <pathelement location="${build.dir}"/>
!         <pathelement location="${resources.dir}/properties"/>
!         <pathelement location="${resources.dir}/xml/test"/>
!       </classpath>
!       <formatter type="plain" usefile="false"/>
!       <formatter type="xml"/>
!       <batchtest todir="${junit.results.dir}">
!         <fileset dir="${build.dir}/classes">
!           <include name="**/*Test.class"/>
!         </fileset>
!       </batchtest>
!     </junit>
! 
!     <tstamp>
!       <format pattern="dd.MM.yyyy-HH.mm" property="report.dir"/>
!     </tstamp>
! 
!     <mkdir dir="${junit.results.dir}/html/${report.dir}"/>
!     <junitreport>
!       <report format="frames" todir="${junit.results.dir}/html/${report.dir}"/>
!       <fileset dir="${junit.results.dir}">
!         <include name="*.xml"/>
!       </fileset>
!     </junitreport>
!   </target>
! 
!   <target name="deploy" depends="prepare.distr.full">
!     <delete includeemptydirs="true">
!       <fileset dir="${tomcat.webapp.path}">
!         <include name="cocoon/dynxform/**"/>
!         <include name="resources.war"/>
!         <include name="resources/**"/>
!       </fileset>
!     </delete>
! 
!     <copy todir="${tomcat.webapp.path}" overwrite="true">
!       <fileset dir="${dist.dir}" defaultexcludes="no">
!         <include name="**/**"/>
!       </fileset>
!     </copy>
!   </target>
! 
!   <target name="prepare.dist.clean">
!     <delete dir="${dist.dir}" includeemptydirs="true"/>
!     <mkdir dir="${dist.dir}"/>
!     <mkdir dir="${dist.dir}/cocoon"/>
!     <mkdir dir="${dist.dir}/cocoon/dynxform"/>
!     <mkdir dir="${dist.dir}/cocoon/WEB-INF"/>
!     <mkdir dir="${dist.dir}/cocoon/WEB-INF/lib"/>
!   </target>
! 
!   <target name="prepare.dist" depends="prepare.dist.clean, compile">
!     <war warfile="${dist.dir}/resources.war" webxml="${resources.dir}/xml/web.xml">
!       <fileset dir="${resources.dir}/demo/images">
!         <include name="images/**"/>
!       </fileset>
!     </war>
! 
!     <copy todir="${dist.dir}/cocoon/dynxform">
!       <fileset dir="${resources.dir}/demo" defaultexcludes="no">
!         <exclude name="images/**"/>
!       </fileset>
!     </copy>
! 
!     <copy todir="${dist.dir}/cocoon/WEB-INF/lib" file="${build.dir}/${dynxform.jar.file}"/>
!   </target>
! 
!   <target name="prepare.distr.full" depends="prepare.dist">
!     <copy todir="${dist.dir}/cocoon/WEB-INF/lib">
!       <fileset dir="${lib.dir}">
!         <include name="commons-pool-1.1.jar"/>
!         <include name="jakarta-oro-2.0.7.jar"/>
!         <include name="commons-validator.jar"/>
!       </fileset>
!     </copy>
!     <copy file="${lib.dir}/saxon/saxon7.jar" tofile="${dist.dir}/cocoon/WEB-INF/lib/zsaxon7.jar"/>
! 
!     <copy todir="${dist.dir}/cocoon/WEB-INF/classes">
!       <fileset dir="${resources.dir}/properties">
!         <include name="commons-logging.properties"/>
!         <include name="db.properties"/>
!         <include name="log4j.properties"/>
!       </fileset>
!     </copy>
!   </target>
  </project>
\ No newline at end of file
--- 1,7 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <project default="help" name="dynxform">
!   <import file="etc/ant/properties.xml"/>
!   <import file="etc/ant/help.xml"/>
!   <import file="etc/ant/tomcat.xml"/>
!   <import file="etc/ant/main.xml"/>
  </project>
\ No newline at end of file

Index: build.properties
===================================================================
RCS file: /cvsroot/dynxform/dynxform/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.properties	19 Jul 2004 11:47:30 -0000	1.1
--- build.properties	11 Aug 2004 17:34:28 -0000	1.2
***************
*** 1,9 ****
! # General properties
! MajorVersion=1
! MinorVersion=0
! ReleaseVersion=0
! ServiceName= 
! ServiceVersion= 
! 
! #Tomcat
! tomcat.webapp.path=C:/java/jakarta-tomcat4.1.30/webapps
--- 1,6 ----
! Major.Version=1
! Minor.Version=0
! Release.Version=0
! Service.Name= 
! Service.Version= 
! Build.Number=57