You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by gl...@apache.org on 2002/10/22 04:40:39 UTC
cvs commit: jakarta-taglibs/xtags/examples/conf web.xml
glenn 2002/10/21 19:40:39
Modified: . common.properties common.xml
application/examples/conf web.xml
benchmark/examples/conf web.xml
bsf build.xml
bsf/doc/conf web.xml
bsf/examples/conf web.xml
cache/examples/conf web.xml
datetime build.xml
datetime/examples/conf web.xml
dbtags/examples/conf web.xml
foundation build.xml
foundation/examples/conf web.xml
gnat-tags build.xml
gnat-tags/examples/conf web.xml
i18n/examples/conf web.xml
input/examples/conf web.xml
io/examples/conf web.xml
jmstags/examples/conf web.xml
jndi/examples/conf web.xml
log/examples/conf web.xml
mailer/examples/conf web.xml
page/examples/conf web.xml
random/examples/conf web.xml
regexp/examples/conf web.xml
request/examples/conf web.xml
response build.xml
response/examples/conf web.xml
scrape/examples/conf web.xml
session/examples/conf web.xml
src/doc index.xml sourcedist.xml
src/taglib-template/examples/conf web.xml
src/taglib-template/xml taglib-template.xml
string/examples/conf web.xml
taglib-doc-kit taglib-doc-build.xml
utility build.xml
utility/doc/conf web.xml
utility/examples/conf web.xml
xsl/doc/conf web.xml
xsl/examples/conf web.xml
xtags/examples/conf web.xml
Log:
Implemented the switch to using "taglibs-" as a prefix for
jar and tld files for taglibs. I had to touch more files
than I thought. Everything builds fine. The Standard
tagib wasn't touched.
Revision Changes Path
1.11 +2 -2 jakarta-taglibs/common.properties
Index: common.properties
===================================================================
RCS file: /home/cvs/jakarta-taglibs/common.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- common.properties 5 Apr 2002 18:01:59 -0000 1.10
+++ common.properties 22 Oct 2002 02:40:36 -0000 1.11
@@ -66,8 +66,8 @@
dist.doc = ${dist.dir}/${taglib.name}/${taglib.name}-doc.war
dist.examples = ${dist.dir}/${taglib.name}/${taglib.name}-examples.war
dist.library = ${dist.dir}/${taglib.name}
-dist.tld = ${dist.dir}/${taglib.name}/${taglib.name}.tld
-examples.tld = ${build.examples}/WEB-INF/${taglib.name}.tld
+dist.tld = ${dist.dir}/${taglib.name}/taglibs-${taglib.name}.tld
+examples.tld = ${build.examples}/WEB-INF/taglibs-${taglib.name}.tld
library.tld = ${build.library}/META-INF/taglib.tld
#
1.26 +5 -5 jakarta-taglibs/common.xml
Index: common.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/common.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- common.xml 5 Apr 2002 18:01:59 -0000 1.25
+++ common.xml 22 Oct 2002 02:40:36 -0000 1.26
@@ -166,7 +166,7 @@
<copy toDir="${build.examples}">
<fileset dir="${examples.src}/web"/>
</copy>
- <copy file="${dist.library}/${taglib.name}.jar"
+ <copy file="${dist.library}/taglibs-${taglib.name}.jar"
toFile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
<!-- Copy the .jsp files as .txt files -->
<copy todir="${build.examples}" >
@@ -279,7 +279,7 @@
<target name="library-dist" depends="library">
<antcall target="${library-dist.pre}"/>
<copy file="${examples.tld}" toFile="${library.tld}"/>
- <jar jarfile="${dist.library}/${taglib.name}.jar" basedir="${build.library}"
+ <jar jarfile="${dist.library}/taglibs-${taglib.name}.jar" basedir="${build.library}"
manifest="${build.dir}/${taglib.name}/${taglib.name}.mf" />
<copy file="${examples.tld}" toFile="${dist.tld}"/>
<antcall target="${library-dist.post}"/>
@@ -332,14 +332,14 @@
<target name="template-tld11" depends="prepare" unless="gen-docs.present">
<style in="${xml.src}/${taglib.name}.xml"
destdir="${build.examples}/WEB-INF"
- out="${build.examples}/WEB-INF/${taglib.name}.tld"
+ out="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"
style="${tld11.xsl}"/>
</target>
<target name="template-tld12" depends="prepare" if="jsp12.present">
<style in="${xml.src}/${taglib.name}.xml"
destdir="${build.examples}/WEB-INF"
- out="${build.examples}/WEB-INF/${taglib.name}.tld"
+ out="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"
style="${tld12.xsl}"/>
</target>
@@ -370,7 +370,7 @@
<target name="gen-tld" depends="prepare" if="gen-docs.present">
<style in="${xml.src}/${taglib.name}.xml"
destdir="${build.examples}/WEB-INF"
- out="${build.examples}/WEB-INF/${taglib.name}.tld"
+ out="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"
style="../taglib-doc-kit/xml/tld.xsl"/>
</target>
1.5 +1 -1 jakarta-taglibs/application/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/application/examples/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 26 Jan 2002 01:20:46 -0000 1.4
+++ web.xml 22 Oct 2002 02:40:36 -0000 1.5
@@ -33,7 +33,7 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/application-1.0</taglib-uri>
- <taglib-location>/WEB-INF/application.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-application.tld</taglib-location>
</taglib>
<security-role>
<role-name>admin</role-name>
1.3 +1 -1 jakarta-taglibs/benchmark/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/benchmark/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:46 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:36 -0000 1.3
@@ -13,7 +13,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/benchmark</taglib-uri>
- <taglib-location>/WEB-INF/benchmark.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-benchmark.tld</taglib-location>
</taglib>
</web-app>
1.9 +5 -5 jakarta-taglibs/bsf/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/bsf/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2 Apr 2002 11:38:05 -0000 1.8
+++ build.xml 22 Oct 2002 02:40:36 -0000 1.9
@@ -81,8 +81,8 @@
<property name="build.library" value="${build.dir}/${taglib.name}/${taglib.name}"/>
<property name="dist.doc" value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
<property name="dist.examples" value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
- <property name="dist.library" value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
- <property name="dist.tld" value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
+ <property name="dist.library" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.jar"/>
+ <property name="dist.tld" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.tld"/>
<property name="taglibs.doc" value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
@@ -138,9 +138,9 @@
<fileset dir="${examples.src}/web"/>
</copy>
<copy file="${dist.tld}"
- tofile="${build.examples}/WEB-INF/${taglib.name}.tld"/>
+ tofile="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"/>
<copy file="${dist.library}"
- tofile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
+ tofile="${build.examples}/WEB-INF/lib/taglibs-${taglib.name}.jar"/>
</target>
<!-- Compile the tag library itself -->
1.3 +1 -1 jakarta-taglibs/bsf/doc/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/bsf/doc/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:47 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:36 -0000 1.3
@@ -10,7 +10,7 @@
BSFTAGS
</taglib-uri>
<taglib-location>
- /WEB-INF/tld/xmltags.tld
+ /WEB-INF/taglibs-tld/xmltags.tld
</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/bsf/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/bsf/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:47 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:36 -0000 1.3
@@ -13,7 +13,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/bsf-2.0</taglib-uri>
- <taglib-location>/WEB-INF/bsf.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-bsf.tld</taglib-location>
</taglib>
</web-app>
1.2 +1 -1 jakarta-taglibs/cache/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/cache/examples/conf/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 3 Apr 2002 03:26:29 -0000 1.1
+++ web.xml 22 Oct 2002 02:40:36 -0000 1.2
@@ -30,7 +30,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/cache-1.0</taglib-uri>
- <taglib-location>/WEB-INF/cache.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-cache.tld</taglib-location>
</taglib>
</web-app>
1.10 +6 -6 jakarta-taglibs/datetime/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/datetime/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 7 Jul 2001 20:40:39 -0000 1.9
+++ build.xml 22 Oct 2002 02:40:36 -0000 1.10
@@ -16,20 +16,20 @@
<target name="checkRequirements.pre">
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/request.jar"/>
+ <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"/>
</antcall>
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/request.tld"/>
+ <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"/>
</antcall>
</target>
<target name="examples.pre">
- <copy file="${dist.dir}/request/request.jar"
- toFile="${build.examples}/WEB-INF/lib/request.jar"/>
- <copy file="${dist.dir}/request/request.tld"
- toFile="${build.examples}/WEB-INF/request.tld"/>
+ <copy file="${dist.dir}/request/taglibs-request.jar"
+ toFile="${build.examples}/WEB-INF/lib/taglibs-request.jar"/>
+ <copy file="${dist.dir}/request/taglibs-request.tld"
+ toFile="${build.examples}/WEB-INF/taglibs-request.tld"/>
</target>
&common;
1.5 +2 -2 jakarta-taglibs/datetime/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/datetime/examples/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 26 Jan 2002 01:20:47 -0000 1.4
+++ web.xml 22 Oct 2002 02:40:36 -0000 1.5
@@ -25,10 +25,10 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/datetime-1.0</taglib-uri>
- <taglib-location>/WEB-INF/datetime.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-datetime.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/request-1.0</taglib-uri>
- <taglib-location>/WEB-INF/request.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-request.tld</taglib-location>
</taglib>
</web-app>
1.4 +1 -1 jakarta-taglibs/dbtags/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/dbtags/examples/conf/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 26 Jan 2002 01:20:47 -0000 1.3
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.4
@@ -12,7 +12,7 @@
</description>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/dbtags</taglib-uri>
- <taglib-location>/WEB-INF/dbtags.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-dbtags.tld</taglib-location>
</taglib>
<security-role>
<role-name>admin</role-name>
1.5 +4 -4 jakarta-taglibs/foundation/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/foundation/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 1 Jul 2001 20:08:22 -0000 1.4
+++ build.xml 22 Oct 2002 02:40:37 -0000 1.5
@@ -88,8 +88,8 @@
<property name="build.library" value="${build.dir}/${taglib.name}/${taglib.name}"/>
<property name="dist.doc" value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
<property name="dist.examples" value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
- <property name="dist.library" value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
- <property name="dist.tld" value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
+ <property name="dist.library" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.jar"/>
+ <property name="dist.tld" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.tld"/>
<property name="taglibs.doc" value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
@@ -158,9 +158,9 @@
</copy>
<copy file="${conf.src}/foundation.tld" toFile="${dist.tld}"/>
<copy file="${dist.tld}"
- toFile="${build.examples}/WEB-INF/${taglib.name}.tld"/>
+ toFile="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"/>
<copy file="${dist.library}"
- toFile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
+ toFile="${build.examples}/WEB-INF/lib/taglibs-${taglib.name}.jar"/>
<copy file="${examples.src}/web/request.jsp"
toFile="${build.examples}/request.txt"/>
<copy file="${examples.src}/web/cookies.jsp"
1.3 +1 -1 jakarta-taglibs/foundation/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/foundation/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:47 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -23,7 +23,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/foundation-1.0</taglib-uri>
- <taglib-location>/WEB-INF/foundation.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-foundation.tld</taglib-location>
</taglib>
</web-app>
1.6 +4 -4 jakarta-taglibs/gnat-tags/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/gnat-tags/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 1 Jul 2001 20:08:22 -0000 1.5
+++ build.xml 22 Oct 2002 02:40:37 -0000 1.6
@@ -97,8 +97,8 @@
<property name="build.library" value="${build.dir}/${taglib.name}/${taglib.name}"/>
<property name="dist.doc" value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
<property name="dist.examples" value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
- <property name="dist.library" value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
- <property name="dist.tld" value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
+ <property name="dist.library" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.jar"/>
+ <property name="dist.tld" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.tld"/>
<property name="taglibs.doc" value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
@@ -177,9 +177,9 @@
<fileset dir="${examples.src}/web"/>
</copy>
<copy file="${dist.tld}"
- tofile="${build.examples}/WEB-INF/${taglib.name}.tld"/>
+ tofile="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"/>
<copy file="${dist.library}"
- tofile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
+ tofile="${build.examples}/WEB-INF/lib/taglibs-${taglib.name}.jar"/>
<!--
<javac srcdir="${examples.src}/src"
destdir="${build.examples}/WEB-INF/classes"
1.3 +1 -1 jakarta-taglibs/gnat-tags/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/gnat-tags/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 27 Jan 2001 02:02:53 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -33,6 +33,6 @@
</welcome-file-list>
<taglib>
<taglib-uri>gnat</taglib-uri>
- <taglib-location>/WEB-INF/lib/gnat-tags.jar</taglib-location>
+ <taglib-location>/WEB-INF/lib/taglibs-gnat-tags.jar</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/i18n/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/i18n/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:47 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -13,7 +13,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/i18n-1.0</taglib-uri>
- <taglib-location>/WEB-INF/i18n.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-i18n.tld</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/input/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/input/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:47 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -13,7 +13,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/input-0.90</taglib-uri>
- <taglib-location>/WEB-INF/input.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-input.tld</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/io/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/io/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 5 May 2001 17:18:17 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -34,6 +34,6 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/io-1.0</taglib-uri>
- <taglib-location>/WEB-INF/io.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-io.tld</taglib-location>
</taglib>
</web-app>
1.2 +1 -1 jakarta-taglibs/jmstags/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/jmstags/examples/conf/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 29 Jan 2002 18:23:02 -0000 1.1
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.2
@@ -21,6 +21,6 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/jms-1.0</taglib-uri>
- <taglib-location>/WEB-INF/jmstags.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-jmstags.tld</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/jndi/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/jndi/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:47 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -13,7 +13,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/jndi-1.0</taglib-uri>
- <taglib-location>/WEB-INF/jndi.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-jndi.tld</taglib-location>
</taglib>
1.2 +1 -1 jakarta-taglibs/log/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/log/examples/conf/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 10 May 2001 19:29:54 -0000 1.1
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.2
@@ -12,6 +12,6 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/log-1.0</taglib-uri>
- <taglib-location>/WEB-INF/log.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-log.tld</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/mailer/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/mailer/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 13 Aug 2001 23:52:59 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -18,7 +18,7 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/mailer-1.0</taglib-uri>
- <taglib-location>/WEB-INF/mailer.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-mailer.tld</taglib-location>
</taglib>
</web-app>
1.5 +1 -1 jakarta-taglibs/page/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/page/examples/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 26 Jan 2002 01:20:47 -0000 1.4
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.5
@@ -25,7 +25,7 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/page-1.0</taglib-uri>
- <taglib-location>/WEB-INF/page.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-page.tld</taglib-location>
</taglib>
<security-role>
<role-name>admin</role-name>
1.3 +1 -1 jakarta-taglibs/random/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/random/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 13 Aug 2001 23:30:52 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.3
@@ -20,7 +20,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/random-1.0</taglib-uri>
- <taglib-location>/WEB-INF/random.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-random.tld</taglib-location>
</taglib>
</web-app>
1.5 +2 -2 jakarta-taglibs/regexp/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/regexp/examples/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 26 Jan 2002 01:20:48 -0000 1.4
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.5
@@ -25,10 +25,10 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/regexp-1.0</taglib-uri>
- <taglib-location>/WEB-INF/regexp.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-regexp.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/request-1.0</taglib-uri>
- <taglib-location>/WEB-INF/request.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-request.tld</taglib-location>
</taglib>
</web-app>
1.6 +1 -1 jakarta-taglibs/request/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/request/examples/conf/web.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- web.xml 26 Jan 2002 01:20:48 -0000 1.5
+++ web.xml 22 Oct 2002 02:40:37 -0000 1.6
@@ -25,7 +25,7 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/request-1.0</taglib-uri>
- <taglib-location>/WEB-INF/request.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-request.tld</taglib-location>
</taglib>
<security-role>
<role-name>admin</role-name>
1.10 +6 -6 jakarta-taglibs/response/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/response/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 15 Jul 2001 16:22:34 -0000 1.9
+++ build.xml 22 Oct 2002 02:40:38 -0000 1.10
@@ -16,20 +16,20 @@
<target name="checkRequirements.pre">
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/request.jar"/>
+ <param name="file" value="${dist.dir}/request/taglibs-request.jar"/>
<param name="fail.message" value="The response tag library examples use the request tag library, please make sure the request tag library distribution has been built"/>
</antcall>
<antcall target="checkRequiredFile">
- <param name="file" value="${dist.dir}/request/request.tld"/>
+ <param name="file" value="${dist.dir}/request/taglibs-request.tld"/>
<param name="fail.message" value="The response tag library examples use the request tag library, please make sure the request tag library distribution has been built"/>
</antcall>
</target>
<target name="examples.pre">
- <copy file="${dist.dir}/request/request.jar"
- toFile="${build.examples}/WEB-INF/lib/request.jar"/>
- <copy file="${dist.dir}/request/request.tld"
- toFile="${build.examples}/WEB-INF/request.tld"/>
+ <copy file="${dist.dir}/request/taglibs-request.jar"
+ toFile="${build.examples}/WEB-INF/lib/taglibs-request.jar"/>
+ <copy file="${dist.dir}/request/taglibs-request.tld"
+ toFile="${build.examples}/WEB-INF/taglibs-request.tld"/>
</target>
<!-- Include the common.xml ant build declarations -->
1.5 +2 -2 jakarta-taglibs/response/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/response/examples/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 26 Jan 2002 01:20:48 -0000 1.4
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.5
@@ -25,10 +25,10 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/response-1.0</taglib-uri>
- <taglib-location>/WEB-INF/response.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-response.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/request-1.0</taglib-uri>
- <taglib-location>/WEB-INF/request.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-request.tld</taglib-location>
</taglib>
</web-app>
1.4 +1 -1 jakarta-taglibs/scrape/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/scrape/examples/conf/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 9 Nov 2001 23:44:42 -0000 1.3
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.4
@@ -19,7 +19,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/scrape-1.0</taglib-uri>
- <taglib-location>/WEB-INF/scrape.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-scrape.tld</taglib-location>
</taglib>
</web-app>
1.5 +1 -1 jakarta-taglibs/session/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/session/examples/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 26 Jan 2002 01:20:48 -0000 1.4
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.5
@@ -25,6 +25,6 @@
</welcome-file-list>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/session-1.0</taglib-uri>
- <taglib-location>/WEB-INF/session.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-session.tld</taglib-location>
</taglib>
</web-app>
1.48 +7 -0 jakarta-taglibs/src/doc/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/src/doc/index.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- index.xml 14 Oct 2002 01:16:54 -0000 1.47
+++ index.xml 22 Oct 2002 02:40:38 -0000 1.48
@@ -82,6 +82,13 @@
</section>
<section name="News" href="News">
<news>
+ <newsitem date="10/22/2002">
+ To ensure that the names of taglib jar files and tld files are unique
+ and are more readily identified with Jakarta-Taglibs almost all
+ taglib jar files and tld files are now prefixed with "taglibs-".
+ This change will be found in all nightly builds and releases starting
+ today.
+ </newsitem>
<newsitem date="10/13/2002" libname="string">
Standard Taglib version 1.0.2 -- another minor bugfix release -- is now
<a href="/builds/jakarta-taglibs/releases/standard/">available</a>.
1.4 +2 -2 jakarta-taglibs/src/doc/sourcedist.xml
Index: sourcedist.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/src/doc/sourcedist.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sourcedist.xml 3 Jul 2001 17:00:10 -0000 1.3
+++ sourcedist.xml 22 Oct 2002 02:40:38 -0000 1.4
@@ -360,8 +360,8 @@
<ul>
<li><b>dist/{taglib-name}/</b> - Location of all files built for a binary
distribution of the taglib.</li>
-<li><b>dist/{taglib-name}/{taglib-name}.jar</b> - Jar of java classes for tag library.</li>
-<li><b>dist/{taglib-name}/{taglib-name}.tld</b> - Tag Lib Descriptor for tag library.</li>
+<li><b>dist/{taglib-name}/taglibs-{taglib-name}.jar</b> - Jar of java classes for tag library.</li>
+<li><b>dist/{taglib-name}/taglibs-{taglib-name}.tld</b> - Tag Lib Descriptor for tag library.</li>
<li><b>dist/{taglib-name}/{taglib-name}-doc.war</b> - Tag Library documentation war file.</li>
<li><b>dist/{taglib-name}/{taglib-name}-examples.war</b> - Tag Library examples war file.</li>
</ul>
1.4 +1 -1 jakarta-taglibs/src/taglib-template/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/src/taglib-template/examples/conf/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 26 Jan 2002 01:22:16 -0000 1.3
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.4
@@ -30,7 +30,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/{taglib-name}-1.0</taglib-uri>
- <taglib-location>/WEB-INF/{taglib-name}.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-taglibs-{taglib-name}.tld</taglib-location>
</taglib>
</web-app>
1.6 +1 -1 jakarta-taglibs/src/taglib-template/xml/taglib-template.xml
Index: taglib-template.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/src/taglib-template/xml/taglib-template.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- taglib-template.xml 5 Jul 2001 12:28:46 -0000 1.5
+++ taglib-template.xml 22 Oct 2002 02:40:38 -0000 1.6
@@ -87,7 +87,7 @@
<!-- The taglib-location is used to fill in the web.xml configuration
information in the HTML doc. -->
- <taglib-location>/WEB-INF/{taglib-name}.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-{taglib-name}.tld</taglib-location>
<!-- The prefix is used to fill in the taglib directive
configuration information in the HTML doc. -->
1.3 +1 -1 jakarta-taglibs/string/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/string/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 13 Nov 2001 15:04:14 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.3
@@ -18,7 +18,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/string-1.0</taglib-uri>
- <taglib-location>/WEB-INF/string.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-string.tld</taglib-location>
</taglib>
</web-app>
1.2 +4 -4 jakarta-taglibs/taglib-doc-kit/taglib-doc-build.xml
Index: taglib-doc-build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/taglib-doc-kit/taglib-doc-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- taglib-doc-build.xml 23 Jan 2001 13:22:23 -0000 1.1
+++ taglib-doc-build.xml 22 Oct 2002 02:40:38 -0000 1.2
@@ -97,8 +97,8 @@
<property name="build.library" value="${build.dir}/${taglib.name}"/>
<property name="dist.doc" value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
<property name="dist.examples" value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
- <property name="dist.library" value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
- <property name="dist.tld" value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
+ <property name="dist.library" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.jar"/>
+ <property name="dist.tld" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.tld"/>
<!-- ********************** Destination Preparation ********************* -->
@@ -168,9 +168,9 @@
<fileset dir="${examples.src}/web"/>
</copy>
<copy file="${dist.tld}"
- tofile="${build.examples}/WEB-INF/${taglib.name}.tld"/>
+ tofile="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"/>
<copy file="${dist.library}"
- tofile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
+ tofile="${build.examples}/WEB-INF/lib/taglibs-${taglib.name}.jar"/>
<!--
<javac srcdir="${examples.src}/src"
destdir="${build.examples}/WEB-INF/classes"
1.10 +5 -5 jakarta-taglibs/utility/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/utility/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 20 Oct 2001 16:03:27 -0000 1.9
+++ build.xml 22 Oct 2002 02:40:38 -0000 1.10
@@ -88,8 +88,8 @@
<property name="build.library" value="${build.dir}/${taglib.name}/${taglib.name}"/>
<property name="dist.doc" value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
<property name="dist.examples" value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
- <property name="dist.library" value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
- <property name="dist.tld" value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
+ <property name="dist.library" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.jar"/>
+ <property name="dist.tld" value="${dist.dir}/${taglib.name}/taglibs-${taglib.name}.tld"/>
<property name="taglibs.doc" value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
@@ -148,9 +148,9 @@
<fileset dir="${examples.src}/web"/>
</copy>
<copy file="${dist.tld}"
- tofile="${build.examples}/WEB-INF/${taglib.name}.tld"/>
+ tofile="${build.examples}/WEB-INF/taglibs-${taglib.name}.tld"/>
<copy file="${dist.library}"
- tofile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
+ tofile="${build.examples}/WEB-INF/lib/taglibs-${taglib.name}.jar"/>
</target>
<!-- Compile the tag library itself -->
1.3 +1 -1 jakarta-taglibs/utility/doc/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/utility/doc/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:48 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.3
@@ -10,7 +10,7 @@
UTILITYTAGS
</taglib-uri>
<taglib-location>
- /WEB-INF/tld/utility.tld
+ /WEB-INF/taglibs-tld/utility.tld
</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/utility/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/utility/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:48 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.3
@@ -15,7 +15,7 @@
http://jakarta.apache.org/taglibs/utility
</taglib-uri>
<taglib-location>
- /WEB-INF/utility.tld
+ /WEB-INF/taglibs-utility.tld
</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/xsl/doc/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xsl/doc/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:48 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:38 -0000 1.3
@@ -10,7 +10,7 @@
XSLTAGS
</taglib-uri>
<taglib-location>
- /WEB-INF/tld/xmltags.tld
+ /WEB-INF/taglibs-tld/xmltags.tld
</taglib-location>
</taglib>
</web-app>
1.3 +1 -1 jakarta-taglibs/xsl/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xsl/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Jan 2002 01:20:48 -0000 1.2
+++ web.xml 22 Oct 2002 02:40:39 -0000 1.3
@@ -13,7 +13,7 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/xsl-1.0</taglib-uri>
- <taglib-location>/WEB-INF/xsl.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-xsl.tld</taglib-location>
</taglib>
</web-app>
1.5 +1 -1 jakarta-taglibs/xtags/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/examples/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 16 Jul 2001 08:18:42 -0000 1.4
+++ web.xml 22 Oct 2002 02:40:39 -0000 1.5
@@ -22,6 +22,6 @@
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/xtags-1.0</taglib-uri>
- <taglib-location>/WEB-INF/xtags.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-xtags.tld</taglib-location>
</taglib>
</web-app>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>