jvanzyl 01/09/14 18:05:14
Modified: src/tdk build.xml
Log:
- cleaning up a slew of unused properties
- attempting to make the classic build work along with the new cvslayout
method
Revision Changes Path
1.4 +0 -59 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/09/13 19:43:32 1.3
+++ build.xml 2001/09/15 01:05:14 1.4
@@ -4,9 +4,6 @@
<project name="TDK" default="application" basedir=".">
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time it compiles it -->
-
<property file="build.properties"/>
<property file="${user.home}/build.properties"/>
@@ -20,45 +17,19 @@
<property name="app.logs" value="${app.home}/logs"/>
<property name="app.images" value="${app.home}/images"/>
<property name="app.templates" value="${app.home}/templates"/>
- <property name="app.resources" value="${app.home}/resources"/>
- <property name="app.webinf" value="${app.home}/WEB-INF"/>
<property name="app.conf" value="${app.home}/WEB-INF/conf"/>
- <property name="app.db" value="${app.home}/WEB-INF/db"/>
<property name="app.src" value="${app.home}/WEB-INF/src"/>
<property name="app.classes" value="${app.home}/WEB-INF/classes"/>
- <property name="app.lib" value="${app.home}/WEB-INF/lib"/>
- <property name="app.build" value="${app.home}/WEB-INF/build"/>
- <property name="app.project" value="${app.home}/WEB-INF/build/project"/>
- <property name="app.modules"
value="${app.home}/WEB-INF/src/java/${target.directory}/modules"/>
- <property name="app.view" value="velocity"/>
- <property name="app.type" value="peer"/>
<property name="database" value="mysql"/>
- <property name="torque.home" value="."/>
- <property name="template.path" value="bin/torque/templates"/>
<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"/>
- <property name="app.root.images" value="${app.src}/images"/>
- <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">
@@ -187,32 +158,6 @@
</target>
<!-- =================================================================== -->
- <!-- I N T E G R A T E A P P L I C A T I O N -->
- <!-- =================================================================== -->
- <!-- -->
- <!-- =================================================================== -->
-
- <!-- We have to change the sample app to match what scarab/tambora
- have set up. For now this will take care of adjusting
- the properties -->
-
- <target name="integrate-properties">
- <property name="app.root.templates" value="${app.src}/src/templates"/>
- <property name="app.root.conf" value="${app.src}/src/conf"/>
- </target>
-
- <target name="integrate" depends="integrate-properties,properties">
- <antcall target="webapp-structure"/>
- <antcall target="deployment-descriptor"/>
- <antcall target="turbine-resources"/>
- </target>
-
- <target name="setup" depends="properties">
- <antcall target="turbine-libs"/>
- <antcall target="deployment-descriptor"/>
- </target>
-
- <!-- =================================================================== -->
<!-- W E B A P P S T R U C T U R E -->
<!-- =================================================================== -->
@@ -253,7 +198,6 @@
<filter token="PROJECT" value="${turbine.app}"/>
<filter token="DATABASE" value="${database}"/>
- <filter token="TORQUE_HOME" value="${torque.home}"/>
<filter token="TEMPLATE_PATH" value="${template.path}"/>
<filter token="OUTPUT_DIRECTORY" value="${output.directory}"/>
<filter token="SCHEMA_DIRECTORY" value="${schema.directory}"/>
@@ -336,14 +280,11 @@
<property name="master.home"
value="${ancillary.dir}/${turbine.version}/src/conf/master"/>
<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}"/>
<property name="module.packages"
value="${target.package}.modules,${flux.modules}"/>
<property name="include.file" value="include = Flux.properties"/>
<property name="template.path" value="/templates/app,/templates/flux"/>
<property name="intake.descriptor"
value="WEB-INF/conf/${turbine.app}-intake.xml"/>
</ant>
-
</target>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
