jvanzyl 02/02/17 20:56:37
Modified: . Tag: rundata_security_changes build-test.xml
build.xml default.properties
Log:
- still whittling away, collecting properties ... realizing how poorly
i've named them. getting there though.
Revision Changes Path
No revision
No revision
1.11.2.8 +9 -4 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.7
retrieving revision 1.11.2.8
diff -u -r1.11.2.7 -r1.11.2.8
--- build-test.xml 18 Feb 2002 01:50:14 -0000 1.11.2.7
+++ build-test.xml 18 Feb 2002 04:56:36 -0000 1.11.2.8
@@ -24,8 +24,8 @@
</taskdef>
<create-path rid="classpath" descriptor="${deps}" basedir="${lib.repo}"/>
- <create-patternset rid="runtime.test.set"
descriptor="${project.defs}/runtime-test.resources"/>
- <create-path rid="test.src.set" descriptor="${project.defs}/test.src.set"/>
+ <create-patternset rid="runtime.test.set" descriptor="${runtime.test.set}"/>
+ <create-path rid="test.src.set" descriptor="${test.src.set}"/>
</target>
@@ -38,14 +38,16 @@
depends="init"
description="==> compiles the test source code">
+ <mkdir dir="${build.dest}"/>
+
<javac
destdir="${build.dest}"
excludes="**/package.html"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
- <classpath refid="classpath"/>
<classpath>
+ <path refid="classpath"/>
<pathelement path="${build.dest}"/>
</classpath>
<src>
@@ -72,7 +74,10 @@
<junit printSummary="yes">
<formatter type="plain"/>
- <classpath refid="classpath"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.dest}"/>
+ </classpath>
<batchtest todir="${test.reportsDirectory}">
<fileset dir="${build.dest}">
<include name="**/*Test.class"/>
1.20.2.20 +21 -11 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.20.2.19
retrieving revision 1.20.2.20
diff -u -r1.20.2.19 -r1.20.2.20
--- build.xml 18 Feb 2002 01:50:14 -0000 1.20.2.19
+++ build.xml 18 Feb 2002 04:56:36 -0000 1.20.2.20
@@ -50,10 +50,10 @@
<create-path rid="classpath" descriptor="${deps}" basedir="${lib.repo}"/>
<!-- Source Directories -->
- <create-path rid="src.set" descriptor="${project.defs}/src.set"/>
+ <create-path rid="src.set" descriptor="${src.set}"/>
<!-- Source Directories with Aspects -->
- <create-path rid="src.aspect.set" descriptor="${project.defs}/src.aspect.set"/>
+ <create-path rid="src.aspect.set" descriptor="${src.aspect.set}"/>
</target>
@@ -141,9 +141,9 @@
<javac
destdir="${build.dest}"
excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
<src>
<path refid="src.set"/>
</src>
@@ -168,9 +168,9 @@
<ajc
destdir="${build.dest}"
excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
<src>
<path refid="src.aspect.set"/>
@@ -389,9 +389,19 @@
description="o Generates the Javadoc API documentation">
<mkdir dir="${javadoc.destdir}"/>
-
+
+ <!-- Get the year to display in the Javadocs -->
+ <tstamp>
+ <format property="year" pattern="${inception.year}-yyyy"/>
+ </tstamp>
+
+ <property
+ name="copyright"
+ value="Copyright &copy; ${year} ${organization}. All Rights Reserved."
+ />
+
<javadoc
- sourcepath="${src.java.dir}"
+ sourcepath="${src.dir}/java"
packagenames="${package}.*"
destdir="${javadoc.destdir}"
author="${author}"
@@ -400,7 +410,7 @@
use="${javadoc.use}"
windowtitle="${javadoc.windowtitle}"
doctitle="${javadoc.doctitle}"
- bottom="${javadoc.bottom}">
+ bottom="${copyright}">
<classpath refid="classpath"/>
</javadoc>
1.12.2.12 +9 -10 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.12.2.11
retrieving revision 1.12.2.12
diff -u -r1.12.2.11 -r1.12.2.12
--- default.properties 18 Feb 2002 01:50:14 -0000 1.12.2.11
+++ default.properties 18 Feb 2002 04:56:36 -0000 1.12.2.12
@@ -9,10 +9,12 @@
name = Turbine
version = 3.0-dev
project = turbine
+organization = Apache Software Foundation
+inception.year = 1999
package = org.apache.turbine
-debug = on
-optimize = off
-deprecation = off
+compile.debug = on
+compile.optimize = off
+compile.deprecation = off
# -------------------------------------------------------------------
# I M M U T A B L E (possibly maybe :-))
@@ -21,6 +23,10 @@
project.defs = ${basedir}/project
deps = ${project.defs}/deps.list
jar.resources = ${project.defs}/jar.resources
+src.set = ${project.defs}/src.set
+src.aspect.set = ${project.defs}/src.aspect.set
+runtime.test.set = ${project.defs}/runtime-test.resources
+test.src.set = ${project.defs}/test.src.set
src.dir = ${basedir}/src
conf.dir = ${basedir}/conf
@@ -37,16 +43,9 @@
final.name = ${project}-${version}
final.dir = ${basedir}/${final.name}
-# -------------------------------------------------------------------
-# D O C U M E N T A T I O N
-# -------------------------------------------------------------------
-
-year = 1999-2001
-
javadoc.destdir = ${basedir}/docs/apidocs
javadoc.windowtitle = ${name} ${version} API
javadoc.doctitle = ${name} ${version} API
-javadoc.bottom = Copyright &copy; ${year} Apache Software Foundation. All
Rights Reserved.
javadoc.author = true
javadoc.private = true
javadoc.version = true
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
