nicolaken 2002/08/27 06:05:57
Modified: . build.xml
Added: . properties.xml
Removed: . database.properties
Log:
Moved the properties in the buildfile and in database.properties in file
properties.xml.
Revision Changes Path
1.258 +65 -118 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- build.xml 24 Aug 2002 00:12:26 -0000 1.257
+++ build.xml 27 Aug 2002 13:05:56 -0000 1.258
@@ -196,12 +196,10 @@
<!-- Properties -->
<!-- =================================================================== -->
- <property name="fullname" value="Apache Cocoon"/>
- <property name="Name" value="Cocoon"/>
- <property name="name" value="cocoon"/>
- <property name="version" value="2.1-dev"/> <!-- This is the current CVS
version -->
- <property name="released.version" value="2.0.3"/> <!-- This is the latest
official release -->
- <property name="year" value="1999-2002"/>
+ <!-- Get the properties from the properties.xml file -->
+ <xmlproperty file="properties.xml"
+ keeproot="false"
+ collapseAttributes="true" />
<echo message="--------------------------------------------------------------"/>
<echo message=" ${fullname} ${version} [${year}] "/>
@@ -217,56 +215,6 @@
<echo message=" "/>
<echo message="--------------------------------------------------------------"/>
- <property name="debug" value="on"/>
- <property name="optimize" value="off"/>
- <property name="deprecation" value="off"/>
- <property name="nowarn" value="on"/>
- <!-- <property name="build.compiler" value="classic"/> -->
-
- <property name="src.dir" value="./src"/>
- <property name="java.dir" value="${src.dir}/java"/>
- <property name="test.dir" value="${src.dir}/test"/>
- <property name="lib.dir" value="./lib"/>
- <property name="tools.dir" value="./tools"/>
- <property name="emacs.dir" value="./src/resources/dev/emacs"/>
- <property name="docs.dir" value="${src.dir}/documentation/xdocs"/>
- <property name="images.dir" value="${src.dir}/documentation/images"/>
- <property name="webapp.dir" value="${src.dir}/webapp"/>
- <property name="resource.dir" value="${src.dir}/resources"/>
- <property name="packages" value="org.apache"/>
- <property name="context.dir" value="${src.dir}/documentation"/>
-
- <property name="scratchpad.dir" value="${src.dir}/scratchpad"/>
- <property name="scratchpad.src" value="${scratchpad.dir}/src"/>
- <property name="scratchpad.lib" value="${scratchpad.dir}/lib"/>
- <property name="scratchpad.webapp" value="${scratchpad.dir}/webapp"/>
- <property name="scratchpad.name" value="cocoon-scratchpad"/>
-
- <property name="build.root" value="./build"/>
- <property name="build.dir" value="${build.root}/${name}"/>
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.test" value="${build.dir}/test"/>
- <property name="build.dest" value="${build.dir}/classes"/>
- <property name="build.docs" value="${build.dir}/docs"/>
- <property name="build.xdocs" value="${build.dir}/xdocs"/>
- <property name="build.docs.printer" value="${build.dir}/printer-docs"/>
- <property name="build.docs.loglevel" value="ERROR"/>
- <property name="build.war" value="${build.dir}/webapp"/>
- <property name="build.javadocs" value="${build.dir}/javadocs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
- <property name="build.scratchpad" value="${build.dir}/scratchpad"/>
- <property name="build.scratchpad.src" value="${build.scratchpad}/src"/>
- <property name="build.scratchpad.dest" value="${build.scratchpad}/classes"/>
- <property name="dist.root" value="./dist"/>
- <property name="dist.name" value="${name}-${version}"/>
- <property name="dist.dir" value="${dist.root}/${dist.name}"/>
- <property name="dist.src.dir" value="${dist.root}/source/${dist.name}"/>
- <property name="dist.bin.dir" value="${dist.root}/bin/${dist.name}"/>
- <property name="dist.samples.dir" value="${dist.root}/samples"/>
- <property name="dist.target" value="${dist.root}"/>
-
- <property name="site" value="../xml-site/targets/${name}"/>
-
<!--
The location of tools.jar, relative to the JAVA_HOME home.
-->
@@ -283,12 +231,11 @@
<filter token="released.version" value="${released.version}"/>
<filter token="install.war" value="${install.war}"/>
- <!-- Add filters for loading database information from database.properties file
-->
- <property file="database.properties"/>
- <filter token="database-driver" value="${database-driver}"/>
- <filter token="database-url" value="${database-url}"/>
- <filter token="database-user" value="${database-user}"/>
- <filter token="database-password" value="${database-password}"/>
+ <!-- Add filters for loading database information -->
+ <filter token="database-driver" value="${cocoon.samples.database.driver}"/>
+ <filter token="database-url" value="${cocoon.samples.database.url}"/>
+ <filter token="database-user" value="${cocoon.samples.database.user}"/>
+ <filter token="database-password" value="${cocoon.samples.database.password}"/>
<!-- compile the ant tasks -->
<mkdir dir="${tools.dir}/anttasks"/>
@@ -1619,20 +1566,20 @@
description="Prepares the source distribution">
<!-- Simply copy all and add the html docs -->
<mkdir dir="${dist.root}"/>
- <mkdir dir="${dist.src.dir}"/>
- <mkdir dir="${dist.src.dir}/bin"/>
- <mkdir dir="${dist.src.dir}/lib"/>
- <mkdir dir="${dist.src.dir}/src"/>
- <mkdir dir="${dist.src.dir}/src/java"/>
- <mkdir dir="${dist.src.dir}/src/documentation"/>
- <mkdir dir="${dist.src.dir}/src/resources"/>
- <mkdir dir="${dist.src.dir}/src/scratchpad"/>
- <mkdir dir="${dist.src.dir}/src/webapp"/>
- <mkdir dir="${dist.src.dir}/docs"/>
- <mkdir dir="${dist.src.dir}/docs/apidocs"/>
- <mkdir dir="${dist.src.dir}/tools"/>
+ <mkdir dir="${dist.src}"/>
+ <mkdir dir="${dist.src}/bin"/>
+ <mkdir dir="${dist.src}/lib"/>
+ <mkdir dir="${dist.src}/src"/>
+ <mkdir dir="${dist.src}/src/java"/>
+ <mkdir dir="${dist.src}/src/documentation"/>
+ <mkdir dir="${dist.src}/src/resources"/>
+ <mkdir dir="${dist.src}/src/scratchpad"/>
+ <mkdir dir="${dist.src}/src/webapp"/>
+ <mkdir dir="${dist.src}/docs"/>
+ <mkdir dir="${dist.src}/docs/apidocs"/>
+ <mkdir dir="${dist.src}/tools"/>
- <copy todir="${dist.src.dir}/tools">
+ <copy todir="${dist.src}/tools">
<fileset dir="${tools.dir}">
<exclude name="anttasks/**"/>
<exclude name="lib/xalan*"/>
@@ -1642,15 +1589,15 @@
</fileset>
</copy>
- <copy todir="${dist.src.dir}/src/documentation">
+ <copy todir="${dist.src}/src/documentation">
<fileset dir="${build.context}"/>
</copy>
- <copy todir="${dist.src.dir}/lib">
+ <copy todir="${dist.src}/lib">
<fileset dir="${lib.dir}"/>
</copy>
- <copy todir="${dist.src.dir}/src/resources" filtering="on">
+ <copy todir="${dist.src}/src/resources" filtering="on">
<fileset dir="${resource.dir}">
<exclude name="**/*.gif"/>
<exclude name="**/*.jpg"/>
@@ -1658,7 +1605,7 @@
</fileset>
</copy>
- <copy todir="${dist.src.dir}/src/resources" filtering="off">
+ <copy todir="${dist.src}/src/resources" filtering="off">
<fileset dir="${resource.dir}">
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
@@ -1666,15 +1613,15 @@
</fileset>
</copy>
- <copy todir="${dist.src.dir}/src/java" filtering="off">
+ <copy todir="${dist.src}/src/java" filtering="off">
<fileset dir="${java.dir}"/>
</copy>
- <copy todir="${dist.src.dir}/src/scratchpad" filtering="off">
+ <copy todir="${dist.src}/src/scratchpad" filtering="off">
<fileset dir="${scratchpad.dir}"/>
</copy>
- <copy todir="${dist.src.dir}/src/webapp" filtering="on">
+ <copy todir="${dist.src}/src/webapp" filtering="on">
<fileset dir="${webapp.dir}">
<exclude name="**/*.gif"/>
<exclude name="**/*.jpg"/>
@@ -1682,7 +1629,7 @@
</fileset>
</copy>
- <copy todir="${dist.src.dir}/src/webapp" filtering="off">
+ <copy todir="${dist.src}/src/webapp" filtering="off">
<fileset dir="${webapp.dir}">
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
@@ -1691,24 +1638,24 @@
</copy>
<!-- Fix for web.xml, cocoon.xconf and sitemap.xmap -->
- <copy file="${webapp.dir}/WEB-INF/cocoon.xconf"
tofile="${dist.src.dir}/src/webapp/WEB-INF/cocoon.xconf" filtering="off"
overwrite="yes"/>
- <copy file="${webapp.dir}/sitemap.xmap"
tofile="${dist.src.dir}/src/webapp/sitemap.xmap" filtering="off" overwrite="yes"/>
- <copy file="${webapp.dir}/WEB-INF/web.xml"
tofile="${dist.src.dir}/src/webapp/WEB-INF/web.xml" filtering="off" overwrite="yes"/>
+ <copy file="${webapp.dir}/WEB-INF/cocoon.xconf"
tofile="${dist.src}/src/webapp/WEB-INF/cocoon.xconf" filtering="off" overwrite="yes"/>
+ <copy file="${webapp.dir}/sitemap.xmap"
tofile="${dist.src}/src/webapp/sitemap.xmap" filtering="off" overwrite="yes"/>
+ <copy file="${webapp.dir}/WEB-INF/web.xml"
tofile="${dist.src}/src/webapp/WEB-INF/web.xml" filtering="off" overwrite="yes"/>
- <copy todir="${dist.src.dir}/docs">
+ <copy todir="${dist.src}/docs">
<fileset dir="${build.docs}"/>
</copy>
- <copy todir="${dist.src.dir}/docs/apidocs">
+ <copy todir="${dist.src}/docs/apidocs">
<fileset dir="${build.javadocs}"/>
</copy>
- <copy todir="${dist.src.dir}">
+ <copy todir="${dist.src}">
<fileset dir="${docs.dir}">
<include name="changes.xml, todo.xml"/>
</fileset>
</copy>
- <copy todir="${dist.src.dir}" filtering="on">
+ <copy todir="${dist.src}" filtering="on">
<fileset dir=".">
<include name="README"/>
<include name="CREDITS"/>
@@ -1721,14 +1668,14 @@
<include name="*.properties"/>
</fileset>
</copy>
- <copy file="INSTALL.src" tofile="${dist.src.dir}/INSTALL" filtering="on"/>
+ <copy file="INSTALL.src" tofile="${dist.src}/INSTALL" filtering="on"/>
- <chmod perm="+x" file="${dist.src.dir}/run.sh"/>
- <chmod perm="+x" file="${dist.src.dir}/build.sh"/>
- <chmod perm="+x" file="${dist.src.dir}/tools/bin/antRun"/>
- <fixcrlf srcdir="${dist.src.dir}" includes="**.sh" eol="lf"/>
- <fixcrlf srcdir="${dist.src.dir}" includes="antRun" eol="lf"/>
- <fixcrlf srcdir="${dist.src.dir}" includes="**.bat" eol="crlf"/>
+ <chmod perm="+x" file="${dist.src}/run.sh"/>
+ <chmod perm="+x" file="${dist.src}/build.sh"/>
+ <chmod perm="+x" file="${dist.src}/tools/bin/antRun"/>
+ <fixcrlf srcdir="${dist.src}" includes="**.sh" eol="lf"/>
+ <fixcrlf srcdir="${dist.src}" includes="antRun" eol="lf"/>
+ <fixcrlf srcdir="${dist.src}" includes="**.bat" eol="crlf"/>
</target>
<!-- =================================================================== -->
@@ -1756,17 +1703,17 @@
<target name="dist-bin" depends="package, webapp, docs, javadocs">
<!-- Copy webapp and the html docs -->
<mkdir dir="${dist.root}"/>
- <mkdir dir="${dist.bin.dir}"/>
- <mkdir dir="${dist.bin.dir}/webapp"/>
- <mkdir dir="${dist.bin.dir}/docs"/>
- <mkdir dir="${dist.bin.dir}/docs/apidocs"/>
+ <mkdir dir="${dist.bin}"/>
+ <mkdir dir="${dist.bin}/webapp"/>
+ <mkdir dir="${dist.bin}/docs"/>
+ <mkdir dir="${dist.bin}/docs/apidocs"/>
- <copy todir="${dist.bin.dir}/webapp">
+ <copy todir="${dist.bin}/webapp">
<fileset dir="${build.war}"/>
</copy>
<!-- And now the jars -->
- <copy todir="${dist.bin.dir}/webapp/WEB-INF/lib">
+ <copy todir="${dist.bin}/webapp/WEB-INF/lib">
<fileset dir="${lib.dir}/core">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
@@ -1775,35 +1722,35 @@
<include name="*.jar"/>
</fileset>
</copy>
- <copy todir="${dist.bin.dir}/webapp/WEB-INF/lib">
+ <copy todir="${dist.bin}/webapp/WEB-INF/lib">
<fileset dir="${lib.dir}/optional">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
</copy>
- <copy todir="${dist.bin.dir}/webapp/WEB-INF/lib">
+ <copy todir="${dist.bin}/webapp/WEB-INF/lib">
<fileset dir="${lib.dir}/local">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
</copy>
- <copy file="${build.dir}/${name}.jar"
tofile="${dist.bin.dir}/webapp/WEB-INF/lib/${name}-${version}.jar"/>
+ <copy file="${build.dir}/${name}.jar"
tofile="${dist.bin}/webapp/WEB-INF/lib/${name}-${version}.jar"/>
- <copy todir="${dist.bin.dir}/docs">
+ <copy todir="${dist.bin}/docs">
<fileset dir="${build.docs}"/>
</copy>
- <copy todir="${dist.bin.dir}/docs/apidocs">
+ <copy todir="${dist.bin}/docs/apidocs">
<fileset dir="${build.javadocs}"/>
</copy>
- <copy todir="${dist.bin.dir}">
+ <copy todir="${dist.bin}">
<fileset dir="${docs.dir}">
<include name="changes.xml, todo.xml"/>
</fileset>
</copy>
- <copy todir="${dist.bin.dir}" filtering="on">
+ <copy todir="${dist.bin}" filtering="on">
<fileset dir=".">
<include name="CREDITS"/>
<include name="README"/>
@@ -1812,16 +1759,16 @@
<include name="KEYS"/>
</fileset>
</copy>
- <copy file="INSTALL.bin" tofile="${dist.bin.dir}/INSTALL" filtering="on"/>
+ <copy file="INSTALL.bin" tofile="${dist.bin}/INSTALL" filtering="on"/>
<!-- Build the war file -->
- <jar jarfile="${dist.bin.dir}/${name}.war"
- basedir="${dist.bin.dir}/webapp"
+ <jar jarfile="${dist.bin}/${name}.war"
+ basedir="${dist.bin}/webapp"
includes="**"
excludes="samples/**"/>
<!-- Delete the webapp directory -->
- <delete dir="${dist.bin.dir}/webapp"/>
+ <delete dir="${dist.bin}/webapp"/>
</target>
<!-- =================================================================== -->
@@ -1848,8 +1795,8 @@
<!-- =================================================================== -->
<target name="dist-samples" depends="webapp">
<!-- Copy webapp and the html docs -->
- <mkdir dir="${dist.samples.dir}/samples"/>
- <copy todir="${dist.samples.dir}/samples">
+ <mkdir dir="${dist.samples}/samples"/>
+ <copy todir="${dist.samples}/samples">
<fileset dir="${build.war}/samples"/>
</copy>
</target>
@@ -1859,7 +1806,7 @@
<!-- =================================================================== -->
<target name="dist-samples-zip" depends="dist-samples">
<zip zipfile="${dist.target}/${dist.name}-samples.zip"
- basedir="${dist.samples.dir}"/>
+ basedir="${dist.samples}"/>
</target>
<!-- =================================================================== -->
@@ -1867,7 +1814,7 @@
<!-- =================================================================== -->
<target name="dist-samples-tgz" depends="dist-samples">
<tar tarfile="${dist.target}/${dist.name}-samples.tar"
- basedir="${dist.samples.dir}"
+ basedir="${dist.samples}"
longfile="gnu"/>
<gzip zipfile="${dist.target}/${dist.name}-samples.tar.gz"
src="${dist.target}/${dist.name}-samples.tar"/>
1.1 xml-cocoon2/properties.xml
Index: properties.xml
===================================================================
<?xml version="1.0"?>
<!-- Build properties - these override any property specified in the build -->
<properties>
<!-- Properties of the build -->
<build>
<!-- What to tell the compiler -->
<compiler
emacs="on"
warnings="true"
pedantic="false"
depend="true"
fulldepend="true"
debug="on"
optimize="off"
deprecation="on"
nowarn="off"
type="classic"
vm="1.2" />
</build>
<debug>on</debug>
<optimize>off</optimize>
<deprecation>off</deprecation>
<nowarn>on</nowarn>
<fullname>Apache Cocoon</fullname>
<Name>Cocoon</Name>
<name>cocoon</name>
<version>2.1-dev</version> <!-- This is the current CVS version -->
<released version="2.0.3" /> <!-- This is the latest official release -->
<year>1999-2002</year>
<packages>org.apache</packages>
<src dir="./src" />
<java dir="./src/java" />
<test dir="./src/test" />
<lib dir="./lib" />
<tools dir="./tools" />
<emacs dir="./src/resources/dev/emacs" />
<docs dir="./src/documentation/xdocs" />
<images dir="./src/documentation/images" />
<webapp dir="./src/webapp" />
<resource dir="./src/resources" />
<context dir="./src/documentation" />
<scratchpad
dir="./src/scratchpad"
src="./src/scratchpad/src"
lib="./src/scratchpad/lib"
webapp="./src/scratchpad/webapp"
name="cocoon-scratchpad" />
<build
root="./build"
dir="./build/cocoon"
src="./build/cocoon/src"
test="./build/cocoon/test"
dest="./build/cocoon/classes"
docs="./build/cocoon/docs"
xdocs="./build/cocoon/xdocs"
war="./build/cocoon/webapp"
javadocs="./build/cocoon/javadocs"
context="./build/cocoon/documentation">
<scratchpad
dir="./build/cocoon/scratchpad"
src="./build/cocoon/scratchpad/src"
dest="./build/cocoon/scratchpad/classes" />
<docs
printer="./build/cocoon/printer-docs"
loglevel="ERROR" />
</build>
<dist
root="./dist"
name="cocoon-dev"
dir="./dist/cocoon"
target="./dist"
src="./dist/source/cocoon"
bin="./dist/bin/cocoon"
samples="./dist/samples" />
<site>../xml-site/targets/cocoon</site>
<cocoon>
<samples>
<database>
<driver>org.hsqldb.jdbcDriver</driver> <!-- Specify the Driver
Class -->
<url>jdbc:hsqldb:hsql://localhost:9002</url> <!-- Specify the URL for the
Database -->
<user>sa</user> <!-- Specify the user id -->
<password></password> <!-- Specify the password -->
</database>
</samples>
<blocks>
</blocks>
</cocoon>
</properties>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
