jvanzyl 01/09/24 09:49:49
Modified: src/tdk build-cvslayout.properties build.properties
build.xml
src/tdk/apps/2 build.xml
Log:
- starting to make changes so that a cvslayout app is fully functional
on its own. testing a cvslayout application completely works but
a project using a cvslayout has to provide some of the setup stages
that the testing process takes care off.
jeff: sorry i had to remove the ${turbine.app.loc} thing for now
because ant is giving me grief in variable expansion so i'm just
assuming the app is in parallel with the tdk for now. we can put
it back when everything else is working.
Revision Changes Path
1.5 +5 -5 jakarta-turbine-tdk/src/tdk/build-cvslayout.properties
Index: build-cvslayout.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build-cvslayout.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-cvslayout.properties 2001/09/22 18:14:58 1.4
+++ build-cvslayout.properties 2001/09/24 16:49:49 1.5
@@ -1,9 +1,9 @@
-app.home=${turbine.app.loc}/${tdk.project}
+app.home=${tdk.home}/../${tdk.project}
app.conf=${app.home}/src/conf
-abs.conf.dir=${turbine.app.loc}/${tdk.project}/src/conf
-app.root=${turbine.app.loc}/${tdk.project}
+abs.conf.dir=${tdk.home}/../${tdk.project}/src/conf
+app.root=${tdk.home}/../${tdk.project}
app.properties=/src/conf/TurbineResources.properties
build.dest = @TDK_HOME@/webapps/${tdk.project}/WEB-INF/classes
-src.dir=${turbine.app.loc}/${tdk.project}/src
-conf.dir=${turbine.app.loc}/${tdk.project}/src/conf
+src.dir=@TDK_HOME@/../${tdk.project}/src
+conf.dir=@TDK_HOME@/../${tdk.project}/src/conf
1.10 +0 -7 jakarta-turbine-tdk/src/tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties 2001/09/22 18:14:58 1.9
+++ build.properties 2001/09/24 16:49:49 1.10
@@ -7,10 +7,3 @@
tdk.project = @PROJECT@
target.package = org.mycompany.newapp
target.directory = org/mycompany/newapp
-
-# -------------------------------------------------------------------------
-# If you want to change where the generated applications are placed, use
-# and absolute path here.
-# -------------------------------------------------------------------------
-
-turbine.app.loc = ${tdk.home}/..
1.17 +29 -16 jakarta-turbine-tdk/src/tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/09/22 18:14:58 1.16
+++ build.xml 2001/09/24 16:49:49 1.17
@@ -18,29 +18,37 @@
<!-- Check that properties are defined correctly. -->
<!-- ================================================================ -->
- <target name="setup" unless="tdk.home">
- <echo>
- ***
- * ERROR : The 'tdk.home' property is not defined or
- * is pointing to an invalid directory.
- *
- * In your personal build.properties define tdk.home to
- * point to an absolute path where your tdk is installed.
- * Example: tdk.home=${user.home}/tdk
- ***
- </echo>
- <fail message="ERROR: tdk.home not defined properly: ${tdk.home}"/>
+ <target
+ name="setup"
+ unless="tdk.home">
+
+ <echo>
+ ***
+ * ERROR : The 'tdk.home' property is not defined or
+ * is pointing to an invalid directory.
+ *
+ * In your personal build.properties define tdk.home to
+ * point to an absolute path where your tdk is installed.
+ * Example: tdk.home=${user.home}/tdk
+ ***
+ </echo>
+ <fail message="ERROR: tdk.home not defined properly: ${tdk.home}"/>
</target>
<!-- =================================================================== -->
<!-- P R O P E R T I E S -->
<!-- =================================================================== -->
- <target name="properties">
+ <target
+ name="properties">
+
<property file="tdk/build-classic.properties"/>
</target>
- <target name="cvslayout" depends="setup,cvslayout-properties,properties">
+ <target
+ name="cvslayout"
+ depends="setup,cvslayout-properties,properties">
+
<antcall target="build-base"/>
<antcall target="name-project-conf-files"/>
<antcall target="libs"/>
@@ -55,7 +63,9 @@
<property file="tdk/build-cvslayout.properties"/>
</target>
- <target name="build-base">
+ <target
+ name="build-base">
+
<antcall target="webapp-structure"/>
<antcall target="application-template"/>
</target>
@@ -64,7 +74,10 @@
<!-- S A M P L E A P P L I C A T I O N -->
<!-- =================================================================== -->
- <target name="application" depends="setup,properties">
+ <target
+ name="application"
+ depends="setup,properties">
+
<antcall target="build-base"/>
<antcall target="adjust-for-classic"/>
<antcall target="name-project-conf-files"/>
1.21 +8 -0 jakarta-turbine-tdk/src/tdk/apps/2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 2001/09/23 01:33:10 1.20
+++ build.xml 2001/09/24 16:49:49 1.21
@@ -39,9 +39,17 @@
<include name="templates/**"/>
</fileset>
</copy>
+
+ <!-- Move the application configuration files into position. -->
<copy todir="${build.webappRoot}/WEB-INF/conf">
<fileset dir="src/conf"/>
</copy>
+
+ <!-- Move the application specific JARs into position -->
+ <copy todir="${build.webappRoot}/WEB-INF/lib">
+ <fileset dir="lib/**"/>
+ </copy>
+
</target>
<target
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
