jvanzyl 01/09/19 08:16:38
Modified: . build-tomcat4.xml build.properties build.xml
test.sh
Log:
- using "target" as the final distribution direction which follows
the jakarta guidelines more closely.
- trying to make the properties less confusing before documenting
- adjust test.sh script for change in the distribution directory
Revision Changes Path
1.3 +9 -9 jakarta-turbine-tdk/build-tomcat4.xml
Index: build-tomcat4.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-tomcat4.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tomcat4.xml 2001/09/15 14:29:20 1.2
+++ build-tomcat4.xml 2001/09/19 15:16:38 1.3
@@ -8,7 +8,7 @@
<target name="main">
- <copy todir="${tdk.dist}">
+ <copy todir="${tdk.root.dir}">
<fileset dir="${tomcat.dist}">
<exclude name="webapps/**"/>
<exclude name="src/**"/>
@@ -18,31 +18,31 @@
</fileset>
</copy>
- <delete file="${tdk.dist}/conf/server.xml"/>
+ <delete file="${tdk.root.dir}/conf/server.xml"/>
- <copy todir="${tdk.dist}/conf">
+ <copy todir="${tdk.root.dir}/conf">
<fileset dir="${tomcat.conf}"/>
</copy>
- <replace file="${tdk.dist}/conf/server.xml">
+ <replace file="${tdk.root.dir}/conf/server.xml">
<replacetoken><![CDATA[<!-- Tomcat Examples Context -->]]></replacetoken>
<replacevalue><![CDATA[<!-- Comment Out Examples]]></replacevalue>
</replace>
- <replace file="${tdk.dist}/conf/server.xml">
+ <replace file="${tdk.root.dir}/conf/server.xml">
<replacetoken><![CDATA[<!-- PersistentManager]]></replacetoken>
<replacevalue><![CDATA[-->
<!-- PersistentManager]]></replacevalue>
</replace>
- <replace file="${tdk.dist}/conf/server.xml">
+ <replace file="${tdk.root.dir}/conf/server.xml">
<replacetoken><![CDATA[<Environment ]]></replacetoken>
<replacevalue><![CDATA[<!--
<Environment ]]></replacevalue>
</replace>
- <replace file="${tdk.dist}/conf/server.xml">
+ <replace file="${tdk.root.dir}/conf/server.xml">
<replacetoken><![CDATA[</Context>]]></replacetoken>
<replacevalue><![CDATA[</Context> -->
@@ -59,11 +59,11 @@
]]></replacevalue>
</replace>
- <chmod dir="${tdk.dist}/bin" perm="+x" includes="**/*.sh"/>
+ <chmod dir="${tdk.root.dir}/bin" perm="+x" includes="**/*.sh"/>
</target>
<target name="production-dist">
- <replace file="${tdk.dist}/conf/server.xml">
+ <replace file="${tdk.root.dir}/conf/server.xml">
<replacetoken><![CDATA[<!-- TDK SITE -->]]></replacetoken>
<replacevalue><![CDATA[<Context path="" docBase="site" reloadable="true"/>]]>
</replacevalue>
1.10 +3 -3 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties 2001/09/19 14:55:24 1.9
+++ build.properties 2001/09/19 15:16:38 1.10
@@ -4,9 +4,9 @@
tdk.src = ./src/tdk
tdk.xdocs = ./xdocs
-tdk.base = ./dist
-tdk.dist = ${tdk.base}/tdk
-tdk.share.dir = ${tdk.dist}/tdk
+tdk.target.dir = ./target
+tdk.root.dir = ${tdk.target.dir}/tdk
+tdk.share.dir = ${tdk.root.dir}/tdk
app2.template.dir = ${tdk.share.dir}/apps/2
app3.template.dir = ${tdk.share.dir}/apps/3
ancillary2.dir = ${tdk.share.dir}/ancillary/2
1.13 +6 -6 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 2001/09/19 14:55:24 1.12
+++ build.xml 2001/09/19 15:16:38 1.13
@@ -26,17 +26,17 @@
<!-- =================================================================== -->
<target name="test-dist" description="--> generates the TDK without docs">
- <delete dir="${tdk.base}"/>
- <mkdir dir="${tdk.dist}"/>
+ <delete dir="${tdk.target.dir}"/>
+ <mkdir dir="${tdk.root.dir}"/>
<copy todir="${tdk.share.dir}">
<fileset dir="${tdk.src}"/>
</copy>
<!-- We need to move the build files up one directory -->
- <move file="${tdk.share.dir}/build.properties" todir="${tdk.dist}"/>
- <move file="${tdk.share.dir}/build.xml" todir="${tdk.dist}"/>
- <move file="${tdk.share.dir}/GETTING_STARTED.txt" todir="${tdk.dist}"/>
+ <move file="${tdk.share.dir}/build.properties" todir="${tdk.root.dir}"/>
+ <move file="${tdk.share.dir}/build.xml" todir="${tdk.root.dir}"/>
+ <move file="${tdk.share.dir}/GETTING_STARTED.txt" todir="${tdk.root.dir}"/>
<ant antfile="build-${servlet.container}.xml"/>
<ant antfile="build-libs.xml"/>
@@ -76,7 +76,7 @@
<!-- =================================================================== -->
<target name="clean">
- <delete dir="${tdk.base}"/>
+ <delete dir="${tdk.target.dir}"/>
</target>
<target name="test">
1.2 +2 -2 jakarta-turbine-tdk/test.sh
Index: test.sh
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/test.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.sh 2001/09/07 01:40:06 1.1
+++ test.sh 2001/09/19 15:16:38 1.2
@@ -16,13 +16,13 @@
# Move to the assembled TDK and generate
# the sample application.
(
- cd dist/tdk
+ cd target/tdk
ant
)
# Move to the generated sample application
# and execute the init target.
(
- cd dist/tdk/webapps/newapp/WEB-INF/build
+ cd target/tdk/webapps/newapp/WEB-INF/build
ant init
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
