jvanzyl 01/09/19 07:55:25
Modified: . build-libs.xml build-turbine2.xml
build-turbine3.xml build.properties build.xml
Log:
- cleaning up and aligning properties.
Revision Changes Path
1.4 +34 -34 jakarta-turbine-tdk/build-libs.xml
Index: build-libs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-libs.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-libs.xml 2001/09/18 21:07:29 1.3
+++ build-libs.xml 2001/09/19 14:55:24 1.4
@@ -14,45 +14,45 @@
<!-- JAR files are now being taken from the ${lib.repo} directory. -->
<!-- =================================================================== -->
- <copy file="${ant.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${commons-cactus.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${commons-collections.jar}"
todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${commons-email.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${commons-util.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${ecs.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${flux2.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${flux3.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${fulcrum.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${httpunit.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${jaf.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${javamail.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${jdbc.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${jndi.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${jta.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${junit.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${log4j.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${regexp.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${tidy.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${torque.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${velocity.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${village.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${xalan.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${xerces.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${xmlrpc.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${xmlrpc-helma.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
+ <copy file="${ant.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${commons-cactus.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${commons-collections.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${commons-email.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${commons-util.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${ecs.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${flux2.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${flux3.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${fulcrum.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${httpunit.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${jaf.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${javamail.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${jdbc.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${jndi.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${jta.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${junit.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${log4j.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${regexp.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${tidy.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${torque.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${velocity.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${village.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${xalan.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${xerces.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${xmlrpc.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${xmlrpc-helma.jar}" todir="${tdk.share.dir}/lib"/>
<!-- Additional JARs -->
<!-- I wish there was a foreach task to do this -->
- <copy file="${hsqldb.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${httpunit.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${idb.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${jstyle.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${mysql.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${postgresql.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
- <copy file="${sapdbc.jar}" todir="${tdk.dist}/${tdk.share.dir}/lib"/>
+ <copy file="${hsqldb.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${httpunit.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${idb.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${jstyle.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${mysql.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${postgresql.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${sapdbc.jar}" todir="${tdk.share.dir}/lib"/>
- <copy todir="${tdk.dist}/${tdk.share.dir}/lib">
+ <copy todir="${tdk.share.dir}/lib">
<fileset dir="${lib.repo}">
<include name="turbine*.jar"/>
</fileset>
1.3 +10 -15 jakarta-turbine-tdk/build-turbine2.xml
Index: build-turbine2.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-turbine2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-turbine2.xml 2001/09/15 14:47:04 1.2
+++ build-turbine2.xml 2001/09/19 14:55:24 1.3
@@ -15,36 +15,31 @@
| required to generate a Turbine 2.x sample application. |
+----------------------------------------------------------------+
</echo>
-
- <property name="share.dir" value="${app2.template}"/>
- <property name="turbine.home" value="${turbine2.home}"/>
- <property name="ancillary.dir" value="${ancillary2.dir}"/>
- <property name="flux.home" value="${flux2.home}"/>
- <copy todir="${tdk.dist}/${ancillary.dir}/src/conf">
- <fileset dir="${turbine.home}/conf"/>
+ <copy todir="${ancillary2.dir}/src/conf">
+ <fileset dir="${turbine2.home}/conf"/>
</copy>
<copy
- todir="${tdk.dist}/${share.dir}/src/conf"
- file="${turbine.home}/conf/master/turbine-schema.xml"
+ todir="${app2.template.dir}/src/conf"
+ file="${turbine2.home}/conf/master/turbine-schema.xml"
/>
<copy
- todir="${tdk.dist}/${share.dir}/src/conf"
+ todir="${app2.template.dir}/src/conf"
file="${torque.home}/src/schema/id-table-schema.xml"
/>
- <copy todir="${tdk.dist}/${ancillary.dir}/src/conf/database">
+ <copy todir="${ancillary2.dir}/src/conf/database">
<fileset dir="${torque.home}/src/conf/database"/>
</copy>
- <copy todir="${tdk.dist}/${share.dir}/src/conf">
- <fileset dir="${flux.home}/conf"/>
+ <copy todir="${app2.template.dir}/src/conf">
+ <fileset dir="${flux2.home}/conf"/>
</copy>
- <copy todir="${tdk.dist}/${share.dir}/templates/flux">
- <fileset dir="${flux.home}/src/templates"/>
+ <copy todir="${app2.template.dir}/templates/flux">
+ <fileset dir="${flux2.home}/src/templates"/>
</copy>
</target>
</project>
1.3 +10 -15 jakarta-turbine-tdk/build-turbine3.xml
Index: build-turbine3.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-turbine3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-turbine3.xml 2001/09/15 14:47:04 1.2
+++ build-turbine3.xml 2001/09/19 14:55:24 1.3
@@ -16,40 +16,35 @@
+----------------------------------------------------------------+
</echo>
- <property name="share.dir" value="${app3.template}"/>
- <property name="turbine.home" value="${turbine3.home}"/>
- <property name="ancillary.dir" value="${ancillary3.dir}"/>
- <property name="flux.home" value="${flux3.home}"/>
-
- <copy todir="${tdk.dist}/${ancillary.dir}/src/conf">
- <fileset dir="${turbine.home}/conf"/>
+ <copy todir="${ancillary3.dir}/src/conf">
+ <fileset dir="${turbine3.home}/conf"/>
</copy>
<copy
- todir="${tdk.dist}/${share.dir}/src/conf"
+ todir="${app3.template.dir}/src/conf"
file="${fulcrum.home}/turbine-schema.xml"
/>
<copy
- todir="${tdk.dist}/${share.dir}/src/conf"
+ todir="${app3.template.dir}/src/conf"
file="${fulcrum.home}/scheduler-schema.xml"
/>
<copy
- todir="${tdk.dist}/${share.dir}/src/conf"
+ todir="${app3.template.dir}/src/conf"
file="${torque.home}/src/schema/id-table-schema.xml"
/>
- <copy todir="${tdk.dist}/${ancillary.dir}/src/conf/database">
+ <copy todir="${ancillary3.dir}/src/conf/database">
<fileset dir="${torque.home}/src/conf/database"/>
</copy>
- <copy todir="${tdk.dist}/${share.dir}/src/conf">
- <fileset dir="${flux.home}/conf"/>
+ <copy todir="${app3.template.dir}/src/conf">
+ <fileset dir="${flux3.home}/conf"/>
</copy>
- <copy todir="${tdk.dist}/${share.dir}/templates/flux">
- <fileset dir="${flux.home}/src/templates"/>
+ <copy todir="${app3.template.dir}/templates/flux">
+ <fileset dir="${flux3.home}/src/templates"/>
</copy>
</target>
</project>
1.9 +6 -9 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties 2001/09/19 05:52:35 1.8
+++ build.properties 2001/09/19 14:55:24 1.9
@@ -3,17 +3,14 @@
# -------------------------------------------------------------------
tdk.src = ./src/tdk
-tdk.lib = ./lib
tdk.xdocs = ./xdocs
tdk.base = ./dist
-tdk.dist = ./dist/tdk
-tdk.share.dir = tdk
-tdk.root.dir = ${tdk.dist}/tdk
-app2.template = tdk/apps/2
-app3.template = tdk/apps/3
-ancillary2.dir = tdk/ancillary/2
-ancillary3.dir = tdk/ancillary/3
-tdk.webapp = ${tdk.dist}/webapps/tdk
+tdk.dist = ${tdk.base}/tdk
+tdk.share.dir = ${tdk.dist}/tdk
+app2.template.dir = ${tdk.share.dir}/apps/2
+app3.template.dir = ${tdk.share.dir}/apps/3
+ancillary2.dir = ${tdk.share.dir}/ancillary/2
+ancillary3.dir = ${tdk.share.dir}/ancillary/3
tdk.site = ${tdk.dist}/webapps/site
servlet.container = tomcat4
1.12 +4 -4 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 2001/09/19 05:52:35 1.11
+++ build.xml 2001/09/19 14:55:24 1.12
@@ -29,14 +29,14 @@
<delete dir="${tdk.base}"/>
<mkdir dir="${tdk.dist}"/>
- <copy todir="${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.root.dir}/build.properties" todir="${tdk.dist}"/>
- <move file="${tdk.root.dir}/build.xml" todir="${tdk.dist}"/>
- <move file="${tdk.root.dir}/GETTING_STARTED.txt" todir="${tdk.dist}"/>
+ <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}"/>
<ant antfile="build-${servlet.container}.xml"/>
<ant antfile="build-libs.xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
