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 mp...@apache.org on 2002/02/14 21:01:33 UTC
cvs commit: jakarta-turbine-tdk build-torque.xml build-libs.xml build.xml default.properties
mpoeschl 02/02/14 12:01:33
Modified: . build-libs.xml build.xml default.properties
Added: . build-torque.xml
Log:
- use xerces-2.0.0
- add turbine-torque
Revision Changes Path
1.11 +1 -0 jakarta-turbine-tdk/build-libs.xml
Index: build-libs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-libs.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-libs.xml 8 Feb 2002 22:35:34 -0000 1.10
+++ build-libs.xml 14 Feb 2002 20:01:33 -0000 1.11
@@ -40,6 +40,7 @@
<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="${xmlParserAPIs.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"/>
1.33 +41 -40 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 8 Feb 2002 22:35:34 -0000 1.32
+++ build.xml 14 Feb 2002 20:01:33 -0000 1.33
@@ -19,36 +19,36 @@
<target
name="update-jars">
-
- <taskdef
- name="httpget"
+
+ <taskdef
+ name="httpget"
className="org.apache.tdk.task.Get">
<classpath refid="update.classpath"/>
</taskdef>
-
+
<!-- If you need proxy support you'll have to manually add:
-
+
proxyHost="x"
proxyPort="y"
-
+
We'll clean this up but it worked for a user behind a proxy.
-->
-
+
<httpget
baseUrl="http://jakarta.apache.org/turbine/jars/"
dest="${lib.repo}"
dependencyFile="deps.list"
/>
- </target>
+ </target>
<!-- ================================================================== -->
<!-- E N V I R O N M E N T -->
<!-- ================================================================== -->
- <target
+ <target
name="env">
-
+
<echo message="build.compiler = ${build.compiler}"/>
<echo message="java.class.path = ${java.class.path}"/>
<echo message="java.home = ${java.home}"/>
@@ -63,28 +63,28 @@
<!-- an attempt to keep the size down while testing. -->
<!-- =================================================================== -->
- <target
+ <target
name="test-dist"
depends="jar"
description="--> generates the TDK without docs">
-
+
<delete dir="${tdk.target.dir}"/>
<mkdir dir="${tdk.root.dir}"/>
<copy todir="${tdk.share.dir}">
<fileset dir="${tdk.src}"/>
- </copy>
-
+ </copy>
+
<!-- We want to substitue the turbine version from the
specified profile. -->
-
+
<filter token="TURBINE_VERSION" value="${tdk.turbineVersion}"/>
<filter token="PROJECT" value="${tdk.project}"/>
-
- <copy
+
+ <copy
todir="${tdk.share.dir}"
file="${tdk.src}/build.properties"
- filtering="yes"
+ filtering="yes"
overwrite="yes"
/>
@@ -92,13 +92,14 @@
<move file="${tdk.share.dir}/build.properties" todir="${tdk.root.dir}"/>
<move file="${tdk.share.dir}/build.xml" todir="${tdk.root.dir}"/>
<move file="${tdk.share.dir}/GETTING_STARTED.txt" todir="${tdk.root.dir}"/>
-
+
<echo message="Servlet Container: ${tdk.servletContainer}"/>
-
+
<ant antfile="build-${tdk.servletContainer}.xml"/>
<ant antfile="build-libs.xml"/>
<ant antfile="build-turbine2.xml"/>
<ant antfile="build-turbine3.xml"/>
+ <ant antfile="build-torque.xml"/>
</target>
<!-- =================================================================== -->
@@ -107,11 +108,11 @@
<!-- This is a fully functional TDK distribution -->
<!-- =================================================================== -->
- <target
- name="production-dist"
+ <target
+ name="production-dist"
depends="docs,test-dist"
description="--> generates the full TDK distribution">
-
+
<ant antfile="build-${tdk.servletContainer}.xml" target="production-dist"/>
</target>
@@ -156,8 +157,8 @@
<antcall target="test-dist"/>
<ant dir="${tdk.home}"/>
<ant dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build" target="init">
- <property
- name="build.properties"
+ <property
+ name="build.properties"
value="${tdk.home}/webapps/${tdk.project}/WEB-INF/build/build.properties"
/>
<property
@@ -171,8 +172,8 @@
<antcall target="test-dist"/>
<ant dir="${tdk.home}" target="cvslayout"/>
<ant dir="${tdk.home}/../${tdk.project}" target="init">
- <property
- name="build.properties"
+ <property
+ name="build.properties"
value="${tdk.home}/../${tdk.project}/build.properties"
/>
<property
@@ -186,8 +187,8 @@
<antcall target="test-dist"/>
<ant dir="${tdk.home}" target="cvslayout"/>
<ant dir="${tdk.home}/../${tdk.project}" target="deploy-container">
- <property
- name="build.properties"
+ <property
+ name="build.properties"
value="${tdk.home}/../${tdk.project}/build.properties"
/>
</ant>
@@ -200,7 +201,7 @@
<!-- apps that will allow people to get up and running quickly with -->
<!-- Turbine and the TDK. -->
<!-- =================================================================== -->
-
+
<target depends="test" name="scap">
<tar longfile="gnu" tarfile="tdk.tar">
<tarfileset dir="${tdk.target.dir}" mode="755">
@@ -211,11 +212,11 @@
<exclude name="**/*.sh"/>
</tarfileset>
</tar>
-
+
<gzip zipfile="tdk.tar.gz" src="tdk.tar"/>
-
+
<zip zipfile="tdk.zip" basedir="${tdk.target.dir}"/>
-
+
</target>
<target name="prepare">
@@ -234,13 +235,13 @@
<pathelement location="${velocity.jar}"/>
</path>
- <target
+ <target
name="compile"
depends="prepare">
-
+
<mkdir dir="${tdk.build.dir}/classes"/>
-
- <javac
+
+ <javac
debug="${debug}"
deprecation="${deprecation}"
srcdir="${tdk.build.dir}/src"
@@ -251,11 +252,11 @@
</javac>
</target>
- <target
+ <target
name="jar"
depends="compile">
-
- <jar
+
+ <jar
jarfile="${tdk.jar}"
basedir="${tdk.build.dir}/classes"
excludes="**/package.html"
1.5 +4 -2 jakarta-turbine-tdk/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 13 Feb 2002 15:28:56 -0000 1.4
+++ default.properties 14 Feb 2002 20:01:33 -0000 1.5
@@ -13,10 +13,11 @@
tdk.app3.template.dir = ${tdk.share.dir}/apps/3
tdk.ancillary2.dir = ${tdk.share.dir}/ancillary/2
tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
+tdk.ancillarytorque.dir = ${tdk.share.dir}/ancillary/torque
tdk.site = ${tdk.dist}/webapps/site
tdk.profileDirectory = ./profile
#tdk.defaultProfile = t2-tc3-hsqldb.profile
-tdk.defaultProfile = t3-tc4-mysql.profile
+tdk.defaultProfile = t2-tc4-mysql.profile
#tdk.defaultProfile = t2-tc4-postgresql.profile
tdk.build.dir = ./bin
@@ -93,7 +94,8 @@
velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
village.jar = ${lib.repo}/village-1.5.3-dev.jar
xalan.jar = ${lib.repo}/xalan-2.1.0.jar
-xerces.jar = ${lib.repo}/xerces-1.4.4.jar
+xerces.jar = ${lib.repo}/xercesImpl-2.0.0.jar
+xmlParserAPIs.jar = ${lib.repo}/xmlParserAPIs-2.0.0.jar
xmlrpc.jar = ${lib.repo}/xmlrpc.jar
xmlrpc-helma.jar = ${lib.repo}/xmlrpc-helma.jar
1.1 jakarta-turbine-tdk/build-torque.xml
Index: build-torque.xml
===================================================================
<?xml version="1.0"?>
<project name="torque" default="main" basedir=".">
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<target name="main">
<echo>
+----------------------------------------------------------------+
| Assembling Torque |
+----------------------------------------------------------------+
| Creating the ancillary data rquired to use torque. |
+----------------------------------------------------------------+
</echo>
<copy todir="${tdk.ancillarytorque.dir}/src/conf">
<fileset dir="${tdk.torque.home}/src/conf"/>
</copy>
</target>
</project>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>