jvanzyl 01/09/12 11:35:55
Modified: . build.xml
Added: . build-libs.xml
Log:
- splitting up the big tasks in build.xml into smaller pieces.
Revision Changes Path
1.3 +69 -111 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/09/12 15:02:40 1.2
+++ build.xml 2001/09/12 18:35:55 1.3
@@ -104,56 +104,9 @@
</replace>
<chmod dir="${tdk.dist}/bin" perm="+x" includes="**/*.sh"/>
-
- <!-- =================================================================== -->
- <!-- J A R F I L E S -->
- <!-- =================================================================== -->
- <!-- 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="${flux.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"/>
-
- <!-- Additional JARs -->
- <!-- I wish there was a foreach task to do this -->
-
- <copy file="${hsql.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 todir="${tdk.dist}/${tdk.share.dir}/lib">
- <fileset dir="${lib.repo}">
- <include name="turbine*.jar"/>
- </fileset>
- </copy>
-
+
+ <ant antfile="build-libs.xml"/>
+
<!-- We really only need these for the TRP and Flux.
Flux should be handled more generally as a subapp
because people may want to include several subapps. -->
@@ -164,71 +117,55 @@
</target>
<target name="assemble-turbine2">
- <antcall target="prepare">
- <param name="share.dir" value="${app2.template}"/>
- <param name="turbine.home" value="${turbine2.home}"/>
- <param name="ancillary.dir" value="${ancillary2.dir}"/>
- <param name="flux.home" value="${flux2.home}"/>
- </antcall>
- </target>
-
- <target name="assemble-turbine3">
- <antcall target="prepare">
- <param name="share.dir" value="${app3.template}"/>
- <param name="turbine.home" value="${turbine3.home}"/>
- <param name="ancillary.dir" value="${ancillary3.dir}"/>
- <param name="flux.home" value="${flux3.home}"/>
- </antcall>
- </target>
-
- <!-- =================================================================== -->
- <!-- P R O D U C T I O N D I S T R I B U T I O N -->
- <!-- =================================================================== -->
- <!-- This is a fully functional TDK distribution -->
- <!-- =================================================================== -->
-
- <target name="production-dist" depends="docs,test-dist"
- description="--> generates the full TDK distribution">
- <property name="tmp.name" value="tdk-${tdk.version}"/>
-
- <replace file="${tdk.dist}/conf/server.xml">
- <replacetoken><![CDATA[<!-- TDK SITE -->]]></replacetoken>
- <replacevalue><![CDATA[<Context path="" docBase="site" reloadable="true"/>]]>
- </replacevalue>
- </replace>
+
+ <echo>
+ Assembling Turbine 2.x System
+ </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>
+
+ <copy
+ todir="${tdk.dist}/${share.dir}/src/conf"
+ file="${turbine.home}/conf/master/turbine-schema.xml"
+ />
+
+ <copy
+ todir="${tdk.dist}/${share.dir}/src/conf"
+ file="${torque.home}/src/schema/id-table-schema.xml"
+ />
- The actual packaging of tarballs and zip files
- is dealt with in a shell script now.
+ <copy todir="${tdk.dist}/${ancillary.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>
</target>
-
- <!-- =================================================================== -->
- <!-- Copies dependent files -->
- <!-- =================================================================== -->
-
- <target name="prepare" depends="env">
- <!-- =================================================================== -->
- <!-- T U R B I N E R E S O U R C E S G E N E R A T O R -->
- <!-- =================================================================== -->
-
+ <target name="assemble-turbine3">
+
+ <echo>
+ Assembling Turbine 3.x System
+ </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>
- <!-- We need the following:
-
- 1. Security Service Schema
- 2. Scheduler Service Schema
- 3. Id Table Schema
- 4. Jdbc descriptors
-
- -->
-
<copy
todir="${tdk.dist}/${share.dir}/src/conf"
file="${fulcrum.home}/turbine-schema.xml"
@@ -248,10 +185,6 @@
<fileset dir="${torque.home}/src/conf/database"/>
</copy>
- <!-- =================================================================== -->
- <!-- F L U X -->
- <!-- =================================================================== -->
-
<copy todir="${tdk.dist}/${share.dir}/src/conf">
<fileset dir="${flux.home}/conf"/>
</copy>
@@ -259,6 +192,31 @@
</target>
<!-- =================================================================== -->
+ <!-- P R O D U C T I O N D I S T R I B U T I O N -->
+ <!-- =================================================================== -->
+ <!-- This is a fully functional TDK distribution -->
+ <!-- =================================================================== -->
+
+ <target name="production-dist" depends="docs,test-dist"
+ description="--> generates the full TDK distribution">
+ <property name="tmp.name" value="tdk-${tdk.version}"/>
+
+ <replace file="${tdk.dist}/conf/server.xml">
+ <replacetoken><![CDATA[<!-- TDK SITE -->]]></replacetoken>
+ <replacevalue><![CDATA[<Context path="" docBase="site" reloadable="true"/>]]>
+ </replacevalue>
+ </replace>
+
+ <!--
+
+ The actual packaging of tarballs and zip files
+ is dealt with in a shell script now.
+
+ -->
+
+ </target>
+
+ <!-- =================================================================== -->
<!-- -->
<!-- D O C U M E N T A T I O N T A R G E T -->
<!-- -->
@@ -266,7 +224,7 @@
<!-- Gather all the documentation required for the TDK. -->
<!-- =================================================================== -->
- <target name="docs-prepare-error" depends="prepare" unless="jdom.present">
+ <target name="docs-prepare-error" unless="jdom.present">
<echo>
The Jakarta-Site2 module is not present! Please check
@@ -279,7 +237,7 @@
<target
name="docs"
- depends="docs-prepare-error, prepare"
+ depends="docs-prepare-error"
description="--> generates the HTML documentation"
if="jdom.present">
1.1 jakarta-turbine-tdk/build-libs.xml
Index: build-libs.xml
===================================================================
<?xml version="1.0"?>
<!-- Build file for creating the TDK -->
<project name="libs" default="main" basedir=".">
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<target name="main">
<!-- =================================================================== -->
<!-- J A R F I L E S -->
<!-- =================================================================== -->
<!-- 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="${flux.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"/>
<!-- Additional JARs -->
<!-- I wish there was a foreach task to do this -->
<copy file="${hsql.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 todir="${tdk.dist}/${tdk.share.dir}/lib">
<fileset dir="${lib.repo}">
<include name="turbine*.jar"/>
</fileset>
</copy>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
