[Ejtools-cvs] CVS: build build.xml,1.6,1.7 build_application.xml,1.10,1.11 build_library.xml,1.3,1.4
Brought to you by:
letiemble
Menu
▾
▴
[Ejtools-cvs] CVS: build build.xml,1.6,1.7 build_application.xml,1.10,1.11 build_library.xml,1.3,1.4 build_thirdparty.xml,1.3,1.4 build_webapp.xml,1.2,1.3 build_website.xml,1.3,1.4
|
From: Laurent E. <let...@us...> - 2002-05-24 21:13:41
|
Update of /cvsroot/ejtools/build
In directory usw-pr-cvs1:/tmp/cvs-serv29467
Modified Files:
build.xml build_application.xml build_library.xml
build_thirdparty.xml build_webapp.xml build_website.xml
Log Message:
Reformat xml files. Custom XDoclet for JavaBeans.
Index: build.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.xml 15 May 2002 17:47:54 -0000 1.6
--- build.xml 24 May 2002 21:13:39 -0000 1.7
***************
*** 40,46 ****
</target>
<!-- ======================================== -->
<!-- Creates the output directory for the releases -->
<!-- ======================================== -->
! <target name="prepare" description="">
<mkdir dir="${output.root}"/>
</target>
--- 40,56 ----
</target>
<!-- ======================================== -->
+ <!-- Display informations -->
+ <!-- ======================================== -->
+ <target name="info" description="">
+ <echo message="------------------------------------------------------------"/>
+ <echo/>
+ <echo message="EJTools Build System"/>
+ <echo/>
+ <echo message="------------------------------------------------------------"/>
+ </target>
+ <!-- ======================================== -->
<!-- Creates the output directory for the releases -->
<!-- ======================================== -->
! <target name="prepare" depends="info" description="">
<mkdir dir="${output.root}"/>
</target>
***************
*** 49,62 ****
<!-- Executes the clean target on each modules -->
<!-- ======================================== -->
! <target name="clean" description="">
<delete dir="${output.root}"/>
<antcall target="sub">
<param name="target" value="clean"/>
</antcall>
</target>
<!-- ======================================== -->
<!-- Executes the build target on each modules -->
<!-- ======================================== -->
! <target name="build" description="">
<antcall target="sub">
<param name="target" value="build"/>
--- 59,73 ----
<!-- Executes the clean target on each modules -->
<!-- ======================================== -->
! <target name="clean" depends="info" description="">
<delete dir="${output.root}"/>
<antcall target="sub">
<param name="target" value="clean"/>
</antcall>
+ <ant antfile="build/build_website.xml" target="clean"/>
</target>
<!-- ======================================== -->
<!-- Executes the build target on each modules -->
<!-- ======================================== -->
! <target name="build" depends="info" description="">
<antcall target="sub">
<param name="target" value="build"/>
***************
*** 74,78 ****
<!-- Create the javadoc website on each modules -->
<!-- ======================================== -->
! <target name="javadoc" description="">
<property name="generate.javadoc" value="true"/>
<antcall target="sub">
--- 85,89 ----
<!-- Create the javadoc website on each modules -->
<!-- ======================================== -->
! <target name="javadoc" depends="info" description="">
<property name="generate.javadoc" value="true"/>
<antcall target="sub">
***************
*** 83,87 ****
<!-- Create the todo website on each modules -->
<!-- ======================================== -->
! <target name="todo" description="">
<antcall target="sub">
<param name="target" value="todo"/>
--- 94,98 ----
<!-- Create the todo website on each modules -->
<!-- ======================================== -->
! <target name="todo" depends="info" description="">
<antcall target="sub">
<param name="target" value="todo"/>
***************
*** 91,95 ****
<!-- Create the logo for each application -->
<!-- ======================================== -->
! <target name="logo" description="">
<antcall target="sub.applications">
<param name="target" value="logo"/>
--- 102,106 ----
<!-- Create the logo for each application -->
<!-- ======================================== -->
! <target name="logo" depends="info" description="">
<antcall target="sub.applications">
<param name="target" value="logo"/>
***************
*** 99,103 ****
<!-- Create the distribution package for each application -->
<!-- ======================================== -->
! <target name="package" description="">
<antcall target="sub.applications">
<param name="target" value="package"/>
--- 110,114 ----
<!-- Create the distribution package for each application -->
<!-- ======================================== -->
! <target name="package" depends="info" description="">
<antcall target="sub.applications">
<param name="target" value="package"/>
***************
*** 110,120 ****
<!-- Build the EJTools website -->
<!-- ======================================== -->
! <target name="website" depends="javadoc, todo" description="">
<ant antfile="build/build_website.xml"/>
</target>
<!-- ======================================== -->
<!-- Build the Source TarBall -->
<!-- ======================================== -->
! <target name="tarball" depends="clean" description=""/>
<!-- **************************************** -->
<!-- Generic subtask which calls the subtask for thirdparty, libraries and applications -->
--- 121,134 ----
<!-- Build the EJTools website -->
<!-- ======================================== -->
! <target name="website" depends="info" description="">
<ant antfile="build/build_website.xml"/>
</target>
+ <target name="website.compress" description="">
+ <ant antfile="build/build_website.xml" target="compress"/>
+ </target>
<!-- ======================================== -->
<!-- Build the Source TarBall -->
<!-- ======================================== -->
! <target name="tarball" depends="info,clean" description=""/>
<!-- **************************************** -->
<!-- Generic subtask which calls the subtask for thirdparty, libraries and applications -->
***************
*** 178,181 ****
--- 192,207 ----
<param name="root" value="${libraries.root}"/>
<param name="name" value="jboss.provider"/>
+ </antcall>
+ <antcall target="sub.call">
+ <param name="type" value="library"/>
+ <param name="target" value="${target}"/>
+ <param name="root" value="${libraries.root}"/>
+ <param name="name" value="taglib"/>
+ </antcall>
+ <antcall target="sub.call">
+ <param name="type" value="library"/>
+ <param name="target" value="${target}"/>
+ <param name="root" value="${libraries.root}"/>
+ <param name="name" value="xdoclet"/>
</antcall>
<antcall target="sub.call">
Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build_application.xml 16 May 2002 07:16:12 -0000 1.10
--- build_application.xml 24 May 2002 21:13:39 -0000 1.11
***************
*** 18,21 ****
--- 18,24 ----
<taskdef name="xdoclet" classname="xdoclet.DocletTask"/>
<taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
+ <!--
+ <taskdef name="javabean" classname="xdoclet.beans.JavaBeanDocletTask"/>
+ -->
<!-- ==================== Module Definition ======================== -->
<property name="module.root" value="${applications.root}/${module.name}"/>
***************
*** 43,53 ****
<property name="src.main" value="${src.home}/main"/>
<property name="src.resources" value="${src.home}/resources"/>
- <property name="src.webapp" value="${src.home}/webapp"/>
- <property name="src.webapp.content" value="${src.webapp}/content"/>
- <property name="src.webapp.resources" value="${src.webapp}/resources"/>
<!-- ==================== Compilation Classpath =========================== -->
<path id="compile.classpath">
<fileset dir="${ejtools.common.root}" includes="*.jar"/>
<fileset dir="${ejtools.adwt.root}" includes="*.jar"/>
<fileset dir="${ejtools.xmlweb.root}" includes="*.jar"/>
<fileset dir="${apache.ant.root}" includes="*.jar"/>
--- 46,55 ----
<property name="src.main" value="${src.home}/main"/>
<property name="src.resources" value="${src.home}/resources"/>
<!-- ==================== Compilation Classpath =========================== -->
<path id="compile.classpath">
<fileset dir="${ejtools.common.root}" includes="*.jar"/>
<fileset dir="${ejtools.adwt.root}" includes="*.jar"/>
+ <fileset dir="${ejtools.taglib.root}" includes="*.jar"/>
+ <fileset dir="${ejtools.xdoclet.root}" includes="*.jar"/>
<fileset dir="${ejtools.xmlweb.root}" includes="*.jar"/>
<fileset dir="${apache.ant.root}" includes="*.jar"/>
***************
*** 55,61 ****
<fileset dir="${apache.log4j.root}" includes="*.jar"/>
<fileset dir="${apache.struts.root}" includes="*.jar"/>
- <!--
- <fileset dir="${apache.tomcat.root}" includes="*.jar"/>
- -->
<fileset dir="${apache.xalan.root}" includes="*.jar"/>
<fileset dir="${dreambean.awt.root}" includes="*.jar"/>
--- 57,60 ----
***************
*** 70,73 ****
--- 69,73 ----
<fileset dir="${sun.jsr88.root}" includes="*.jar"/>
<fileset dir="${sun.swing.root}" includes="*.jar"/>
+ <fileset dir="${sun.tools.root}" includes="*.jar"/>
</path>
<!-- ==================== Info Target ================================== -->
***************
*** 117,131 ****
</target>
<!-- ==================== XMLBeans Target ================================== -->
! <target name="xmlbeans" depends="compile" if="has.dir.etc.beaninfo">
<mkdir dir="${build.src}"/>
<!--
! <xdoclet sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
<fileset dir="${src.main}">
<include name="**/*.java"/>
- <exclude name="**/CVS/**"/>
</fileset>
! <template templateFile="build/beaninfo.j" destinationFile="{0}BeanInfo.java" havingClassTag="beaninfo:class"/>
! </xdoclet>
! -->
<xmlbean destdir="${build.src}" srcdir="../${src.etc}/beaninfo" includes="**" excludes="**/CVS/**"/>
<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
--- 117,133 ----
</target>
<!-- ==================== XMLBeans Target ================================== -->
! <target name="beaninfo" depends="compile" if="has.dir.etc.beaninfo">
<mkdir dir="${build.src}"/>
<!--
! <javabean sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
<fileset dir="${src.main}">
<include name="**/*.java"/>
</fileset>
! <beaninfo/>
! <i18n destdir="${build.classes}"/>
! <i18n locale="fr_FR" destdir="${build.classes}"/>
! <i18n locale="de_DE" destdir="${build.classes}"/>
! </javabean>
! -->
<xmlbean destdir="${build.src}" srcdir="../${src.etc}/beaninfo" includes="**" excludes="**/CVS/**"/>
<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
***************
*** 134,138 ****
</target>
<!-- ==================== Build Target ===================================== -->
! <target name="build" depends="compile,xmlbeans" description="Create binary">
<copy todir="${build.classes}">
<fileset dir="${src.resources}">
--- 136,140 ----
</target>
<!-- ==================== Build Target ===================================== -->
! <target name="build" depends="compile,beaninfo" description="Create binary">
<copy todir="${build.classes}">
<fileset dir="${src.resources}">
Index: build_library.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_library.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build_library.xml 15 May 2002 17:47:54 -0000 1.3
--- build_library.xml 24 May 2002 21:13:39 -0000 1.4
***************
*** 37,40 ****
--- 37,41 ----
<fileset dir="${apache.crimson.root}" includes="*.jar"/>
<fileset dir="${apache.log4j.root}" includes="*.jar"/>
+ <fileset dir="${apache.struts.root}" includes="*.jar"/>
<fileset dir="${dreambean.awt.root}" includes="*.jar"/>
<fileset dir="${sourceforge.xdoclet.root}" includes="*.jar"/>
***************
*** 44,47 ****
--- 45,49 ----
<fileset dir="${sun.jsr77.root}" includes="*.jar"/>
<fileset dir="${sun.jsr88.root}" includes="*.jar"/>
+ <fileset dir="${sun.tools.root}" includes="*.jar"/>
</path>
<!-- ==================== Info Target ================================== -->
***************
*** 82,85 ****
--- 84,89 ----
<include name="**/*.properties"/>
<include name="**/*.gif"/>
+ <include name="**/*.png"/>
+ <include name="**/*.j"/>
</fileset>
</copy>
***************
*** 100,104 ****
<!-- ==================== Javadoc Target ================================== -->
<target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc">
! <javadoc sourcepath="${src.home}/main" destdir="${build.doc.api}" packagenames="${module.package}" windowtitle="${module.javadoc.title}" stylesheetfile="build/css/stylesheet.css">
<classpath refid="compile.classpath"/>
</javadoc>
--- 104,108 ----
<!-- ==================== Javadoc Target ================================== -->
<target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc">
! <javadoc sourcepath="${src.home}/main" destdir="${build.doc.api}" packagenames="${module.package}.*" windowtitle="${module.javadoc.title}" stylesheetfile="build/css/stylesheet.css">
<classpath refid="compile.classpath"/>
</javadoc>
Index: build_thirdparty.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_thirdparty.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build_thirdparty.xml 15 May 2002 17:47:54 -0000 1.3
--- build_thirdparty.xml 24 May 2002 21:13:39 -0000 1.4
***************
*** 39,43 ****
<target name="info">
<echo message="------------------------------------------------------------"/>
! <echo message="Module Thirdparty : ${vendor.name} ${module.name}"/>
<echo message="------------------------------------------------------------"/>
</target>
--- 39,43 ----
<target name="info">
<echo message="------------------------------------------------------------"/>
! <echo message="Module Thirdparty Library : ${vendor.name} ${module.name}"/>
<echo message="------------------------------------------------------------"/>
</target>
***************
*** 97,101 ****
<!-- ==================== Javadoc Target ================================== -->
<target name="javadoc" depends="compile" description="Create Javadoc API documentation" if="generate.javadoc">
! <javadoc sourcepath="${src.home}/main" destdir="${build.doc}/api" packagenames="${module.package}">
<classpath refid="compile.classpath"/>
</javadoc>
--- 97,101 ----
<!-- ==================== Javadoc Target ================================== -->
<target name="javadoc" depends="compile" description="Create Javadoc API documentation" if="generate.javadoc">
! <javadoc sourcepath="${src.home}/main" destdir="${build.doc}/api" packagenames="${module.package}.*">
<classpath refid="compile.classpath"/>
</javadoc>
Index: build_webapp.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_webapp.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_webapp.xml 17 May 2002 07:28:53 -0000 1.2
--- build_webapp.xml 24 May 2002 21:13:39 -0000 1.3
***************
*** 46,49 ****
--- 46,50 ----
<fileset dir="${ejtools.common.root}" includes="*.jar"/>
<fileset dir="${ejtools.adwt.root}" includes="*.jar"/>
+ <fileset dir="${ejtools.taglib.root}" includes="*.jar"/>
<fileset dir="${ejtools.xmlweb.root}" includes="*.jar"/>
<fileset dir="${apache.ant.root}" includes="*.jar"/>
***************
*** 64,67 ****
--- 65,69 ----
<fileset dir="${sun.jsr88.root}" includes="*.jar"/>
<fileset dir="${sun.swing.root}" includes="*.jar"/>
+ <fileset dir="${sun.tools.root}" includes="*.jar"/>
</path>
<!-- ==================== Info Target ================================== -->
***************
*** 106,111 ****
</javac>
</target>
<!-- ==================== Build Target ===================================== -->
! <target name="build" depends="compile" description="">
<copy todir="${build.classes}">
<fileset dir="${src.resources}">
--- 108,121 ----
</javac>
</target>
+ <!-- ==================== XMLBeans Target ================================== -->
+ <target name="beaninfo" depends="compile" if="has.dir.etc.beaninfo">
+ <mkdir dir="${build.src}"/>
+ <xmlbean destdir="${build.src}" srcdir="../${src.etc}/beaninfo" includes="**" excludes="**/CVS/**"/>
+ <javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
+ <classpath refid="compile.classpath"/>
+ </javac>
+ </target>
<!-- ==================== Build Target ===================================== -->
! <target name="build" depends="compile,beaninfo" description="">
<copy todir="${build.classes}">
<fileset dir="${src.resources}">
***************
*** 172,176 ****
<target name="clean" depends="info" description="Delete old build and dist directories">
<delete dir="${build.home}"/>
! <delete dir="${dist.webapp}"/>
</target>
</project>
--- 182,186 ----
<target name="clean" depends="info" description="Delete old build and dist directories">
<delete dir="${build.home}"/>
! <delete dir="${webapp.home}"/>
</target>
</project>
Index: build_website.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_website.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build_website.xml 15 May 2002 17:47:54 -0000 1.3
--- build_website.xml 24 May 2002 21:13:39 -0000 1.4
***************
*** 18,23 ****
<property name="images.root" value="${website.root}/images"/>
<property name="images.svg.root" value="${images.root}/svg"/>
<!-- ==================== All Target =================================== -->
! <target name="all" depends="svg.rasterizer,xweb,javadoc.copy,todo.copy"/>
<!-- ==================== JavaDoc Copy Target =================================== -->
<target name="javadoc.copy" depends="xweb">
--- 18,35 ----
<property name="images.root" value="${website.root}/images"/>
<property name="images.svg.root" value="${images.root}/svg"/>
+ <!-- ==================== Info Target ================================== -->
+ <target name="info">
+ <echo message="------------------------------------------------------------"/>
+ <echo message="Module EJTools Website"/>
+ <echo message="------------------------------------------------------------"/>
+ </target>
<!-- ==================== All Target =================================== -->
! <target name="all" depends="info,xweb,javadoc.copy,todo.copy,compress"/>
! <!-- ==================== Compress Target =================================== -->
! <target name="compress" depends="">
! <tar tarfile="${output.root}/website.tar" basedir="${website.root}/output"/>
! <gzip zipfile="${output.root}/website.tar.gz" src="${output.root}/website.tar"/>
! <delete file="${output.root}/website.tar"/>
! </target>
<!-- ==================== JavaDoc Copy Target =================================== -->
<target name="javadoc.copy" depends="xweb">
***************
*** 25,30 ****
<fileset dir="${libraries.root}/adwt/output/doc/api"/>
</copy>
! <copy todir="${website.root}/output/libraries/xmlweb/api" overwrite="yes">
! <fileset dir="${libraries.root}/xmlweb/output/doc/api"/>
</copy>
<copy todir="${website.root}/output/projects/deployment/api" overwrite="yes">
--- 37,42 ----
<fileset dir="${libraries.root}/adwt/output/doc/api"/>
</copy>
! <copy todir="${website.root}/output/libraries/common/api" overwrite="yes">
! <fileset dir="${libraries.root}/common/output/doc/api"/>
</copy>
<copy todir="${website.root}/output/projects/deployment/api" overwrite="yes">
***************
*** 46,55 ****
<fileset dir="${libraries.root}/adwt/output/doc/todo"/>
</copy>
! <copy todir="${website.root}/output/libraries/xmlweb/todo" overwrite="yes">
! <fileset dir="${libraries.root}/xmlweb/output/doc/todo"/>
</copy>
<copy todir="${website.root}/output/projects/jndi.browser/todo" overwrite="yes">
<fileset dir="${applications.root}/jndi.browser/output/doc/todo"/>
</copy>
</target>
<!-- ==================== Website Creation Target =================================== -->
--- 58,76 ----
<fileset dir="${libraries.root}/adwt/output/doc/todo"/>
</copy>
! <copy todir="${website.root}/output/libraries/common/todo" overwrite="yes">
! <fileset dir="${libraries.root}/common/output/doc/todo"/>
! </copy>
! <copy todir="${website.root}/output/projects/deployment/todo" overwrite="yes">
! <fileset dir="${applications.root}/deployment/output/doc/todo"/>
! </copy>
! <copy todir="${website.root}/output/projects/jmx.browser/todo" overwrite="yes">
! <fileset dir="${applications.root}/jndi.browser/output/doc/todo"/>
</copy>
<copy todir="${website.root}/output/projects/jndi.browser/todo" overwrite="yes">
<fileset dir="${applications.root}/jndi.browser/output/doc/todo"/>
</copy>
+ <copy todir="${website.root}/output/projects/management/todo" overwrite="yes">
+ <fileset dir="${applications.root}/management/output/doc/todo"/>
+ </copy>
</target>
<!-- ==================== Website Creation Target =================================== -->
***************
*** 124,127 ****
--- 145,152 ----
</java>
<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools50.png"/>
+ </target>
+ <!-- ==================== Clean Target ==================================== -->
+ <target name="clean" depends="info" description="Delete old build and dist directories">
+ <delete dir="${website.root}/output"/>
</target>
</project>
|
