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/18 02:50:14 UTC
cvs commit: jakarta-turbine-3 testing.properties build-test.xml build.xml default.properties
jvanzyl 02/02/17 17:50:14
Modified: . Tag: rundata_security_changes build-test.xml
build.xml default.properties
Added: . Tag: rundata_security_changes testing.properties
Log:
- separate the testing.properties from the default properties
- move the specification of the aspectj related JARs to
${user.home}/build.propertes
- use an <available> to figure out if jar.resources need to be copied
into the JAR. will use this method for all these types of things. useless
to use a property if the presence of a file is required.
- separating out the immutable properties
Revision Changes Path
No revision
No revision
1.11.2.7 +2 -1 jakarta-turbine-3/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-test.xml,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -u -r1.11.2.6 -r1.11.2.7
--- build-test.xml 17 Feb 2002 23:00:59 -0000 1.11.2.6
+++ build-test.xml 18 Feb 2002 01:50:14 -0000 1.11.2.7
@@ -8,7 +8,8 @@
<property file="build.properties" />
<!-- Set default values for the build -->
<property file="default.properties" />
-
+ <property file="testing.properties"/>
+
<target
name="init">
1.20.2.19 +13 -6 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.20.2.18
retrieving revision 1.20.2.19
diff -u -r1.20.2.18 -r1.20.2.19
--- build.xml 18 Feb 2002 00:22:15 -0000 1.20.2.18
+++ build.xml 18 Feb 2002 01:50:14 -0000 1.20.2.19
@@ -48,10 +48,7 @@
<!-- Create Classpath -->
<create-path rid="classpath" descriptor="${deps}" basedir="${lib.repo}"/>
-
- <!-- JAR Resources PatternSet -->
- <create-patternset rid="jar.resources.set" descriptor="${project.defs}/jar.resources"/>
-
+
<!-- Source Directories -->
<create-path rid="src.set" descriptor="${project.defs}/src.set"/>
@@ -103,7 +100,6 @@
java.home = ${java.home}
user.home = ${user.home}
lib.repo = ${lib.repo}
- jar.resources = ${jar.resources}
Classpath:
${classpath}
@@ -193,12 +189,23 @@
<!-- ================================================================== -->
<target
+ name="search-for-jar-resources">
+ <echo message="jar.resources = ${jar.resources}"/>
+ <available file="${jar.resources}" property="jar.resources.present"/>
+ <echo message="jar.resources.present = ${jar.resources.present}"/>
+ </target>
+
+ <target
name="jar-resources"
- if="jar.resources">
+ if="jar.resources.present"
+ depends="search-for-jar-resources">
<!-- Copy any resources that must be present in the deployed
JAR file.
-->
+
+ <!-- JAR Resources PatternSet -->
+ <create-patternset rid="jar.resources.set" descriptor="${jar.resources}"/>
<echo>
Copy resources into destination directory for deployment
1.12.2.11 +18 -40 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.12.2.10
retrieving revision 1.12.2.11
diff -u -r1.12.2.10 -r1.12.2.11
--- default.properties 17 Feb 2002 23:00:59 -0000 1.12.2.10
+++ default.properties 18 Feb 2002 01:50:14 -0000 1.12.2.11
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# B U I L D P R O P E R T I E S
+# D E F A U L T P R O P E R T I E S
# -------------------------------------------------------------------
# These properties are used by the Turbine build, you may override
# any of these default values by placing property values in
@@ -9,37 +9,38 @@
name = Turbine
version = 3.0-dev
project = turbine
-package = org.apache.${project}
-build.dir = ${basedir}/target
-build.src = ${build.dir}/src
-build.dest = ${build.dir}/classes
-src.dir = ${basedir}/src
-conf.dir = conf
+package = org.apache.turbine
debug = on
optimize = off
deprecation = off
# -------------------------------------------------------------------
-# P R O J E C T D E F S
+# I M M U T A B L E (possibly maybe :-))
# -------------------------------------------------------------------
+
project.defs = ${basedir}/project
deps = ${project.defs}/deps.list
+jar.resources = ${project.defs}/jar.resources
-final.name = ${project}-${version}
-final.dir =.${basedir}/${final.name}
+src.dir = ${basedir}/src
+conf.dir = ${basedir}/conf
+build.dir = ${basedir}/target
+build.src = ${build.dir}/src
+build.dest = ${build.dir}/classes
-# -------------------------------------------------------------------
-# J A R R E S O U R C E S
-# -------------------------------------------------------------------
-jar.resources = true
+docs.src = ${basedir}/xdocs
+docs.dest = ${basedir}/docs
+
+# These names will actually be based on the versioning document
+# that morgan checked into jakarta-site2 the other day.
+
+final.name = ${project}-${version}
+final.dir = ${basedir}/${final.name}
# -------------------------------------------------------------------
# D O C U M E N T A T I O N
# -------------------------------------------------------------------
-docs.src = ${basedir}/xdocs
-docs.dest = ${basedir}/docs
-
year = 1999-2001
javadoc.destdir = ${basedir}/docs/apidocs
@@ -50,26 +51,3 @@
javadoc.private = true
javadoc.version = true
javadoc.use = true
-
-# -------------------------------------------------------------------
-# T E S T I N G
-# -------------------------------------------------------------------
-test.dir = ${src.dir}/test
-test.reportsDirectory = test-reports
-rttest.dir = ${src.dir}/rttest
-
-tomcat.home.40 = ${tdk.home}
-webapp.dir = ${rttest.dir}/testapp
-conf.test.dir = ${rttest.dir}/cactus
-out.test.dir = ${build.dir}/rttest
-
-# Port that will be used to start the servlet engines for testing. This is
-# optional and if omitted will default to 8080. This is used when you don't
-# want to interfere with a running servlet engine on port 8080.
-test.port=8182
-
-# -------------------------------------------------------------------
-# A S P E C T S
-# -------------------------------------------------------------------
-aspectjrt.jar = ${aspectj.home}/lib/aspectjrt.jar
-aspectjtools.jar = ${aspectj.home}/lib/aspectjtools.jar
No revision
No revision
1.1.2.1 +14 -0 jakarta-turbine-3/Attic/testing.properties
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>