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:49:01 UTC
cvs commit: jakarta-taglibs-sandbox/src/taglib-template/examples/conf web.xml
glenn 2002/10/21 19:49:01
Modified: . common.properties common.xml
cache/examples/conf web.xml
directory/conf web.xml
latka-taglib/examples/conf web.xml
src/taglib-template/examples/conf web.xml
Log:
Implemented the switch to using "taglibs-" as a prefix for
jar and tld files for taglibs for the sandbox.
Revision Changes Path
1.2 +2 -2 jakarta-taglibs-sandbox/common.properties
Index: common.properties
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/common.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common.properties 29 Jun 2002 00:19:24 -0000 1.1
+++ common.properties 22 Oct 2002 02:49:00 -0000 1.2
@@ -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.3 +6 -6 jakarta-taglibs-sandbox/common.xml
Index: common.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/common.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- common.xml 22 Jul 2002 13:15:56 -0000 1.2
+++ common.xml 22 Oct 2002 02:49:00 -0000 1.3
@@ -166,8 +166,8 @@
<copy toDir="${build.examples}">
<fileset dir="${examples.src}/web"/>
</copy>
- <copy file="${dist.library}/${taglib.name}.jar"
- toFile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
+ <copy file="${dist.library}/taglibs-${taglib.name}.jar"
+ toFile="${build.examples}/WEB-INF/lib/taglibs-${taglib.name}.jar"/>
<!-- Copy the .jsp files as .txt files -->
<copy todir="${build.examples}" >
<fileset dir="${examples.src}/web" includes="**/*.jsp" excludes="index.jsp"/>
@@ -284,7 +284,7 @@
<antcall target="${library-dist.pre}"/>
<echo>build.library is: ${build.library}</echo>
<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}"/>
@@ -337,14 +337,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>
@@ -375,7 +375,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.2 +1 -1 jakarta-taglibs-sandbox/cache/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/cache/examples/conf/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 1 Apr 2002 03:49:35 -0000 1.1
+++ web.xml 22 Oct 2002 02:49:00 -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.2 +4 -4 jakarta-taglibs-sandbox/directory/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/directory/conf/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 5 Jun 2001 05:57:15 -0000 1.1
+++ web.xml 22 Oct 2002 02:49:01 -0000 1.2
@@ -22,21 +22,21 @@
<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>
<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>
<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>
<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>
1.2 +1 -1 jakarta-taglibs-sandbox/latka-taglib/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/latka-taglib/examples/conf/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 27 Aug 2001 17:18:21 -0000 1.1
+++ web.xml 22 Oct 2002 02:49:01 -0000 1.2
@@ -12,7 +12,7 @@
</description>
<taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/latka-taglib</taglib-uri>
- <taglib-location>/WEB-INF/latka-taglib.tld</taglib-location>
+ <taglib-location>/WEB-INF/taglibs-latka-taglib.tld</taglib-location>
</taglib>
<security-role> <role-name>admin</role-name> </security-role>
</web-app>
1.2 +1 -1 jakarta-taglibs-sandbox/src/taglib-template/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/src/taglib-template/examples/conf/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 29 Jun 2002 00:41:27 -0000 1.1
+++ web.xml 22 Oct 2002 02:49:01 -0000 1.2
@@ -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-{taglib-name}.tld</taglib-location>
</taglib>
</web-app>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>