jvanzyl 01/09/13 10:19:36
Modified: src/tdk build.properties build.xml
Log:
- cvs layout for version 2 apps.
Revision Changes Path
1.3 +0 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 2001/09/12 14:06:16 1.2
+++ build.properties 2001/09/13 17:19:36 1.3
@@ -13,11 +13,7 @@
# This is for external turbine app integration.
# -------------------------------------------------------------------------
-tdk.home = .
-app.root = webContext
app.src = tdk/apps/${turbine.version}
-app.properties = /WEB-INF/conf/TurbineResources.properties
ancillary.dir = tdk/ancillary
share.dir = tdk/apps/${turbine.version}
-master.conf.dir = ../../../../tdk/ancillary/${turbine.version}/src/conf
lib.dir = tdk/lib
1.2 +59 -15 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/09/07 01:40:06 1.1
+++ build.xml 2001/09/13 17:19:36 1.2
@@ -15,8 +15,7 @@
<!-- =================================================================== -->
<target name="properties">
-
- <property name="tdk.home" value="${tdk.home}"/>
+ <property name="tdk.home" value="../../../../../tdk"/>
<property name="app.home" value="${tdk.home}/webapps/${turbine.app}"/>
<property name="app.logs" value="${app.home}/logs"/>
<property name="app.images" value="${app.home}/images"/>
@@ -39,6 +38,20 @@
<property name="output.directory" value="../src"/>
<property name="schema.directory" value="../conf"/>
<property name="test.directory" value="./src/test"/>
+
+ <!-- these are properties used for the sample app
+ generated within the TDK. eventually the sample app
+ that is generated within the TDK will disappear because
+ it is terribly confusing and doesn't separate the
+ dev environment from the runtime environment at all
+ which is bad for many reasons. -->
+
+ <property name="build.dest" value="../classes"/>
+ <property name="src.dir" value="../src"/>
+ <property name="conf.dir" value="../conf"/>
+ <property name="app.root" value="webContext"/>
+ <property name="abs.conf.dir" value="webapp/${turbine.app}/WEB-INF/conf"/>
+ <property name="app.properties"
value="/WEB-INF/conf/TurbineResources.properties"/>
<property name="app.root.templates" value="${app.src}/templates"/>
<property name="app.root.resources" value="${app.src}/resources"/>
@@ -46,7 +59,32 @@
<property name="app.root.build" value="${app.src}/build"/>
<property name="app.root.conf" value="${app.src}/conf"/>
<property name="app.root.modules" value="${app.src}/src/java/modules"/>
+ </target>
+
+ <target name="cvs-layout" depends="cvs-layout-properties,properties">
+ <antcall target="build-base"/>
+ <antcall target="libs"/>
+ <antcall target="deployment-descriptor"/>
+ <antcall target="turbine-resources"/>
+ <mkdir dir="webapps/${turbine.app}/WEB-INF/classes"/>
+ </target>
+
+ <target name="cvs-layout-properties">
+ <property name="app.home" value="../${turbine.app}"/>
+ <property name="tdk.home" value="../tdk"/>
+ <property name="app.conf" value="${app.home}/src/conf"/>
+ <property name="build.dest" value=""/>
+ <property name="src.dir" value="./src"/>
+ <property name="conf.dir" value="./src/conf"/>
+ <property name="app.root" value="../${turbine.app}"/>
+ <property name="abs.conf.dir" value="../${turbine.app}/src/conf"/>
+ <property name="app.properties" value="/src/conf/TurbineResources.properties"/>
+ </target>
+ <target name="build-base">
+ <antcall target="webapp-structure"/>
+ <antcall target="application-template"/>
+ <antcall target="name-project-conf-files"/>
</target>
<!-- =================================================================== -->
@@ -55,11 +93,10 @@
<target name="application" depends="properties">
- <antcall target="webapp-structure"/>
- <antcall target="application-template"/>
+ <antcall target="build-base"/>
<antcall target="libs"/>
<antcall target="deployment-descriptor"/>
- <antcall target="message"/>
+ <mkdir dir="${app.classes}"/>
<!-- Now we have to make some adjustments to have the exact
same setup that we had before so people who are familiar
@@ -98,6 +135,13 @@
<fileset dir="webapps/${turbine.app}/src"/>
</move>
+ <antcall target="name-project-conf-files"/>
+ <antcall target="turbine-resources"/>
+ <antcall target="message"/>
+
+ </target>
+
+ <target name="name-project-conf-files">
<!--
Little hack to make the project schema come out
with the name of the app provided.
@@ -112,11 +156,8 @@
file="${app.conf}/project-intake.xml"
tofile="${app.conf}/${turbine.app}-intake.xml"
/>
-
- <antcall target="turbine-resources"/>
-
</target>
-
+
<target name="message">
<!-- =================================================================== -->
@@ -179,7 +220,6 @@
<mkdir dir="${app.home}"/>
<mkdir dir="${app.logs}"/>
- <mkdir dir="${app.classes}"/>
</target>
@@ -192,18 +232,17 @@
<!-- ================================================================= -->
<target name="libs">
- <copy todir="${app.home}/WEB-INF/lib">
+ <copy todir="webapps/${turbine.app}/WEB-INF/lib">
<fileset dir="${lib.dir}">
<exclude name="turbine*.jar"/>
</fileset>
</copy>
- <copy todir="${app.home}/WEB-INF/lib">
+ <copy todir="webapps/${turbine.app}/WEB-INF/lib">
<fileset dir="${lib.dir}">
<include name="turbine-${turbine.version}*.jar"/>
</fileset>
</copy>
-
</target>
<!-- ================================================================= -->
@@ -221,6 +260,11 @@
<filter token="TARGET_PACKAGE" value="${target.package}"/>
<filter token="TARGET_DIRECTORY" value="${target.directory}"/>
<filter token="MASTER_CONF_DIR" value="${master.conf.dir}"/>
+ <filter token="BUILD_DEST" value="${build.dest}"/>
+ <filter token="SRC_DIR" value="${src.dir}"/>
+ <filter token="CONF_DIR" value="${conf.dir}"/>
+ <filter token="TDK_HOME" value="${tdk.home}"/>
+ <filter token="TURBINE_VERSION" value="${turbine.version}"/>
<copy todir="${app.home}" filtering="yes">
<fileset dir="${app.src}">
@@ -262,7 +306,7 @@
<copy
file="${ancillary.dir}/web.xml"
- tofile="${app.webinf}/web.xml"
+ tofile="webapps/${turbine.app}/WEB-INF/web.xml"
filtering="yes"
/>
@@ -283,7 +327,7 @@
<ant antfile="${ancillary.dir}/${turbine.version}/src/conf/build.xml"
target="tr-props-without-db-values">
<property name="conf.home"
value="${ancillary.dir}/${turbine.version}/src/conf"/>
<property name="master.home"
value="${ancillary.dir}/${turbine.version}/src/conf/master"/>
- <property name="target.dir" value="${app.home}/WEB-INF/conf"/>
+ <property name="target.dir" value="${abs.conf.dir}"/>
<property name="turbine.log" value="/logs/turbine.log"/>
<property name="view.type" value="${app.view}"/>
<property name="database.name" value="${turbine.app}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
