Author: glenn
Date: Sat Oct 1 10:10:33 2005
New Revision: 293001
URL: http://svn.apache.org/viewcvs?rev=293001&view=rev
Log:
Fix build dependencies on deprecated taglibs
Modified:
jakarta/taglibs/proper/datetime/trunk/build.xml
jakarta/taglibs/proper/mailer/trunk/build.xml
jakarta/taglibs/trunks-proper/build.properties.sample
Modified: jakarta/taglibs/proper/datetime/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/datetime/trunk/build.xml?rev=293001&r1=293000&r2=293001&view=diff
==============================================================================
--- jakarta/taglibs/proper/datetime/trunk/build.xml (original)
+++ jakarta/taglibs/proper/datetime/trunk/build.xml Sat Oct 1 10:10:33 2005
@@ -16,19 +16,19 @@
<target name="checkRequirements.pre">
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/taglibs-request.jar"/>
- <param name="fail.message" value="The datetime tag library examples use
the request tag library, please make sure the request tag library distribution
has been built"/>
+ <param name="file" value="${taglibs-request.jar}"/>
+ <param name="fail.message" value="The datetime tag library examples use
the request tag library, please make sure the taglibs-request.jar property has
been set."/>
</antcall>
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/taglibs-request.tld"/>
- <param name="fail.message" value="The datetime tag library examples use
the request tag library, please make sure the request tag library distribution
has been built"/>
+ <param name="file" value="${taglibs-request.tld}"/>
+ <param name="fail.message" value="The datetime tag library examples use
the request tag library, please make sure the taglibs-request.tld property has
been set."/>
</antcall>
</target>
<target name="examples.pre">
- <copy file="${dist.dir}/request/taglibs-request.jar"
+ <copy file="${taglibs-request.jar}"
toFile="${build.examples}/WEB-INF/lib/taglibs-request.jar"/>
- <copy file="${dist.dir}/request/taglibs-request.tld"
+ <copy file="${taglibs-request.tld}"
toFile="${build.examples}/WEB-INF/taglibs-request.tld"/>
</target>
Modified: jakarta/taglibs/proper/mailer/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/mailer/trunk/build.xml?rev=293001&r1=293000&r2=293001&view=diff
==============================================================================
--- jakarta/taglibs/proper/mailer/trunk/build.xml (original)
+++ jakarta/taglibs/proper/mailer/trunk/build.xml Sat Oct 1 10:10:33 2005
@@ -16,19 +16,19 @@
<target name="checkRequirements.pre">
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/taglibs-request.jar"/>
- <param name="fail.message" value="The mailer tag library examples use
the request tag library, please make sure the request tag library distribution
has been built"/>
+ <param name="file" value="${taglibs-request.jar}"/>
+ <param name="fail.message" value="The datetime tag library examples use
the request tag library, please make sure the taglibs-request.jar property has
been set."/>
</antcall>
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/taglibs-request.tld"/>
- <param name="fail.message" value="The mailer tag library examples use
the request tag library, please make sure the request tag library distribution
has been built"/>
- </antcall>
+ <param name="file" value="${taglibs-request.tld}"/>
+ <param name="fail.message" value="The datetime tag library examples use
the request tag library, please make sure the taglibs-request.tld property has
been set."/>
+ </antcall>
</target>
<target name="examples.pre">
- <copy file="${dist.dir}/request/taglibs-request.jar"
+ <copy file="${taglibs-request.jar}"
toFile="${build.examples}/WEB-INF/lib/taglibs-request.jar"/>
- <copy file="${dist.dir}/request/taglibs-request.tld"
+ <copy file="${taglibs-request.tld}"
toFile="${build.examples}/WEB-INF/taglibs-request.tld"/>
</target>
Modified: jakarta/taglibs/trunks-proper/build.properties.sample
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/trunks-proper/build.properties.sample?rev=293001&r1=293000&r2=293001&view=diff
==============================================================================
--- jakarta/taglibs/trunks-proper/build.properties.sample (original)
+++ jakarta/taglibs/trunks-proper/build.properties.sample Sat Oct 1 10:10:33
2005
@@ -184,6 +184,10 @@
# http://struts.apache.org/
struts12.jar=${base.dir}/../struts/dist/struts.jar
+# Datetime taglib needs the old request taglib jar and tld
+taglibs-request.jar=${base.dir}/../jakarta-taglibs-request-1.0.1/taglibs-request.jar
+taglibs-request.tld=${base.dir}/../jakarta-taglibs-request-1.0.1/taglibs-request.jar
+
#
# PROJECT STANDARD PROPERTIES
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
