cedric 01/09/10 06:16:55 Modified: contrib/tiles build.xml build.properties.sample build-webapps.xml Log: Improve build process Revision Changes Path 1.2 +2 -10 jakarta-struts/contrib/tiles/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/tiles/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 2001/08/01 14:36:36 1.1 +++ build.xml 2001/09/10 13:16:55 1.2 @@ -20,10 +20,6 @@ "build.properties" file in the base directory, or a "build.properties" file in your user home directory. - catalina.home (optional). The path to the Tomcat 4.0 - installation. This is required only when - executing the "deploy.catalina" target. - servlet.jar (required). The path to the Servlet API classes to compile against (currently, either version 2.2 or 2.3 supported). @@ -40,10 +36,6 @@ of the Jakarta Commons Digester package (version 1.0 or later). - tomcat.home (optional). The path to the Tomcat 3.x - installation. This is required only when - executing the "deploy.tomcat" target. - struts.libs (required). The path to the Struts library installation. . @@ -62,7 +54,6 @@ <property name="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/> <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/> <property name="struts.libs" value="${struts.home}/lib"/> - <property name="tomcat.home" value="../build/tomcat"/> <property name="xerces.jar" value="../xml-xerces/xerces.jar"/> @@ -154,9 +145,10 @@ <echo message="java.class.path = ${java.class.path}"/> <echo message="java.home = ${java.home}"/> <echo message="user.home = ${user.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="struts.home = ${struts.home}"/> <echo message="struts.libs = ${struts.libs}"/> <echo message="dist.home = ${dist.home}"/> + <echo message="build.home = ${build.home}"/> <echo message="basedir = ${basedir}"/> </target> 1.2 +1 -1 jakarta-struts/contrib/tiles/build.properties.sample Index: build.properties.sample =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/tiles/build.properties.sample,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.properties.sample 2001/08/01 14:36:36 1.1 +++ build.properties.sample 2001/09/10 13:16:55 1.2 @@ -6,7 +6,7 @@ # to "build.properties" in the same directory that contains the Struts # "build.xml" file. # -# $Id: build.properties.sample,v 1.1 2001/08/01 14:36:36 cedric Exp $ +# $Id: build.properties.sample,v 1.2 2001/09/10 13:16:55 cedric Exp $ # ----------------------------------------------------------------------------- # WARNING: The relative paths below assume that the build.xml file is in the 1.2 +6 -6 jakarta-struts/contrib/tiles/build-webapps.xml Index: build-webapps.xml =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/tiles/build-webapps.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build-webapps.xml 2001/08/01 14:36:36 1.1 +++ build-webapps.xml 2001/09/10 13:16:55 1.2 @@ -17,7 +17,7 @@ build.xml script. build.home Base directory into which we are building - the Struts tiles. + the Struts Tiles. compile.classpath If specified, contains a set of JAR files and/or directories to be added to the @@ -29,6 +29,9 @@ struts.libs The directory containing struts.jar and the associated TLD files. + tiles.libs The directory containing tiles.jar and + the associated TLD files. + webapp.libs If specified, must be the pathname of a directory from which all available "*.jar" files are copied to the web @@ -37,7 +40,6 @@ <property name="build.home" value="target"/> <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/> -<property name="struts.libs" value="${struts.home}/lib"/> <property name="tiles.libs" value="${build.home}/library"/> @@ -65,9 +67,6 @@ <!-- The base directory for distribution targets --> <property name="dist.home" value="dist" /> -<!-- The directory into which Struts JAR and TLD files have been created --> -<property name="struts.home" value="${build.home}/library" /> - <!-- Directory where core struts library configurations files are stored --> <property name="conf.share.dir" value="conf/share"/> @@ -77,10 +76,11 @@ <!-- ========== Executable Targets ======================================== --> +<!-- <target name="init" > <available property="make.optional.webapps" file="${tiles.libs}" /> </target> - +--> <!-- The "static.generic" target causes the "static" target of each