You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/09 03:35:21 UTC
cvs commit: jakarta-turbine-flux default.properties deps.list tdk.jar build.xml build.properties
jvanzyl 02/02/08 18:35:21
Modified: . build.xml
Added: . default.properties deps.list tdk.jar
Removed: . build.properties
Log:
- using the same build as the rest of turbine projects
Revision Changes Path
1.8 +42 -136 jakarta-turbine-flux/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 15 Nov 2001 18:06:11 -0000 1.7
+++ build.xml 9 Feb 2002 02:35:21 -0000 1.8
@@ -3,7 +3,7 @@
<project name="admin" default="jar" basedir=".">
<property file="${user.home}/build.properties" />
- <property file="build.properties" />
+ <property file="default.properties" />
<path id="classpath">
<pathelement location="${servlet.jar}"/>
@@ -14,13 +14,48 @@
<pathelement location="${commons-util.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${jaf.jar}"/>
+ <pathelement location="${stratum.jar}"/>
</path>
<!-- ================================================================== -->
+ <!-- U P D A T E J A R S -->
+ <!-- ================================================================== -->
+
+ <!-- Build classpath -->
+ <path id="update.classpath">
+ <pathelement location="tdk.jar"/>
+ </path>
+
+ <target
+ name="update-jars">
+
+ <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>
+
+ <!-- ================================================================== -->
<!-- Prints useful build environment values -->
<!-- ================================================================== -->
- <target name="env" depends="check_available">
+ <target name="env">
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
<echo message="lib.repo = ${lib.repo}"/>
@@ -36,142 +71,13 @@
</target>
<!-- ================================================================== -->
- <!-- Check to see what optional dependencies are available -->
- <!-- ================================================================== -->
-
- <target name="check_available">
- <available
- classname="javax.servlet.http.HttpServletRequest"
- property="servlet.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.turbine.Turbine"
- property="turbine.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.fulcrum.BaseService"
- property="fulcrum.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.velocity.runtime.Runtime"
- property="velocity.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.torque.Torque"
- property="torque.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.collections.ExtendedProperties"
- property="commons-collections.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.util.exception.NestableException"
- property="commons-util.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.activation.DataSource"
- property="jaf.present"
- classpathref="classpath"
- />
- </target>
-
- <target name="check.servlet" unless="servlet.present">
- <antcall target="property-warning">
- <param name="name" value="servlet.jar"/>
- <param name="value" value="${servlet.jar}"/>
- </antcall>
- </target>
-
- <target name="check.turbine" unless="turbine.present">
- <antcall target="property-warning">
- <param name="name" value="turbine.jar"/>
- <param name="value" value="${turbine.jar}"/>
- </antcall>
- </target>
-
- <target name="check.fulcrum" unless="fulcrum.present">
- <antcall target="property-warning">
- <param name="name" value="fulcrum.jar"/>
- <param name="value" value="${fulcrum.jar}"/>
- </antcall>
- </target>
-
- <target name="check.velocity" unless="velocity.present">
- <antcall target="property-warning">
- <param name="name" value="velocity.jar"/>
- <param name="value" value="${velocity.jar}"/>
- </antcall>
- </target>
-
- <target name="check.torque" unless="torque.present">
- <antcall target="property-warning">
- <param name="name" value="torque.jar"/>
- <param name="value" value="${torque.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-collections"
- unless="commons-collections.present">
- <antcall target="property-warning">
- <param name="name" value="commons-collections.jar"/>
- <param name="value" value="${commons-collections.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-util" unless="commons-util.present">
- <antcall target="property-warning">
- <param name="name" value="commons-util.jar"/>
- <param name="value" value="${commons-util.jar}"/>
- </antcall>
- </target>
-
- <target name="check.jaf" unless="jaf.present">
- <antcall target="property-warning">
- <param name="name" value="jaf.jar"/>
- <param name="value" value="${jaf.jar}"/>
- </antcall>
- </target>
-
- <target name="property-warning">
- <echo>
- +----------------------------------------------------------------+
- + F A I L E D R E Q U I R E M E N T |
- +----------------------------------------------------------------+
- | You must define the following property in order |
- | to build Torque: |
- | |
- | ${name} = ${value}
- | |
- | You can set this property in the provided build.properties |
- | file, or you may set this property in your |
- | ${user.home}/build.properties file.
- +----------------------------------------------------------------+
- </echo>
- <fail message="Failed Requirement"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepares the build directory -->
<!-- ================================================================== -->
- <target name="prepare" depends="env,check.servlet,check.turbine,
- check.fulcrum,check.velocity,check.torque,
- check.commons-util,check.commons-collections,
- check.jaf">
- <mkdir dir="${build.dest}"/>
+ <target
+ name="prepare"
+ depends="env">
+
+ <mkdir dir="${build.dest}"/>
</target>
<!-- =================================================================== -->
1.1 jakarta-turbine-flux/default.properties
Index: default.properties
===================================================================
name = flux
version = 3.0-dev
project = flux
build.compiler = classic
build.dir = ./bin
build.dest = ./bin/classes
src.dir = ./src
java.src.dir = ./src/java
template.src.dir = ./src/templates
resources.src.dir = ./src/resources
final.name = ${project}-${version}
ant.home = .
debug = on
optimize = off
deprecation = off
servlet.jar = ${lib.repo}/servlet-2.2.jar
turbine.jar = ${lib.repo}/turbine-3.0-dev.jar
fulcrum.jar = ${lib.repo}/fulcrum-1.0.jar
velocity.jar = ${lib.repo}/velocity-1.2-dev.jar
torque.jar = ${lib.repo}/torque-3.0-dev.jar
commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
jaf.jar = ${lib.repo}/activation-1.0.1.jar
stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
1.1 jakarta-turbine-flux/deps.list
Index: deps.list
===================================================================
servlet-2.2.jar
turbine-3.0-dev.jar
fulcrum-1.0.jar
velocity-1.3-dev.jar
torque-3.0-dev.jar
commons-util-0.1-dev.jar
activation-1.0.1.jar
stratum-0.1-dev.jar
1.1 jakarta-turbine-flux/tdk.jar
<<Binary file>>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>