Align tag library URIs in web.xml, TLDs and JSPs.

Note that the inconsistencies didn't break anything as the TLD scanning found all the various URIs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@795764 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld b/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
index f9e0b3d..707d997 100644 (file)
--- a/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
+++ b/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
@@ -23,7 +23,7 @@
     <description>A tag library exercising SimpleTag handlers.</description>
     <tlib-version>1.0</tlib-version>
     <short-name>SimpleTagLibrary</short-name>
-    <uri>/SimpleTagLibrary</uri>
+    <uri>http://tomcat.apache.org/jsp2-example-taglib</uri>
     <tag>
        <description>Outputs Hello, World</description>
         <name>helloWorld</name>

diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index 15b3e0d..71da8e0 100644 (file)
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -193,7 +193,7 @@
 
         <taglib>
             <taglib-uri>
-               http://tomcat.apache.org/examples-taglib
+               http://tomcat.apache.org/example-taglib
             </taglib-uri>
             <taglib-location>
                /WEB-INF/jsp/example-taglib.tld