joerg 2004/03/20 07:57:02
Modified: tools/src blocks-build.xsl
Log:
first part of syncing with 2.1: {string('${antvariable}')} replaced with
${{antvariable}}
Revision Changes Path
1.38 +116 -116 cocoon-2.2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/src/blocks-build.xsl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- blocks-build.xsl 18 Mar 2004 11:56:35 -0000 1.37
+++ blocks-build.xsl 20 Mar 2004 15:57:02 -0000 1.38
@@ -23,30 +23,30 @@
<description>Autogenerated Ant build file that builds
blocks.</description>
<path id="classpath">
- <fileset dir="{string('${lib.core}')}">
+ <fileset dir="${{lib.core}}">
<include name="*.jar"/>
</fileset>
- <fileset dir="{string('${lib.endorsed}')}">
+ <fileset dir="${{lib.endorsed}}">
<include name="*.jar"/>
</fileset>
<!-- Currently, we have no JVM dependent libraries
- <fileset dir="{string('${lib.core}/jvm${target.vm}')}">
+ <fileset dir="${{lib.core}}/jvm${{target.vm}}">
<include name="*.jar"/>
</fileset>
-->
- <fileset dir="{string('${lib.optional}')}">
+ <fileset dir="${{lib.optional}}">
<include name="*.jar"/>
</fileset>
- <fileset dir="{string('${build.blocks}')}">
+ <fileset dir="${{build.blocks}}">
<include name="*.jar"/>
</fileset>
- <path location="{string('${build.mocks}')}"/>
- <path location="{string('${build.dest}')}"/>
- <pathelement path="{string('${build.webapp.webinf}/classes/')}"/>
+ <path location="${{build.mocks}}"/>
+ <path location="${{build.dest}}"/>
+ <pathelement path="${{build.webapp.webinf}/classes/')}"/>
</path>
<path id="test.classpath">
- <fileset dir="{string('${tools.lib}')}">
+ <fileset dir="${{tools.lib}}">
<include name="*.jar"/>
</fileset>
</path>
@@ -67,7 +67,7 @@
<xsl:for-each select="module/project[starts-with(@name,
'cocoon-block-')]">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<condition property="unless.exclude.block.{$block-name}">
- <istrue
value="{string('${exclude.block.')}{$block-name}{string('}')}"/>
+ <istrue value="${{exclude.block.{$block-name}}}"/>
</condition>
</xsl:for-each>
</target>
@@ -129,24 +129,24 @@
</xsl:attribute>
</target>
- <!-- Check if javadocs have to be generated -->
+ <!-- Check if javadocs have to be generated -->
<target name="javadocs-check">
- <mkdir dir="{string('${build.javadocs}')}"/>
+ <mkdir dir="${{build.javadocs}}"/>
<condition property="javadocs.notrequired" value="true">
<or>
- <uptodate targetfile="{string('${build.javadocs}')}/packages.html">
- <srcfiles dir="{string('${java}')}"
includes="**/*.java,**/package.html"/>
- <srcfiles dir="{string('${deprecated.src}')}"
includes="**/*.java,**/package.html"/>
+ <uptodate targetfile="${{build.javadocs}}/packages.html">
+ <srcfiles dir="${{java}}" includes="**/*.java,**/package.html"/>
+ <srcfiles dir="${{deprecated.src}}"
includes="**/*.java,**/package.html"/>
<xsl:for-each select="$cocoon-blocks">
- <srcfiles
dir="{string('${blocks}')}/{substring-after(@name,'cocoon-block-')}/java"
includes="**/*.java,**/package.html"/>
+ <srcfiles
dir="${{blocks}}/{substring-after(@name,'cocoon-block-')}/java"
includes="**/*.java,**/package.html"/>
</xsl:for-each>
</uptodate>
- <istrue value="{string('${unless.exclude.javadocs}')}"/>
+ <istrue value="${{unless.exclude.javadocs}}"/>
</or>
</condition>
</target>
- <!-- Creates Javadocs -->
+ <!-- Creates Javadocs -->
<target name="javadocs" unless="javadocs.notrequired">
<xsl:attribute name="depends">
<xsl:text>init, javadocs-check</xsl:text>
@@ -157,26 +157,26 @@
</xsl:attribute>
<condition property="javadoc.additionalparam" value="-breakiterator
-tag todo:all:Todo:">
- <equals arg1="1.4" arg2="{string('${ant.java.version}')}"/>
+ <equals arg1="1.4" arg2="${{ant.java.version}}"/>
</condition>
<condition property="javadoc.additionalparam" value="">
<not>
- <equals arg1="1.4" arg2="{string('${ant.java.version}')}"/>
+ <equals arg1="1.4" arg2="${{ant.java.version}}"/>
</not>
</condition>
- <javadoc destdir="{string('${build.javadocs}')}"
+ <javadoc destdir="${{build.javadocs}}"
author="true"
version="true"
use="true"
noindex="false"
splitindex="true"
- windowtitle="{string('${Name}')} API {string('${version}')}
[{string('${TODAY}')}]"
- doctitle="{string('${Name}')} API {string('${version}')}"
- bottom="Copyright © {string('${year}')} The Apache
Software Foundation. All Rights Reserved."
- stylesheetfile="{string('${resources.javadoc}')}/javadoc.css"
+ windowtitle="${{Name}} API ${{version}} [${{TODAY}}]"
+ doctitle="${{Name}} API ${{version}}"
+ bottom="Copyright © ${{year}} The Apache Software
Foundation. All Rights Reserved."
+ stylesheetfile="${{resources.javadoc}}/javadoc.css"
useexternalfile="yes"
- additionalparam="{string('${javadoc.additionalparam}')}"
+ additionalparam="${{javadoc.additionalparam}}"
maxmemory="128m">
<link offline="true" href="http://avalon.apache.org/framework/api";
packagelistloc="${{resources.javadoc}}/avalon-framework"/>
@@ -195,19 +195,19 @@
<tag name="avalon.context" scope="methods" description="Requires
entry:" />
<tag name="avalon.dependency" scope="methods" description="Requires
component:" />
- <packageset dir="{string('${java}')}">
+ <packageset dir="${{java}}">
<include name="**"/>
</packageset>
- <packageset dir="{string('${deprecated.src}')}">
+ <packageset dir="${{deprecated.src}}">
<include name="**"/>
</packageset>
<xsl:for-each select="$cocoon-blocks">
- <packageset
dir="{string('${blocks}')}/{substring-after(@name,'cocoon-block-')}/java">
+ <packageset
dir="${{blocks}}/{substring-after(@name,'cocoon-block-')}/java">
<include name="**"/>
</packageset>
</xsl:for-each>
<classpath>
- <fileset dir="{string('${tools.lib}')}">
+ <fileset dir="${{tools.lib}}">
<include name="*.jar"/>
</fileset>
<path refid="classpath" />
@@ -221,7 +221,7 @@
<xsl:apply-templates select="$cocoon-blocks"/>
<target name="patch-roles" depends="init">
- <xpatch
file="{string('${build.dest}/org/apache/cocoon/cocoon.roles')}"
srcdir="{string('${blocks}')}">
+ <xpatch file="${{build.dest}/org/apache/cocoon/cocoon.roles')}"
srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/**/*.xroles"
unless="unless.exclude.block.{$block-name}"/>
@@ -230,7 +230,7 @@
</target>
<target name="patch-conf" depends="init">
- <xpatch file="{string('${build.webapp}')}/sitemap.xmap"
srcdir="{string('${blocks}')}">
+ <xpatch file="${{build.webapp}}/sitemap.xmap" srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/**/*.xmap"
unless="unless.exclude.block.{$block-name}"/>
@@ -240,17 +240,17 @@
<!-- This is much slower, but preserves the dependencies -->
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
- <xpatch file="{string('${build.webapp}')}/WEB-INF/cocoon.xconf"
srcdir="{string('${blocks}')}" addcomments="true">
+ <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf"
srcdir="${{blocks}}" addcomments="true">
<include name="{$block-name}/conf/**/*.xconf"
unless="unless.exclude.block.{$block-name}"/>
</xpatch>
</xsl:for-each>
- <xpatch file="{string('${build.webapp}')}/WEB-INF/logkit.xconf"
srcdir="{string('${blocks}')}">
+ <xpatch file="${{build.webapp}}/WEB-INF/logkit.xconf"
srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/**/*.xlog"
unless="unless.exclude.block.{$block-name}"/>
</xsl:for-each>
</xpatch>
- <xpatch file="{string('${build.webapp}')}/WEB-INF/web.xml"
srcdir="{string('${blocks}')}">
+ <xpatch file="${{build.webapp}}/WEB-INF/web.xml" srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/**/*.xweb"
unless="unless.exclude.block.{$block-name}"/>
@@ -259,19 +259,19 @@
</target>
<target name="patch-samples" depends="init">
- <xpatch file="{string('${build.webapp}')}/samples/block-samples.xml"
srcdir="{string('${blocks}')}">
+ <xpatch file="${{build.webapp}}/samples/block-samples.xml"
srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/**/*.xsamples"
unless="unless.exclude.block.{$block-name}"/>
</xsl:for-each>
</xpatch>
- <xpatch file="{string('${build.webapp}')}/samples/sitemap.xmap"
srcdir="{string('${blocks}')}">
+ <xpatch file="${{build.webapp}}/samples/sitemap.xmap"
srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/**/*.samplesxpipe"
unless="unless.exclude.block.{$block-name}"/>
</xsl:for-each>
</xpatch>
- <xpatch file="{string('${build.webapp}')}/WEB-INF/cocoon.xconf"
srcdir="{string('${blocks}')}">
+ <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf"
srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/**/*.samplesxconf"
unless="unless.exclude.block.{$block-name}"/>
@@ -303,10 +303,10 @@
</xsl:if>
<!-- Test if this block has special build -->
- <available property="{$block-name}.has.build"
file="{string('${blocks}')}/{$block-name}/build.xml"/>
+ <available property="{$block-name}.has.build"
file="${{blocks}}/{$block-name}/build.xml"/>
<!-- Test if this block has mocks -->
- <available property="{$block-name}.has.mocks" type="dir"
file="{string('${blocks}')}/{$block-name}/mocks/"/>
+ <available property="{$block-name}.has.mocks" type="dir"
file="${{blocks}}/{$block-name}/mocks/"/>
<xsl:if test="@status='unstable'">
<echo message="==================== WARNING
======================="/>
@@ -332,7 +332,7 @@
</xsl:if>
<!-- Test if this block has samples -->
- <available property="{$block-name}.has.samples"
file="{string('${blocks}')}/{$block-name}/samples/sitemap.xmap"/>
+ <available property="{$block-name}.has.samples"
file="${{blocks}}/{$block-name}/samples/sitemap.xmap"/>
<antcall target="{$block-name}-samples"/>
</target>
@@ -349,10 +349,10 @@
</xsl:if>
<!-- Test if this block has libraries -->
- <available property="{$block-name}.has.lib" type="dir"
file="{string('${blocks}')}/{$block-name}/lib/"/>
+ <available property="{$block-name}.has.lib" type="dir"
file="${{blocks}}/{$block-name}/lib/"/>
<!-- Test if this block has global WEB-INF files -->
- <available property="{$block-name}.has.webinf" type="dir"
file="{string('${blocks}')}/{$block-name}/WEB-INF/"/>
+ <available property="{$block-name}.has.webinf" type="dir"
file="${{blocks}}/{$block-name}/WEB-INF/"/>
<antcall target="{$block-name}-lib"/>
<antcall target="{$block-name}-webinf"/>
@@ -370,23 +370,23 @@
</xsl:if>
<!-- Test if this block has mocks -->
- <available property="{$block-name}.has.mocks" type="dir"
file="{string('${blocks}')}/{$block-name}/mocks/"/>
+ <available property="{$block-name}.has.mocks" type="dir"
file="${{blocks}}/{$block-name}/mocks/"/>
- <mkdir dir="{string('${build.blocks}')}/{$block-name}/dest"/>
+ <mkdir dir="${{build.blocks}}/{$block-name}/dest"/>
- <mkdir dir="{string('${build.blocks}')}/{$block-name}/conf"/>
- <copy filtering="on"
todir="{string('${build.blocks}')}/{$block-name}/conf">
- <fileset dir="{string('${blocks}')}/{$block-name}">
+ <mkdir dir="${{build.blocks}}/{$block-name}/conf"/>
+ <copy filtering="on" todir="${{build.blocks}}/{$block-name}/conf">
+ <fileset dir="${{blocks}}/{$block-name}">
<include name="conf**/*.x*"/>
</fileset>
</copy>
<path id="{$block-name}.classpath">
<path refid="classpath"/>
- <fileset dir="{string('${blocks}')}/{$block-name}">
+ <fileset dir="${{blocks}}/{$block-name}">
<include name="lib/*.jar"/>
</fileset>
- <pathelement
location="{string('${build.blocks}')}/{$block-name}/mocks"/>
+ <pathelement location="${{build.blocks}}/{$block-name}/mocks"/>
<xsl:for-each select="$cocoon-block-dependencies">
<path
refid="{substring-after(@project,'cocoon-block-')}.classpath"/>
</xsl:for-each>
@@ -395,14 +395,14 @@
<target name="{$block-name}-compile"
depends="{$block-name}-build,{$block-name}-prepare,{$block-name}-mocks">
- <copy filtering="on"
todir="{string('${build.blocks}')}/{$block-name}/dest">
- <fileset dir="{string('${blocks}')}/{$block-name}/java">
+ <copy filtering="on" todir="${{build.blocks}}/{$block-name}/dest">
+ <fileset dir="${{blocks}}/{$block-name}/java">
<patternset refid="unprocessed.sources"/>
</fileset>
</copy>
- <copy filtering="off"
todir="{string('${build.blocks}')}/{$block-name}/dest">
- <fileset dir="{string('${blocks}')}/{$block-name}/java">
+ <copy filtering="off" todir="${{build.blocks}}/{$block-name}/dest">
+ <fileset dir="${{blocks}}/{$block-name}/java">
<include name="**/Manifest.mf"/>
<include name="META-INF/**"/>
</fileset>
@@ -416,49 +416,49 @@
If someone knows a better solution...
-->
<!-- Currently, we have no JVM dependent sources
- <condition property="dependend.vm" value="{string('${target.vm}')}">
- <available
file="{string('${blocks}')}/{$block-name}/java{string('${target.vm}')}"/>
+ <condition property="dependend.vm" value="${{target.vm}}">
+ <available file="${{blocks}}/{$block-name}/java${{target.vm}}"/>
</condition>
<condition property="dependend.vm" value="">
<not>
- <available
file="{string('${blocks}')}/{$block-name}/java{string('${target.vm}')}"/>
+ <available file="${{blocks}}/{$block-name}/java${{target.vm}}"/>
</not>
</condition>
-->
- <javac destdir="{string('${build.blocks}')}/{$block-name}/dest"
- debug="{string('${compiler.debug}')}"
- optimize="{string('${compiler.optimize}')}"
- deprecation="{string('${compiler.deprecation}')}"
- target="{string('${target.vm}')}"
- nowarn="{string('${compiler.nowarn}')}"
- compiler="{string('${compiler}')}">
- <src path="{string('${blocks}')}/{$block-name}/java"/>
+ <javac destdir="${{build.blocks}}/{$block-name}/dest"
+ debug="${{compiler.debug}}"
+ optimize="${{compiler.optimize}}"
+ deprecation="${{compiler.deprecation}}"
+ target="${{target.vm}}"
+ nowarn="${{compiler.nowarn}}"
+ compiler="${{compiler}}">
+ <src path="${{blocks}}/{$block-name}/java"/>
<!-- Currently, we have no JVM dependent sources
- <src
path="{string('${blocks}')}/{$block-name}/java{string('${dependend.vm}')}"/>
+ <src path="${{blocks}}/{$block-name}/java${{dependend.vm}}"/>
-->
<classpath refid="{$block-name}.classpath"/>
<exclude name="**/samples/**/*.java"/>
</javac>
- <jar jarfile="{string('${build.blocks}')}/{$block-name}-block.jar"
index="true">
- <fileset dir="{string('${build.blocks}')}/{$block-name}/dest">
+ <jar jarfile="${{build.blocks}}/{$block-name}-block.jar" index="true">
+ <fileset dir="${{build.blocks}}/{$block-name}/dest">
<include name="{translate(package/text(), '.', '/')}/**"/>
<include name="META-INF/**"/>
</fileset>
</jar>
<!-- exclude sample classes from the block package -->
- <mkdir dir="{string('${build.blocks}')}/{$block-name}/samples"/>
- <javac destdir="{string('${build.blocks}')}/{$block-name}/samples"
- debug="{string('${compiler.debug}')}"
- optimize="{string('${compiler.optimize}')}"
- deprecation="{string('${compiler.deprecation}')}"
- target="{string('${target.vm}')}"
- nowarn="{string('${compiler.nowarn}')}"
- compiler="{string('${compiler}')}">
- <src path="{string('${blocks}')}/{$block-name}/java"/>
+ <mkdir dir="${{build.blocks}}/{$block-name}/samples"/>
+ <javac destdir="${{build.blocks}}/{$block-name}/samples"
+ debug="${{compiler.debug}}"
+ optimize="${{compiler.optimize}}"
+ deprecation="${{compiler.deprecation}}"
+ target="${{target.vm}}"
+ nowarn="${{compiler.nowarn}}"
+ compiler="${{compiler}}">
+ <src path="${{blocks}}/{$block-name}/java"/>
<!-- Currently, we have no JVM dependent sources
- <src
path="{string('${blocks}')}/{$block-name}/java{string('${dependend.vm}')}"/>
+ <src path="${{blocks}}/{$block-name}/java${{dependend.vm}}"/>
-->
<classpath refid="{$block-name}.classpath"/>
<include name="**/samples/**/*.java"/>
@@ -469,28 +469,28 @@
<ant inheritAll="true"
inheritRefs="false"
target="main"
- antfile="{string('${blocks}')}/{$block-name}/build.xml">
- <property name="block.dir"
value="{string('${blocks}')}/{$block-name}"/>
+ antfile="${{blocks}}/{$block-name}/build.xml">
+ <property name="block.dir" value="${{blocks}}/{$block-name}"/>
</ant>
</target>
<target name="{$block-name}-mocks" depends="{$block-name}-prepare"
if="{$block-name}.has.mocks">
- <mkdir dir="{string('${build.blocks}')}/{$block-name}/mocks"/>
- <javac srcdir="{string('${blocks}')}/{$block-name}/mocks"
- destdir="{string('${build.blocks}')}/{$block-name}/mocks"
- debug="{string('${compiler.debug}')}"
- optimize="{string('${compiler.optimize}')}"
- deprecation="{string('${compiler.deprecation}')}"
- target="{string('${target.vm}')}"
- nowarn="{string('${compiler.nowarn}')}"
- compiler="{string('${compiler}')}">
+ <mkdir dir="${{build.blocks}}/{$block-name}/mocks"/>
+ <javac srcdir="${{blocks}}/{$block-name}/mocks"
+ destdir="${{build.blocks}}/{$block-name}/mocks"
+ debug="${{compiler.debug}}"
+ optimize="${{compiler.optimize}}"
+ deprecation="${{compiler.deprecation}}"
+ target="${{target.vm}}"
+ nowarn="${{compiler.nowarn}}"
+ compiler="${{compiler}}">
<classpath refid="{$block-name}.classpath"/>
</javac>
</target>
<target name="{$block-name}-lib" if="{$block-name}.has.lib">
- <copy filtering="off" todir="{string('${build.webapp.lib}')}">
- <fileset dir="{string('${blocks}')}/{$block-name}/lib">
+ <copy filtering="off" todir="${{build.webapp.lib}}">
+ <fileset dir="${{blocks}}/{$block-name}/lib">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
@@ -498,21 +498,21 @@
</target>
<target name="{$block-name}-webinf" if="{$block-name}.has.webinf">
- <copy filtering="on" todir="{string('${build.webapp.webinf}')}">
- <fileset dir="{string('${blocks}')}/{$block-name}/WEB-INF/">
+ <copy filtering="on" todir="${{build.webapp.webinf}}">
+ <fileset dir="${{blocks}}/{$block-name}/WEB-INF/">
<include name="**"/>
</fileset>
</copy>
</target>
<target name="{$block-name}-samples" if="{$block-name}.has.samples">
- <copy filtering="on"
todir="{string('${build.webapp}')}/samples/{$block-name}">
- <fileset dir="{string('${blocks}')}/{$block-name}/samples"/>
+ <copy filtering="on" todir="${{build.webapp}}/samples/{$block-name}">
+ <fileset dir="${{blocks}}/{$block-name}/samples"/>
</copy>
<!-- copy sample classes -->
- <copy todir="{string('${build.webapp.classes}')}" filtering="off">
- <fileset dir="{string('${build.blocks}')}/{$block-name}/samples"/>
+ <copy todir="${{build.webapp.classes}}" filtering="off">
+ <fileset dir="${{build.blocks}}/{$block-name}/samples"/>
</copy>
</target>
@@ -528,30 +528,30 @@
</xsl:if>
<!-- Test if this block has tests -->
- <available property="{$block-name}.has.tests"
file="{string('${blocks}')}/{$block-name}/test"/>
+ <available property="{$block-name}.has.tests"
file="${{blocks}}/{$block-name}/test"/>
<antcall target="{$block-name}-tests"/>
</target>
<target name="{$block-name}-tests" depends="{$block-name}-compile"
if="{$block-name}.has.tests">
- <mkdir dir="{string('${build.blocks}')}/{$block-name}/test"/>
+ <mkdir dir="${{build.blocks}}/{$block-name}/test"/>
- <copy todir="{string('${build.blocks}')}/{$block-name}/test"
filtering="on">
- <fileset dir="{string('${blocks}')}/{$block-name}/test"
excludes="**/*.java"/>
+ <copy todir="${{build.blocks}}/{$block-name}/test" filtering="on">
+ <fileset dir="${{blocks}}/{$block-name}/test" excludes="**/*.java"/>
</copy>
- <javac destdir="{string('${build.blocks}')}/{$block-name}/test"
- debug="{string('${compiler.debug}')}"
- optimize="{string('${compiler.optimize}')}"
- deprecation="{string('${compiler.deprecation}')}"
- target="{string('${target.vm}')}"
- nowarn="{string('${compiler.nowarn}')}"
- compiler="{string('${compiler}')}">
- <src path="{string('${blocks}')}/{$block-name}/test"/>
+ <javac destdir="${{build.blocks}}/{$block-name}/test"
+ debug="${{compiler.debug}}"
+ optimize="${{compiler.optimize}}"
+ deprecation="${{compiler.deprecation}}"
+ target="${{target.vm}}"
+ nowarn="${{compiler.nowarn}}"
+ compiler="${{compiler}}">
+ <src path="${{blocks}}/{$block-name}/test"/>
<classpath>
<path refid="test.classpath"/>
<path refid="{$block-name}.classpath"/>
- <pathelement location="{string('${build.test}')}"/>
+ <pathelement location="${{build.test}}"/>
</classpath>
</javac>
@@ -560,12 +560,12 @@
<classpath>
<path refid="test.classpath"/>
<path refid="{$block-name}.classpath"/>
- <pathelement location="{string('${build.test}')}"/>
- <pathelement
location="{string('${build.blocks}')}/{$block-name}/test"/>
+ <pathelement location="${{build.test}}"/>
+ <pathelement location="${{build.blocks}}/{$block-name}/test"/>
</classpath>
<formatter type="plain" usefile="no"/>
<batchtest>
- <fileset dir="{string('${build.blocks}')}/{$block-name}/test">
+ <fileset dir="${{build.blocks}}/{$block-name}/test">
<include name="**/*TestCase.class"/>
<include name="**/*Test.class"/>
<exclude name="**/AllTest.class"/>
@@ -578,14 +578,14 @@
<target name="[EMAIL PROTECTED]"
unless="unless.exclude.block.{$block-name}">
<!-- Test if this block has Anteater tests -->
- <available property="{$block-name}.has.anteater-tests"
file="{string('${blocks}')}/{$block-name}/test/anteater"/>
+ <available property="{$block-name}.has.anteater-tests"
file="${{blocks}}/{$block-name}/test/anteater"/>
<antcall target="{$block-name}-prepare-anteater-tests"/>
</target>
<target name="{$block-name}-prepare-anteater-tests"
if="{$block-name}.has.anteater-tests">
- <copy todir="{string('${build.test}')}/anteater">
- <fileset dir="{string('${blocks}')}/{$block-name}/test/anteater"/>
+ <copy todir="${{build.test}}/anteater">
+ <fileset dir="${{blocks}}/{$block-name}/test/anteater"/>
<mapper type="glob" from="*.xml" to="{$block-name}-*.xml"/>
</copy>
</target>
