[Ejtools-cvs] build build.bat,1.6,1.7 build.sh,1.5,1.6 build.xml,1.8,1.9 build_application.xml,1.12,
Brought to you by:
letiemble
Menu
▾
▴
[Ejtools-cvs] build build.bat,1.6,1.7 build.sh,1.5,1.6 build.xml,1.8,1.9 build_application.xml,1.12,1.13 build_library.xml,1.5,1.6 build_thirdparty.xml,1.4,1.5 build_webapp.xml,1.4,1.5 build_website.xml,1.4,1.5 general.properties,1.6,1.7 switch.properties,1.9,1.10
|
From: <let...@us...> - 2002-06-10 07:45:33
|
Update of /cvsroot/ejtools/build
In directory usw-pr-cvs1:/tmp/cvs-serv12939
Modified Files:
build.bat build.sh build.xml build_application.xml
build_library.xml build_thirdparty.xml build_webapp.xml
build_website.xml general.properties switch.properties
Log Message:
Switch to Ant 1.5 beta 2
Index: build.bat
===================================================================
RCS file: /cvsroot/ejtools/build/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.bat 25 May 2002 20:30:36 -0000 1.6
--- build.bat 10 Jun 2002 07:45:27 -0000 1.7
***************
*** 20,24 ****
set CP=%CP%;%THIRDPARTY%\apache\ant\ant.jar
! set CP=%CP%;%THIRDPARTY%\apache\ant\optional.jar.jar
set CP=%CP%;%THIRDPARTY%\apache\crimson\crimson.jar
set CP=%CP%;%THIRDPARTY%\apache\log4j\log4j.jar
--- 20,24 ----
set CP=%CP%;%THIRDPARTY%\apache\ant\ant.jar
! set CP=%CP%;%THIRDPARTY%\apache\ant\optional.jar
set CP=%CP%;%THIRDPARTY%\apache\crimson\crimson.jar
set CP=%CP%;%THIRDPARTY%\apache\log4j\log4j.jar
***************
*** 28,36 ****
set CP=%CP%;%THIRDPARTY%\sun\tools\tools.jar
! set CP=%CP%;%THIRDPARTY%\dreambean\codegen\
! set CP=%CP%;%THIRDPARTY%\dreambean\codegen\codegen.jar
! set CP=%CP%;%THIRDPARTY%\dreambean\xmlbeans\
! set CP=%CP%;%THIRDPARTY%\dreambean\xmlbeans\xmlbeans.jar
!
set CP=%CP%;%THIRDPARTY%\sourceforge\xdoclet\xdoclet.jar
set CP=%CP%;%THIRDPARTY%\sourceforge\jrefactory\jrefactory.jar
--- 28,32 ----
set CP=%CP%;%THIRDPARTY%\sun\tools\tools.jar
! set CP=%CP%;%THIRDPARTY%\sourceforge\xdoclet\
set CP=%CP%;%THIRDPARTY%\sourceforge\xdoclet\xdoclet.jar
set CP=%CP%;%THIRDPARTY%\sourceforge\jrefactory\jrefactory.jar
Index: build.sh
===================================================================
RCS file: /cvsroot/ejtools/build/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
Index: build.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml 25 May 2002 20:29:45 -0000 1.8
--- build.xml 10 Jun 2002 07:45:27 -0000 1.9
***************
*** 14,26 ****
<!-- Global Definitions -->
<!-- ======================================== -->
<property file="build/general.properties"/>
<property file="build/location.properties"/>
<property file="build/switch.properties"/>
! <!-- ==================== Everything Target ===================================== -->
! <target name="everything" depends="clean, build, logo, dist, javadoc, todo, package, website" description=""/>
! <!-- ==================== Rebuild Target ===================================== -->
! <target name="rebuild" depends="clean, build" description=""/>
<!-- ======================================== -->
! <!-- Displayed on demand or on failure -->
<!-- ======================================== -->
<target name="help" description="">
--- 14,47 ----
<!-- Global Definitions -->
<!-- ======================================== -->
+ <!--
+ <xmlproperty file="switch.xml" keepRoot="false" />
+ <echoproperties file="output.properties"/>
+ -->
<property file="build/general.properties"/>
<property file="build/location.properties"/>
<property file="build/switch.properties"/>
! <property environment="env"/>
! <!-- ==================== Task Definitions ======================== -->
! <taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
! <taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
! <taskdef name="javabean" classname="xdoclet.beans.JavaBeanDocletTask"/>
<!-- ======================================== -->
! <!-- Catalog Definitions -->
! <!-- ======================================== -->
! <xmlcatalog id="sunDTDs">
! <dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN" location="dtd/ejb-jar_1_1.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" location="dtd/ejb-jar_2_0.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN" location="dtd/application_1_2.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" location="dtd/application_1_3.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN" location="dtd/application-client_1_2.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN" location="dtd/application-client_1_3.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" location="dtd/connector_1_0.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" location="dtd/web-app_2_2.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" location="dtd/web-app_2_3.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" location="dtd/web-jsptaglibrary_1_1.dtd"/>
! <dtd publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" location="dtd/web-jsptaglibrary_1_2.dtd"/>
! </xmlcatalog>
! <!-- ======================================== -->
! <!-- Displayed on demand -->
<!-- ======================================== -->
<target name="help" description="">
***************
*** 45,51 ****
<target name="info" description="">
<echo message="------------------------------------------------------------"/>
! <echo/>
<echo message="EJTools Build System"/>
! <echo/>
<echo message="------------------------------------------------------------"/>
</target>
--- 66,72 ----
<target name="info" description="">
<echo message="------------------------------------------------------------"/>
! <echo message=" "/>
<echo message="EJTools Build System"/>
! <echo message=" "/>
<echo message="------------------------------------------------------------"/>
</target>
***************
*** 55,58 ****
--- 76,80 ----
<target name="prepare" depends="info" description="">
<mkdir dir="${output.root}"/>
+ <tstamp/>
</target>
<!-- ======================================== -->
***************
*** 145,149 ****
<!-- Build the Source TarBall -->
<!-- ======================================== -->
! <target name="tarball" depends="info,clean" description=""/>
<!-- **************************************** -->
<!-- Generic subtask which calls the subtask for thirdparty, libraries and applications -->
--- 167,186 ----
<!-- Build the Source TarBall -->
<!-- ======================================== -->
! <target name="tarball" depends="info,clean,prepare" description="">
! <zip destfile="${output.root}/EJTools-${DSTAMP}.zip" basedir="." excludes="${output.root}/**">
! <zipfileset dir="${applications.root}" prefix="${applications.root}"/>
! <zipfileset dir="${build.root}" prefix="${build.root}"/>
! <zipfileset dir="${libraries.root}" prefix="${libraries.root}"/>
! <zipfileset dir="${thirdparty.root}" prefix="${thirdparty.root}"/>
! </zip>
! <tar destfile="${output.root}/EJTools.tar" basedir="." excludes="${output.root}/**">
! <tarfileset dir="${applications.root}" prefix="${applications.root}"/>
! <tarfileset dir="${build.root}" prefix="${build.root}"/>
! <tarfileset dir="${libraries.root}" prefix="${libraries.root}"/>
! <tarfileset dir="${thirdparty.root}" prefix="${thirdparty.root}"/>
! </tar>
! <gzip src="${output.root}/EJTools.tar" destfile="${output.root}/EJTools-${DSTAMP}.tar.gz"/>
! <delete file="${output.root}/EJTools.tar"/>
! </target>
<!-- **************************************** -->
<!-- Generic subtask which calls the subtask for thirdparty, libraries and applications -->
Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build_application.xml 25 May 2002 20:29:28 -0000 1.12
--- build_application.xml 10 Jun 2002 07:45:27 -0000 1.13
***************
*** 11,25 ****
-->
<project name="Generic Build File for Applications" default="dist" basedir=".">
- <!-- ==================== Global Definitions ======================== -->
- <property file="build/general.properties"/>
- <property file="build/location.properties"/>
- <!-- ==================== Task Definitions ======================== -->
- <taskdef name="xmlbean" classname="com.dreambean.xmlbeans.ant.XMLBeans"/>
- <taskdef name="xdoclet" classname="xdoclet.DocletTask"/>
- <taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
- <taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
- <!--
- <taskdef name="javabean" classname="xdoclet.beans.JavaBeanDocletTask"/>
- -->
<!-- ==================== Module Definition ======================== -->
<property name="module.root" value="${applications.root}/${module.name}"/>
--- 11,14 ----
***************
*** 96,100 ****
<available file="${module.root}/lib.properties" property="has.lib.file"/>
<available file="${module.root}/lib.ext.properties" property="has.lib.ext.file"/>
- <available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/>
<copy todir="${build.etc}">
<fileset dir="${src.etc}">
--- 85,88 ----
***************
*** 102,110 ****
</fileset>
<filterset>
! <filter token="module.name" value="${module.display.name}"/>
! <filter token="version.major" value="${version.major}"/>
! <filter token="version.minor" value="${version.minor}"/>
! <filter token="version.revision" value="${version.revision}"/>
! <filter token="version.tag" value="${version.tag}"/>
</filterset>
</copy>
--- 90,94 ----
</fileset>
<filterset>
! <filtersfile file="${module.root}/module.properties"/>
</filterset>
</copy>
***************
*** 112,115 ****
--- 96,104 ----
<!-- ==================== Compile Target ================================== -->
<target name="compile" depends="prepare" description="Compile Java sources">
+ <!-- See if beaninfo generation is needed -->
+ <uptodate property="beaninfo.uptodate">
+ <srcfiles dir="${src.main}" includes="**/*.java"/>
+ <mapper type="glob" from="*.java" to="../../../../${build.classes}/*.class"/>
+ </uptodate>
<!-- Compile Java classes as necessary -->
<javac srcdir="${src.main}" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
***************
*** 117,135 ****
</javac>
</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/**">
<classpath refid="compile.classpath"/>
--- 106,119 ----
</javac>
</target>
! <!-- ==================== BeanInfo Target ================================== -->
! <target name="beaninfo" depends="compile" unless="beaninfo.uptodate">
<mkdir dir="${build.src}"/>
<javabean sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
<fileset dir="${src.main}">
! <include name="**/model/**/*.java"/>
</fileset>
! <beaninfo i18n="true"/>
<i18n destdir="${build.classes}"/>
</javabean>
<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"/>
***************
*** 158,162 ****
</copy>
<copy todir="${dist.conf}">
! <fileset dir="${src.conf}"/>
</copy>
<copy todir="${dist.bin}">
--- 142,148 ----
</copy>
<copy todir="${dist.conf}">
! <fileset dir="${src.conf}">
! <include name="**/*.properties"/>
! </fileset>
</copy>
<copy todir="${dist.bin}">
***************
*** 170,173 ****
--- 156,165 ----
</fileset>
</copy>
+ <copy todir="${dist.home}">
+ <fileset dir="${src.conf}">
+ <include name="**/README*"/>
+ </fileset>
+ </copy>
+ <touch file="${dist.lib.ext}/donotremove"/>
</target>
<!-- ==================== Dist Libraries Copy Target ===================================== -->
***************
*** 202,206 ****
</target>
<!-- ==================== Package Target =================================== -->
! <target name="package" depends="dist" description=""/>
<!-- ==================== SVG Logo Target =================================== -->
<target name="logo" depends="prepare">
--- 194,210 ----
</target>
<!-- ==================== Package Target =================================== -->
! <target name="package" depends="dist" description="">
! <zip destfile="${output.root}/${module.name}-${version.major}.${version.minor}.${version.revision}-${version.tag}.zip" basedir="${dist.home}"/>
! <tar destfile="${output.root}/${module.name}.tar">
! <tarfileset dir="${dist.home}" mode="755">
! <include name="${dist.bin}/run.sh"/>
! </tarfileset>
! <tarfileset dir="${dist.home}">
! <exclude name="${dist.bin}/run.sh"/>
! </tarfileset>
! </tar>
! <gzip src="${output.root}/${module.name}.tar" zipfile="${output.root}/${module.name}-${version.major}.${version.minor}.${version.revision}-${version.tag}.tar.gz"/>
! <delete file="${output.root}/${module.name}.tar"/>
! </target>
<!-- ==================== SVG Logo Target =================================== -->
<target name="logo" depends="prepare">
Index: build_library.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_library.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build_library.xml 25 May 2002 20:29:28 -0000 1.5
--- build_library.xml 10 Jun 2002 07:45:27 -0000 1.6
***************
*** 11,20 ****
-->
<project name="Generic Build File for Library" default="build" basedir="..">
- <!-- ==================== Global Definitions ======================== -->
- <property file="build/general.properties"/>
- <property file="build/location.properties"/>
- <!-- ==================== Task Definitions ======================== -->
- <taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
- <taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
<!-- ==================== Module Definition ======================== -->
<property name="module.root" value="${libraries.root}/${module.name}"/>
--- 11,14 ----
***************
*** 67,75 ****
</fileset>
<filterset>
! <filter token="module.name" value="${module.display.name}"/>
! <filter token="version.major" value="${version.major}"/>
! <filter token="version.minor" value="${version.minor}"/>
! <filter token="version.revision" value="${version.revision}"/>
! <filter token="version.tag" value="${version.tag}"/>
</filterset>
</copy>
--- 61,65 ----
</fileset>
<filterset>
! <filtersfile file="${module.root}/module.properties"/>
</filterset>
</copy>
Index: build_thirdparty.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_thirdparty.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_thirdparty.xml 24 May 2002 21:13:39 -0000 1.4
--- build_thirdparty.xml 10 Jun 2002 07:45:28 -0000 1.5
***************
*** 11,17 ****
-->
<project name="Generic Build File for 3rd Party Library" default="build" basedir=".">
- <!-- ==================== Global Definitions ======================== -->
- <property file="build/general.properties"/>
- <property file="build/location.properties"/>
<!-- ==================== Module Definition ======================== -->
<property name="module.root" value="${thirdparty.root}/${vendor.name}/${module.name}"/>
--- 11,14 ----
***************
*** 55,63 ****
</fileset>
<filterset>
! <filter token="module.name" value="${module.display.name}"/>
! <filter token="version.major" value="${version.major}"/>
! <filter token="version.minor" value="${version.minor}"/>
! <filter token="version.revision" value="${version.revision}"/>
! <filter token="version.tag" value="${version.tag}"/>
</filterset>
</copy>
--- 52,56 ----
</fileset>
<filterset>
! <filtersfile file="${module.root}/module.properties"/>
</filterset>
</copy>
Index: build_webapp.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_webapp.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_webapp.xml 25 May 2002 20:29:28 -0000 1.4
--- build_webapp.xml 10 Jun 2002 07:45:28 -0000 1.5
***************
*** 11,25 ****
-->
<project name="Generic Build File for Web Applications" default="dist" basedir=".">
- <!-- ==================== Global Definitions ======================== -->
- <property file="build/general.properties"/>
- <property file="build/location.properties"/>
- <!-- ==================== Task Definitions ======================== -->
- <taskdef name="xmlbean" classname="com.dreambean.xmlbeans.ant.XMLBeans"/>
- <taskdef name="xdoclet" classname="xdoclet.DocletTask"/>
- <taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
- <taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
- <!--
- <taskdef name="javabean" classname="xdoclet.beans.JavaBeanDocletTask"/>
- -->
<!-- ==================== Module Definition ======================== -->
<property name="module.root" value="${applications.root}/${module.name}"/>
--- 11,14 ----
***************
*** 53,56 ****
--- 42,46 ----
<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"/>
***************
*** 94,98 ****
<mkdir dir="${webapp.tmp.webinf.classes}"/>
<mkdir dir="${webapp.tmp.webinf.lib}"/>
- <available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/>
<copy todir="${build.etc}">
<fileset dir="${src.etc}">
--- 84,87 ----
***************
*** 100,108 ****
</fileset>
<filterset>
! <filter token="module.name" value="${module.display.name}"/>
! <filter token="version.major" value="${version.major}"/>
! <filter token="version.minor" value="${version.minor}"/>
! <filter token="version.revision" value="${version.revision}"/>
! <filter token="version.tag" value="${version.tag}"/>
</filterset>
</copy>
--- 89,93 ----
</fileset>
<filterset>
! <filtersfile file="${module.root}/module.properties"/>
</filterset>
</copy>
***************
*** 110,113 ****
--- 95,103 ----
<!-- ==================== Compile Target ================================== -->
<target name="compile" depends="prepare" description="Compile Java sources">
+ <!-- See if beaninfo generation is needed -->
+ <uptodate property="beaninfo.uptodate">
+ <srcfiles dir="${src.main}" includes="**/model/**/*.java"/>
+ <mapper type="glob" from="*.java" to="../../../../${build.classes}/*.class"/>
+ </uptodate>
<!-- Compile Java classes as necessary -->
<javac srcdir="${src.main}" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
***************
*** 115,122 ****
</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"/>
--- 105,120 ----
</javac>
</target>
! <!-- ==================== BeanInfo Target ================================== -->
! <target name="beaninfo" depends="compile" unless="beaninfo.uptodate">
<mkdir dir="${build.src}"/>
! <!-- Bean Info generation + i18n properties files -->
! <javabean sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
! <fileset dir="${src.main}">
! <include name="**/model/**/*.java"/>
! </fileset>
! <beaninfo i18n="true"/>
! <i18n destdir="${build.classes}"/>
! </javabean>
! <!-- Compile BeanInfo -->
<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"/>
***************
*** 131,135 ****
</copy>
<copy todir="${webapp.tmp}">
! <fileset dir="${src.webapp.content}"/>
</copy>
<copy todir="${webapp.tmp.webinf}">
--- 129,136 ----
</copy>
<copy todir="${webapp.tmp}">
! <fileset dir="${src.webapp.content}">
! <exclude name="**/*.xml"/>
! <exclude name="**/*.xsl"/>
! </fileset>
</copy>
<copy todir="${webapp.tmp.webinf}">
***************
*** 147,161 ****
<!-- ==================== JSP Build Target ===================================== -->
<target name="build.jsp" depends="build" description="">
! <java classname="org.apache.jasper.JspC" fork="true">
! <classpath refid="compile.classpath"/>
! <arg value="-d"/>
! <arg value="${build.src}"/>
! <arg value="-uriroot"/>
! <arg value="${webapp.tmp}"/>
! <arg value="${webapp.tmp}/*.jsp"/>
! </java>
<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="*.java" excludes="**/CVS/**">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${webapp.tmp.webinf.classes}">
<fileset dir="${build.classes}"/>
--- 148,160 ----
<!-- ==================== JSP Build Target ===================================== -->
<target name="build.jsp" depends="build" description="">
! <!-- JSP pre-compilation -->
! <jspc destdir="${build.src}" srcdir="${webapp.tmp}" uriroot="${webapp.tmp}" classpathref="compile.classpath">
! <include name="**/*.jsp"/>
! </jspc>
! <!-- Compile JSP -->
<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="*.java" excludes="**/CVS/**">
<classpath refid="compile.classpath"/>
</javac>
+ <!-- Add them to classes -->
<copy todir="${webapp.tmp.webinf.classes}">
<fileset dir="${build.classes}"/>
Index: build_website.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_website.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_website.xml 24 May 2002 21:13:39 -0000 1.4
--- build_website.xml 10 Jun 2002 07:45:28 -0000 1.5
***************
*** 11,18 ****
-->
<project name="EJTools Website Build File" default="all" basedir=".">
- <!-- ==================== Global Definitions ======================== -->
- <property file="build/general.properties"/>
- <property file="build/location.properties"/>
- <property environment="env"/>
<!-- ==================== File and Directory Names ======================== -->
<property name="images.root" value="${website.root}/images"/>
--- 11,14 ----
***************
*** 24,29 ****
<echo message="------------------------------------------------------------"/>
</target>
! <!-- ==================== All Target =================================== -->
! <target name="all" depends="info,xweb,javadoc.copy,todo.copy,compress"/>
<!-- ==================== Compress Target =================================== -->
<target name="compress" depends="">
--- 20,28 ----
<echo message="------------------------------------------------------------"/>
</target>
! <!-- ==================== All Target ===================================
! <target name="all" depends="info,xweb,style.copy,tarball.copy,javadoc.copy,todo.copy">
! -->
! <target name="all" depends="info,xweb,style.copy,tarball.copy">
! </target>
<!-- ==================== Compress Target =================================== -->
<target name="compress" depends="">
***************
*** 31,34 ****
--- 30,53 ----
<gzip zipfile="${output.root}/website.tar.gz" src="${output.root}/website.tar"/>
<delete file="${output.root}/website.tar"/>
+ </target>
+ <!-- ==================== Coding Style Copy Target =================================== -->
+ <target name="style.copy" depends="xweb">
+ <loadfile property="style.page" srcFile="${website.root}/content/developers/style.html"/>
+ <filter token="STYLEPAGE" value="${style.page}"/>
+ <move file="${website.root}/output/dev/style.html" tofile="${website.root}/output/dev/style.html.tmp" filtering="true"/>
+ <move file="${website.root}/output/dev/style.html.tmp" tofile="${website.root}/output/dev/style.html"/>
+ </target>
+ <!-- ==================== TarBall Copy Target =================================== -->
+ <target name="tarball.copy" depends="xweb">
+ <mkdir dir="${website.root}/output/downloads"/>
+ <copy todir="${website.root}/output/downloads">
+ <fileset dir="${output.root}">
+ <include name="EJTools*"/>
+ </fileset>
+ </copy>
+ <tstamp/>
+ <filter token="DATE" value="${DSTAMP}"/>
+ <move file="${website.root}/output/dev/source.html" tofile="${website.root}/output/dev/source.html.tmp" filtering="true"/>
+ <move file="${website.root}/output/dev/source.html.tmp" tofile="${website.root}/output/dev/source.html"/>
</target>
<!-- ==================== JavaDoc Copy Target =================================== -->
Index: general.properties
===================================================================
RCS file: /cvsroot/ejtools/build/general.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** general.properties 24 May 2002 21:12:15 -0000 1.6
--- general.properties 10 Jun 2002 07:45:28 -0000 1.7
***************
*** 28,34 ****
# Folders options
# --------------------------------------------------------------------------------
applications.root=applications
libraries.root=libraries
thirdparty.root=thirdparty
website.root=website
- output.root=output
--- 28,36 ----
# Folders options
# --------------------------------------------------------------------------------
+ build.root=build
+ output.root=output
+
applications.root=applications
libraries.root=libraries
thirdparty.root=thirdparty
website.root=website
Index: switch.properties
===================================================================
RCS file: /cvsroot/ejtools/build/switch.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** switch.properties 24 May 2002 21:12:15 -0000 1.9
--- switch.properties 10 Jun 2002 07:45:28 -0000 1.10
***************
*** 50,59 ****
# Modules to dist
# --------------------------------------------------------------------------------
! dist.application.deployment=true
! dist.application.jmx.browser=true
! dist.application.jndi.browser=true
! dist.application.management=true
dist.webapp.jmx.browser=true
! dist.webapp.jndi.browser=true
dist.library.adwt=true
dist.library.common=true
--- 50,59 ----
# Modules to dist
# --------------------------------------------------------------------------------
! #dist.application.deployment=true
! #dist.application.jmx.browser=true
! #dist.application.jndi.browser=true
! #dist.application.management=true
dist.webapp.jmx.browser=true
! #dist.webapp.jndi.browser=true
dist.library.adwt=true
dist.library.common=true
***************
*** 61,64 ****
--- 61,65 ----
dist.library.jboss.provider=true
dist.library.taglib=true
+ dist.library.xdoclet=true
dist.library.xmlweb=true
dist.thirdparty.jsr77=true
***************
*** 85,88 ****
--- 86,103 ----
logo.application.jndi.browser=true
logo.application.management=true
+
+ # Modules to beautify
+ # --------------------------------------------------------------------------------
+ pretty.print.application.deployment=true
+ pretty.print.application.jmx.browser=true
+ pretty.print.application.jndi.browser=true
+ pretty.print.application.management=true
+ pretty.print.webapp.jmx.browser=true
+ pretty.print.webapp.jndi.browser=true
+ pretty.print.library.adwt=true
+ pretty.print.library.common=true
+ pretty.print.library.jboss.provider=true
+ pretty.print.library.taglib=true
+ pretty.print.library.xmlweb=true
# Modules to todo
|
