horwat 2004/08/17 15:11:19
Modified: standard build.xml
standard/examples/web/elsupport index.html
standard/examples/web/functions index.html
standard/examples/web/tlv index.html
standard/examples/web/xml index.html
Added: standard/examples/web/WEB-INF web.xml
standard/examples/web/WEB-INF/tlds jstl-examples.tld
Removed: standard/examples/conf jstl-examples.tld web.xml
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=30647
Following the Blueprints Guidelines for web application project conventions. Most
IDE's assume the Blueprints structure. Following the guidelines will allow them to
easily integrate the examples into an IDE. The Guidelines can be found here:
http://java.sun.com/blueprints/code/projectconventions.html
- moved the examples deployment descriptor to the web/WEB-INF directory out from
conf
- moved the jstl-examples.tld to web/WEB-INF/tlds
- the "conf" directory is recommended for dynamic configuration files.
- updated build.xml to reflect new directory structure
This commit also includes minor corrections to the text in the examples index pages.
Revision Changes Path
1.44 +1 -1 jakarta-taglibs/standard/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 19 Jul 2004 20:57:16 -0000 1.43
+++ build.xml 17 Aug 2004 22:11:18 -0000 1.44
@@ -281,7 +281,7 @@
<!-- Copy web.xml + examples TLD -->
<copy todir="${build.examples}/WEB-INF">
- <fileset dir="${examples.src}/conf"/>
+ <fileset dir="${examples.src}/web/WEB-INF"/>
</copy>
<!-- Copy web pages -->
1.16 +1 -1 jakarta-taglibs/standard/examples/web/elsupport/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/elsupport/index.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- index.html 18 Mar 2003 23:00:46 -0000 1.15
+++ index.html 17 Aug 2004 22:11:18 -0000 1.16
@@ -1,7 +1,7 @@
<html><!-- #BeginTemplate "/Templates/ExamplesTemplate.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
-<title>JSTL: Expression Language Support Tags Examples</title>
+<title>JSTL: General-Purpose Tags Examples</title>
<!-- #EndEditable -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="../global.css" type="text/css">
1.3 +1 -1 jakarta-taglibs/standard/examples/web/functions/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/functions/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html 29 Mar 2003 20:21:41 -0000 1.2
+++ index.html 17 Aug 2004 22:11:18 -0000 1.3
@@ -1,7 +1,7 @@
<html><!-- #BeginTemplate "/Templates/ExamplesTemplate.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
-<title>JSTL: Iterator Tags Examples</title>
+<title>JSTL: Functions Tags Examples</title>
<!-- #EndEditable -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="../global.css" type="text/css">
1.4 +1 -1 jakarta-taglibs/standard/examples/web/tlv/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/tlv/index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.html 18 Mar 2003 23:00:48 -0000 1.3
+++ index.html 17 Aug 2004 22:11:19 -0000 1.4
@@ -1,7 +1,7 @@
<html><!-- #BeginTemplate "/Templates/ExamplesTemplate.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
-<title>Untitled Document</title>
+<title>Tag Library Validators Examples</title>
<!-- #EndEditable -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="../global.css" type="text/css">
1.15 +1 -1 jakarta-taglibs/standard/examples/web/xml/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/index.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- index.html 18 Mar 2003 23:00:49 -0000 1.14
+++ index.html 17 Aug 2004 22:11:19 -0000 1.15
@@ -1,7 +1,7 @@
<html><!-- #BeginTemplate "/Templates/ExamplesTemplate.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
-<title>JSTL: EcmaScript Tags Examples</title>
+<title>JSTL: XML Tags Examples</title>
<!-- #EndEditable -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="../global.css" type="text/css">
1.1 jakarta-taglibs/standard/examples/web/WEB-INF/web.xml
Index: web.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-app_2_4.xsd"
version="2.4">
<display-name>JSTL Examples</display-name>
<description>
Examples for the 'standard' taglib (JSTL)
</description>
<listener>
<listener-class>org.apache.taglibs.standard.examples.startup.Init</listener-class>
</listener>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
</web-app>
1.1
jakarta-taglibs/standard/examples/web/WEB-INF/tlds/jstl-examples.tld
Index: jstl-examples.tld
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<taglib xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
version="2.0">
<description>
Tag Library to support examples webapp
</description>
<tlib-version>1.1</tlib-version>
<short-name>ex</short-name>
<uri>/jstl-examples-taglib</uri>
<tag>
<name>defaultLocale</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.DefaultLocaleTag</tag-class>
<body-content>JSP</body-content>
</tag>
<tag>
<name>locales</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.LocalesTag</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>var</name>
<required>required</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
<name>varStatus</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
<name>varTotal</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
<name>begin</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>end</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>escapeHtml</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.EscapeHtmlTag</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>reader</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>writer</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>resource</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.ResourceTag</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>id</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
<name>resource</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
<tag>
<name>file</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.FileTag</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>id</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
<name>file</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>odd</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.OddTag</tag-class>
<body-content>JSP</body-content>
</tag>
<tag>
<name>even</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.EvenTag</tag-class>
<body-content>JSP</body-content>
</tag>
<tag>
<name>usCustomer</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.UsCustomerTag</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>customer</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>var</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
<tag>
<name>customerFmt</name>
<tag-class>org.apache.taglibs.standard.examples.taglib.CustomerFmtTag</tag-class>
<body-content>empty</body-content>
<attribute>
<name>customer</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>fmt</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>SPath</name>
<tag-class>org.apache.taglibs.standard.extra.spath.SPathTag</tag-class>
<body-content>empty</body-content>
<attribute>
<name>var</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
<name>select</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
<function>
<name>display</name>
<function-class>org.apache.taglibs.standard.examples.taglib.Functions</function-class>
<function-signature>java.lang.String
display(java.lang.Object)</function-signature>
</function>
</taglib>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
