From 025640f7b28e72ec7644893e359772a931e5777f Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 24 Oct 2006 03:14:34 +0000 Subject: [PATCH] Correct props. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@467217 13f79535-47bb-0310-9956-ffa450edef68 --- .../examples/WEB-INF/classes/CookieExample.java | 2 +- .../WEB-INF/classes/HelloWorldExample.java | 2 +- .../WEB-INF/classes/LocalStrings.properties | 2 +- .../WEB-INF/classes/LocalStrings_en.properties | 2 +- .../WEB-INF/classes/LocalStrings_es.properties | 2 +- .../WEB-INF/classes/LocalStrings_fr.properties | 2 +- .../WEB-INF/classes/LocalStrings_pt.properties | 2 +- .../WEB-INF/classes/RequestHeaderExample.java | 2 +- .../WEB-INF/classes/RequestInfoExample.java | 2 +- .../WEB-INF/classes/RequestParamExample.java | 2 +- .../examples/WEB-INF/classes/SessionExample.java | 2 +- .../compressionFilters/CompressionFilter.java | 2 +- .../CompressionFilterTestServlet.java | 2 +- .../CompressionResponseStream.java | 2 +- .../CompressionServletResponseWrapper.java | 2 +- .../WEB-INF/classes/filters/ExampleFilter.java | 2 +- .../classes/filters/RequestDumperFilter.java | 2 +- .../filters/SetCharacterEncodingFilter.java | 2 +- .../WEB-INF/classes/listeners/ContextListener.java | 2 +- .../WEB-INF/classes/listeners/SessionListener.java | 2 +- .../examples/WEB-INF/classes/util/HTMLFilter.java | 2 +- .../WEB-INF/classes/validators/DebugValidator.java | 2 +- webapps/examples/WEB-INF/tags/displayProducts.tag | 110 ++++++++++----------- webapps/examples/WEB-INF/tags/helloWorld.tag | 34 +++---- webapps/examples/WEB-INF/tags/panel.tag | 58 +++++------ webapps/examples/WEB-INF/tags/xhtmlbasic.tag | 42 ++++---- 26 files changed, 144 insertions(+), 144 deletions(-) diff --git a/webapps/examples/WEB-INF/classes/CookieExample.java b/webapps/examples/WEB-INF/classes/CookieExample.java index 5a6d6e1aa..04b392540 100644 --- a/webapps/examples/WEB-INF/classes/CookieExample.java +++ b/webapps/examples/WEB-INF/classes/CookieExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* $Id: CookieExample.java 267129 2004-03-18 16:40:35Z jfarcand $ +/* $Id$ * */ diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java b/webapps/examples/WEB-INF/classes/HelloWorldExample.java index d97719801..44f24e393 100644 --- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java +++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* $Id: HelloWorldExample.java 267129 2004-03-18 16:40:35Z jfarcand $ +/* $Id$ * */ diff --git a/webapps/examples/WEB-INF/classes/LocalStrings.properties b/webapps/examples/WEB-INF/classes/LocalStrings.properties index 5e37546bb..ff95cd1e2 100644 --- a/webapps/examples/WEB-INF/classes/LocalStrings.properties +++ b/webapps/examples/WEB-INF/classes/LocalStrings.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# $Id: LocalStrings.properties 267129 2004-03-18 16:40:35Z jfarcand $ +# $Id$ # Default localized resources for example servlets # This locale is en_US diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_en.properties b/webapps/examples/WEB-INF/classes/LocalStrings_en.properties index 97c4c0e5e..ff95cd1e2 100644 --- a/webapps/examples/WEB-INF/classes/LocalStrings_en.properties +++ b/webapps/examples/WEB-INF/classes/LocalStrings_en.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# $Id: LocalStrings_en.properties 267129 2004-03-18 16:40:35Z jfarcand $ +# $Id$ # Default localized resources for example servlets # This locale is en_US diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_es.properties b/webapps/examples/WEB-INF/classes/LocalStrings_es.properties index aeec1bfef..2d625183a 100644 --- a/webapps/examples/WEB-INF/classes/LocalStrings_es.properties +++ b/webapps/examples/WEB-INF/classes/LocalStrings_es.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# $Id: LocalStrings_es.properties 267129 2004-03-18 16:40:35Z jfarcand $ +# $Id$ # # Default localized string information # Localized para Locale es_ES diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties b/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties index e7b297d94..f7c003196 100644 --- a/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties +++ b/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# $Id: LocalStrings_fr.properties 267129 2004-03-18 16:40:35Z jfarcand $ +# $Id$ # Default localized resources for example servlets # This locale is fr_FR diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties b/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties index 274524379..647e9179e 100644 --- a/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties +++ b/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# $Id: LocalStrings_pt.properties 267143 2004-08-24 18:38:35Z jfarcand $ +# $Id$ # Default localized resources for example servlets # This locale is pt_PT diff --git a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java index 7fa03fca5..43e8b0ad1 100644 --- a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java +++ b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* $Id: RequestHeaderExample.java 267129 2004-03-18 16:40:35Z jfarcand $ +/* $Id$ * */ diff --git a/webapps/examples/WEB-INF/classes/RequestInfoExample.java b/webapps/examples/WEB-INF/classes/RequestInfoExample.java index 1eee91a09..4c768b619 100644 --- a/webapps/examples/WEB-INF/classes/RequestInfoExample.java +++ b/webapps/examples/WEB-INF/classes/RequestInfoExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* $Id: RequestInfoExample.java 267129 2004-03-18 16:40:35Z jfarcand $ +/* $Id$ * */ diff --git a/webapps/examples/WEB-INF/classes/RequestParamExample.java b/webapps/examples/WEB-INF/classes/RequestParamExample.java index 9993a35cb..6ed3c3b61 100644 --- a/webapps/examples/WEB-INF/classes/RequestParamExample.java +++ b/webapps/examples/WEB-INF/classes/RequestParamExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* $Id: RequestParamExample.java 267129 2004-03-18 16:40:35Z jfarcand $ +/* $Id$ * */ diff --git a/webapps/examples/WEB-INF/classes/SessionExample.java b/webapps/examples/WEB-INF/classes/SessionExample.java index 803a7d5c1..d04c94ed1 100644 --- a/webapps/examples/WEB-INF/classes/SessionExample.java +++ b/webapps/examples/WEB-INF/classes/SessionExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* $Id: SessionExample.java 267129 2004-03-18 16:40:35Z jfarcand $ +/* $Id$ * */ diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java index 159d30aa7..a77487abd 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java @@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse; * * @author Amy Roh * @author Dmitri Valdin - * @version $Revision: 267129 $, $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$, $Date$ */ public class CompressionFilter implements Filter{ diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java index b14f83d1a..a4152b8f6 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java @@ -26,7 +26,7 @@ import javax.servlet.http.*; /** * Very Simple test servlet to test compression filter * @author Amy Roh - * @version $Revision: 267129 $, $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$, $Date$ */ public class CompressionFilterTestServlet extends HttpServlet { diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java index d0250e2c1..ec2ecfb42 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse; * * @author Amy Roh * @author Dmitri Valdin - * @version $Revision: 267129 $, $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$, $Date$ */ public class CompressionResponseStream diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java index 26ccf276a..23dd9fcad 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponseWrapper; * * @author Amy Roh * @author Dmitri Valdin - * @version $Revision: 267129 $, $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$, $Date$ */ public class CompressionServletResponseWrapper extends HttpServletResponseWrapper { diff --git a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java index 7fc4e3ff8..64aa4ecdc 100644 --- a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java @@ -42,7 +42,7 @@ import javax.servlet.ServletResponse; * * * @author Craig McClanahan - * @version $Revision: 267129 $ $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$ $Date$ */ public final class ExampleFilter implements Filter { diff --git a/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java b/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java index 1c8d519e8..c8df2446e 100644 --- a/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java @@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletRequest; * to assist in debugging problems. * * @author Craig McClanahan - * @version $Revision: 267129 $ $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$ $Date$ */ public final class RequestDumperFilter implements Filter { diff --git a/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java b/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java index 028552e7e..5cbbecd81 100644 --- a/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java @@ -54,7 +54,7 @@ import javax.servlet.UnavailableException; * user's session.

* * @author Craig McClanahan - * @version $Revision: 267129 $ $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$ $Date$ */ public class SetCharacterEncodingFilter implements Filter { diff --git a/webapps/examples/WEB-INF/classes/listeners/ContextListener.java b/webapps/examples/WEB-INF/classes/listeners/ContextListener.java index 257cb47ee..74aaf20f4 100644 --- a/webapps/examples/WEB-INF/classes/listeners/ContextListener.java +++ b/webapps/examples/WEB-INF/classes/listeners/ContextListener.java @@ -32,7 +32,7 @@ import javax.servlet.ServletContextListener; * associated with our servlet context. * * @author Craig R. McClanahan - * @version $Revision: 267129 $ $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$ $Date$ */ public final class ContextListener diff --git a/webapps/examples/WEB-INF/classes/listeners/SessionListener.java b/webapps/examples/WEB-INF/classes/listeners/SessionListener.java index 4534dfcdc..b9142d623 100644 --- a/webapps/examples/WEB-INF/classes/listeners/SessionListener.java +++ b/webapps/examples/WEB-INF/classes/listeners/SessionListener.java @@ -34,7 +34,7 @@ import javax.servlet.http.HttpSessionListener; * associated with our servlet context. * * @author Craig R. McClanahan - * @version $Revision: 267129 $ $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$ $Date$ */ public final class SessionListener diff --git a/webapps/examples/WEB-INF/classes/util/HTMLFilter.java b/webapps/examples/WEB-INF/classes/util/HTMLFilter.java index c6231bf18..3510add0e 100644 --- a/webapps/examples/WEB-INF/classes/util/HTMLFilter.java +++ b/webapps/examples/WEB-INF/classes/util/HTMLFilter.java @@ -21,7 +21,7 @@ package util; * * @author Craig R. McClanahan * @author Tim Tye - * @version $Revision: 267129 $ $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$ $Date$ */ public final class HTMLFilter { diff --git a/webapps/examples/WEB-INF/classes/validators/DebugValidator.java b/webapps/examples/WEB-INF/classes/validators/DebugValidator.java index c251910f9..8357c68bc 100644 --- a/webapps/examples/WEB-INF/classes/validators/DebugValidator.java +++ b/webapps/examples/WEB-INF/classes/validators/DebugValidator.java @@ -34,7 +34,7 @@ import javax.servlet.jsp.tagext.ValidationMessage; * of your JSP page. * * @author Craig McClanahan - * @version $Revision: 267129 $ $Date: 2004-03-18 17:40:35 +0100 (jeu., 18 mars 2004) $ + * @version $Revision$ $Date$ */ public class DebugValidator extends TagLibraryValidator { diff --git a/webapps/examples/WEB-INF/tags/displayProducts.tag b/webapps/examples/WEB-INF/tags/displayProducts.tag index 508852ef6..10ad9f75c 100644 --- a/webapps/examples/WEB-INF/tags/displayProducts.tag +++ b/webapps/examples/WEB-INF/tags/displayProducts.tag @@ -1,55 +1,55 @@ - -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ attribute name="normalPrice" fragment="true" %> -<%@ attribute name="onSale" fragment="true" %> -<%@ variable name-given="name" %> -<%@ variable name-given="price" %> -<%@ variable name-given="origPrice" %> -<%@ variable name-given="salePrice" %> - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
+ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ attribute name="normalPrice" fragment="true" %> +<%@ attribute name="onSale" fragment="true" %> +<%@ variable name-given="name" %> +<%@ variable name-given="price" %> +<%@ variable name-given="origPrice" %> +<%@ variable name-given="salePrice" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
diff --git a/webapps/examples/WEB-INF/tags/helloWorld.tag b/webapps/examples/WEB-INF/tags/helloWorld.tag index f52e82337..192bf53cc 100644 --- a/webapps/examples/WEB-INF/tags/helloWorld.tag +++ b/webapps/examples/WEB-INF/tags/helloWorld.tag @@ -1,17 +1,17 @@ - -Hello, world! + +Hello, world! diff --git a/webapps/examples/WEB-INF/tags/panel.tag b/webapps/examples/WEB-INF/tags/panel.tag index 90aaf9167..f4f30d024 100644 --- a/webapps/examples/WEB-INF/tags/panel.tag +++ b/webapps/examples/WEB-INF/tags/panel.tag @@ -1,29 +1,29 @@ - -<%@ attribute name="color" %> -<%@ attribute name="bgcolor" %> -<%@ attribute name="title" %> - - - - - - - -
${title}
- -
+ +<%@ attribute name="color" %> +<%@ attribute name="bgcolor" %> +<%@ attribute name="title" %> + + + + + + + +
${title}
+ +
diff --git a/webapps/examples/WEB-INF/tags/xhtmlbasic.tag b/webapps/examples/WEB-INF/tags/xhtmlbasic.tag index d8af5e596..170a9bcf9 100644 --- a/webapps/examples/WEB-INF/tags/xhtmlbasic.tag +++ b/webapps/examples/WEB-INF/tags/xhtmlbasic.tag @@ -1,21 +1,21 @@ - - - - - + + + + + -- 2.11.0