You are viewing a plain text version of this content. The canonical link for it is here.
Posted to watchdog-dev@jakarta.apache.org by rl...@apache.org on 2002/01/29 00:26:35 UTC
cvs commit: jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/tlds tld_uri_one.tld tld_uri_two.tld TestLib.tld example-taglib.tld
rlubke 02/01/28 15:26:35
Modified: src/server/jsp-tests/WEB-INF/tlds TestLib.tld
example-taglib.tld
Added: src/server/jsp-tests/WEB-INF/tlds tld_uri_one.tld
tld_uri_two.tld
Log:
- Changes for new/modified tests
Revision Changes Path
1.10 +9 -66 jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/tlds/TestLib.tld
Index: TestLib.tld
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/tlds/TestLib.tld,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestLib.tld 18 Dec 2001 15:00:03 -0000 1.9
+++ TestLib.tld 28 Jan 2002 23:26:35 -0000 1.10
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<!-- a tab library descriptor -->
<taglib>
<!-- after this the default space is
- "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
-->
<tlib-version>1.0</tlib-version>
@@ -96,67 +96,6 @@
</attribute>
</tag>
- <!-- define an object -->
- <tag>
- <name>define</name>
- <tag-class>tags.Define</tag-class>
- <tei-class>tags.DefineExtraInfo</tei-class>
- <description>
- required arguments:
- the id of the Integer that will be defined.
- the scope where it will be recorded
- the life of the scripting variable that will be introduced
- optional arguments:
- whether to declare the variable
- value after start tag
- value after end tag
- value before first BODY evaluation
- increment value after each BODY evaluation
- count of how many iterations to do
- </description>
-
- <!-- mandatory attributes -->
- <attribute>
- <name>id</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>life</name>
- <required>true</required>
- </attribute>
-
- <!-- optional attributes -->
- <attribute>
- <name>declare</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>startValue</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>endValue</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>initBodyValue</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>afterBodyIncrement</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>iterationCount</name>
- <required>false</required>
- </attribute>
- </tag>
-
-
<!-- aTag is a simple Tag that does not extend TagSupport -->
<tag>
<name>aTag</name>
@@ -223,7 +162,7 @@
<tag>
<name>default</name>
- <tag-class>tags.TagSupport.defaultReturnValues</tag-class>
+ <tag-class>tags.TagSupport.DefaultReturnValues</tag-class>
<description>
A simple tag that prints te default return values
as returned from TagSupport class
@@ -269,7 +208,7 @@
<tag>
<name>firstWinner</name>
- <tag-class>tags.TagSupport.firstPrizeTag</tag-class>
+ <tag-class>tags.TagSupport.FirstPrizeTag</tag-class>
<description>
A tag that sets the First prize winner and also returns it to a
nested tag
@@ -282,7 +221,7 @@
<tag>
<name>secondWinner</name>
- <tag-class>tags.TagSupport.secondPrizeTag</tag-class>
+ <tag-class>tags.TagSupport.SecondPrizeTag</tag-class>
<description>
A tag that sets the second prize winner and also returns it to a
nested tag
@@ -292,5 +231,9 @@
<required>true</required>
</attribute>
</tag>
+
+
+
+
</taglib>
1.4 +3 -4 jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/tlds/example-taglib.tld
Index: example-taglib.tld
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/tlds/example-taglib.tld,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- example-taglib.tld 2 Nov 2000 00:53:00 -0000 1.3
+++ example-taglib.tld 28 Jan 2002 23:26:35 -0000 1.4
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<!-- a tab library descriptor -->
<taglib>
<!-- after this the default space is
- "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
-->
<tlib-version>1.0</tlib-version>
<jsp-version>1.2</jsp-version>
<short-name>simple</short-name>
- <uri>1.0</uri>
<description>
A simple tag library for the examples
</description>
@@ -96,7 +95,7 @@
</attribute>
<attribute>
<name>att6</name>
- <required>true</required>
+ <required>false</required>
</attribute>
</tag>
1.1 jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/tlds/tld_uri_one.tld
Index: tld_uri_one.tld
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
<!-- a tab library descriptor -->
<taglib>
<!-- after this the default space is
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd"
-->
<tlib-version>1.0</tlib-version>
<jsp-version>1.2</jsp-version>
<short-name>tests</short-name>
<uri>/tldone</uri>
<description>
A simple tab library for testing computation of TLD Resource Path
</description>
<tag>
<name>tldtag</name>
<tag-class>tags.tld_resource_path_one.tld_URI</tag-class>
<description>
A simple Tag that prints the type of URI used in the taglib directive.
</description>
<attribute>
<name>uri</name>
<required>true</required>
</attribute>
</tag>
</taglib>
1.1 jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/tlds/tld_uri_two.tld
Index: tld_uri_two.tld
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
<!-- a tab library descriptor -->
<taglib>
<!-- after this the default space is
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd"
-->
<tlib-version>1.0</tlib-version>
<jsp-version>1.2</jsp-version>
<short-name>tests</short-name>
<uri>/tldtwo</uri>
<description>
A simple tab library for testing computation of TLD Resource Path
</description>
<tag>
<name>tldtag</name>
<tag-class>tags.tld_resource_path.tld_URI</tag-class>
<description>
A simple Tag that prints the type of URI used in the taglib directive.
</description>
<attribute>
<name>uri</name>
<required>true</required>
</attribute>
</tag>
</taglib>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>