You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tdk-dev@turbine.apache.org by jv...@apache.org on 2001/05/29 01:43:01 UTC
cvs commit: jakarta-turbine-tdk/src build.properties build.xml
jvanzyl 01/05/28 16:43:01
Modified: src build.properties build.xml
Log:
Revision Changes Path
1.3 +2 -0 jakarta-turbine-tdk/src/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 2001/05/25 06:29:21 1.2
+++ build.properties 2001/05/28 23:43:00 1.3
@@ -9,3 +9,5 @@
target.directory = org/mycompany/newapp
tdk.home = .
+app.root = share/sample
+share.dir = share
1.11 +77 -64 jakarta-turbine-tdk/src/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 2001/05/25 06:37:15 1.10
+++ build.xml 2001/05/28 23:43:00 1.11
@@ -40,14 +40,12 @@
<property name="output.directory" value="../src"/>
<property name="schema.directory" value="../conf"/>
- <property name="app.root" value="share/sample"/>
<property name="app.root.templates" value="${app.root}/templates"/>
<property name="app.root.resources" value="${app.root}/resources"/>
<property name="app.root.images" value="${app.root}/images"/>
- <property name="app.root.webinf" value="${app.root}/WEB-INF"/>
- <property name="app.root.build" value="${app.root}/WEB-INF/build"/>
- <property name="app.root.conf" value="${app.root}/WEB-INF/conf"/>
- <property name="app.root.modules" value="${app.root}/WEB-INF/src/java/modules"/>
+ <property name="app.root.build" value="${app.root}/build"/>
+ <property name="app.root.conf" value="${app.root}/conf"/>
+ <property name="app.root.modules" value="${app.root}/src/java/modules"/>
</target>
@@ -60,8 +58,14 @@
<antcall target="webapp-structure"/>
<antcall target="torque"/>
<antcall target="turbine-schemas"/>
- <antcall target="project"/>
- <antcall target="project-libs"/>
+ <antcall target="turbine-libs"/>
+ <antcall target="deployment-descriptor"/>
+ <antcall target="templates"/>
+ <antcall target="resources"/>
+ <antcall target="images"/>
+ <antcall target="build"/>
+ <antcall target="conf"/>
+ <antcall target="sample-source"/>
<antcall target="flux"/>
<antcall target="turbine-resources"/>
@@ -137,7 +141,7 @@
<target name="torque">
<copy todir="${app.torque}">
- <fileset dir="share/conf/torque">
+ <fileset dir="${share.dir}/conf/torque">
<exclude name="build.properties"/>
<exclude name="build.xml"/>
<exclude name="schema/**"/>
@@ -151,75 +155,63 @@
<!-- ================================================================= -->
<target name="turbine-schemas">
-
<copy todir="${app.conf}">
- <fileset dir="share/conf/master">
+ <fileset dir="${share.dir}/conf/master">
<include name="turbine-schema.xml"/>
<include name="id-table-schema.xml"/>
</fileset>
</copy>
-
</target>
<!-- ================================================================= -->
<!-- P R O J E C T L I B S -->
<!-- ================================================================= -->
-
- <target name="project-libs">
-
+ <!-- These are JARS that all turbine applications need to work. -->
+ <!-- Right now these are stored in Turbine's CVS but eventually -->
+ <!-- they will probably become part of the TDK. -->
+ <!-- ================================================================= -->
+
+ <target name="turbine-libs">
<copy todir="${app.home}/WEB-INF/lib">
- <fileset dir="share/lib"/>
+ <fileset dir="${share.dir}/lib"/>
</copy>
-
</target>
<!-- ================================================================= -->
- <!-- P R O J E C T -->
+ <!-- T E M P L A T E S -->
<!-- ================================================================= -->
- <!--
-
- These are all pretty much app specific. We can skip this
- if an app is being exported to the TDK.
-
- 1) WEB-INF/build/GETTING_STARTED.txt
- 2) WEB-INF/src/ (needs transforming to package)
- 3) templates/
- 4) resources/
- 5) images/
-
- -->
-
- <target name="project">
-
- <!-- ================================================================= -->
- <!-- Copy the files specific to the application type -->
- <!-- specified. But we can't copy the source files -->
- <!-- yet because we have to change them a bit first -->
- <!-- and create the directory structure that matches -->
- <!-- the selected target package. -->
- <!-- ================================================================= -->
-
- <!-- T E M P L A T E S -->
-
+ <target name="templates">
<copy todir="${app.templates}">
<fileset dir="${app.root.templates}"/>
</copy>
-
- <!-- R E S O U R C E S -->
+ </target>
+ <!-- ================================================================= -->
+ <!-- R E S O U R C E S -->
+ <!-- ================================================================= -->
+
+ <target name="resources">
<copy todir="${app.resources}">
<fileset dir="${app.root.resources}"/>
</copy>
-
- <!-- I M A G E S -->
+ </target>
+ <!-- ================================================================= -->
+ <!-- I M A G E S -->
+ <!-- ================================================================= -->
+
+ <target name="images">
<copy todir="${app.images}">
<fileset dir="${app.root.images}"/>
</copy>
+ </target>
- <!-- B U I L D -->
+ <!-- ================================================================= -->
+ <!-- B U I L D -->
+ <!-- ================================================================= -->
+ <target name="build">
<filter token="PROJECT" value="${turbine.app}"/>
<filter token="DATABASE" value="${database}"/>
<filter token="TORQUE_HOME" value="${torque.home}"/>
@@ -227,18 +219,17 @@
<filter token="OUTPUT_DIRECTORY" value="${output.directory}"/>
<filter token="SCHEMA_DIRECTORY" value="${schema.directory}"/>
<filter token="TARGET_PACKAGE" value="${target.package}"/>
- <filter token="TARGET_PACKAGE" value="${target.package}"/>
-
- <copy
- file="${app.root.webinf}/web.xml"
- tofile="${app.webinf}/web.xml"
- filtering="yes"
- />
<copy todir="${app.build}" filtering="yes">
<fileset dir="${app.root.build}"/>
</copy>
+ </target>
+
+ <!-- ================================================================= -->
+ <!-- C O N F -->
+ <!-- ================================================================= -->
+ <target name="conf">
<copy todir="${app.conf}" filtering="yes">
<fileset dir="${app.root.conf}"/>
</copy>
@@ -257,13 +248,35 @@
file="${app.conf}/project-inputs.xml"
tofile="${app.conf}/${turbine.app}-inputs.xml"
/>
+ </target>
- <mkdir dir="${app.modules}"/>
+ <!-- ================================================================= -->
+ <!-- S A M P L E S O U R C E -->
+ <!-- ================================================================= -->
+
+ <target name="sample-source">
+ <mkdir dir="${app.modules}"/>
+ <filter token="TARGET_PACKAGE" value="${target.package}"/>
<copy todir="${app.modules}" filtering="yes">
<fileset dir="${app.root.modules}"/>
</copy>
+ </target>
+ <!-- ================================================================= -->
+ <!-- D E P L O Y M E N T D E S C R I P T O R -->
+ <!-- ================================================================= -->
+
+ <target name="deployment-descriptor">
+
+ <filter token="PROJECT" value="${turbine.app}"/>
+
+ <copy
+ file="${share.dir}/web.xml"
+ tofile="${app.webinf}/web.xml"
+ filtering="yes"
+ />
+
</target>
<!-- ================================================================= -->
@@ -273,23 +286,21 @@
<target name="flux">
<copy todir="${app.src}/java">
- <fileset dir="share/flux/src/java"/>
+ <fileset dir="${share.dir}/flux/src/java"/>
</copy>
<copy todir="${app.home}/templates/flux">
- <fileset dir="share/flux/src/templates"/>
+ <fileset dir="${share.dir}/flux/src/templates"/>
</copy>
<copy todir="${app.home}/resources">
- <fileset dir="share/flux/src/resources">
+ <fileset dir="${share.dir}/flux/src/resources">
<exclude name="skin.props"/>
</fileset>
</copy>
- <copy file="share/flux/conf/Flux.properties" todir="${app.conf}"/>
+ <copy file="${share.dir}/flux/conf/Flux.properties" todir="${app.conf}"/>
- <property name="flux.modules" value="org.apache.turbine.flux.modules"/>
-
</target>
<!-- ================================================================= -->
@@ -301,10 +312,12 @@
<!-- ================================================================= -->
<target name="turbine-resources">
+
+ <property name="flux.modules" value="org.apache.turbine.flux.modules"/>
- <ant antfile="share/conf/build.xml" target="tr-props-without-db-values">
- <property name="conf.home" value="share/conf"/>
- <property name="master.home" value="share/conf/master"/>
+ <ant antfile="${share.dir}/conf/build.xml" target="tr-props-without-db-values">
+ <property name="conf.home" value="${share.dir}/conf"/>
+ <property name="master.home" value="${share.dir}/conf/master"/>
<property name="target.dir" value="${app.home}/WEB-INF/conf"/>
<property name="turbine.log" value="/logs/turbine.log"/>
<property name="view.type" value="${app.view}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org