projects / tomcat7.0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7401b16)
Partial fix for bug 47444.
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 15 Jul 2009 06:53:20 +0000 (06:53 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 15 Jul 2009 06:53:20 +0000 (06:53 +0000)
Update taglib URIs in examples, removing Jakarta references

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

webapps/examples/WEB-INF/jsp/debug-taglib.tld patch | blob | history
webapps/examples/WEB-INF/jsp/example-taglib.tld patch | blob | history
webapps/examples/WEB-INF/web.xml patch | blob | history
webapps/examples/jsp/jsp2/el/functions.jsp patch | blob | history
webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp patch | blob | history
webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp patch | blob | history
webapps/examples/jsp/jsp2/misc/config.jsp patch | blob | history
webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp patch | blob | history
webapps/examples/jsp/simpletag/foo.jsp patch | blob | history
webapps/examples/jsp/source.jsp patch | blob | history

diff --git a/webapps/examples/WEB-INF/jsp/debug-taglib.tld b/webapps/examples/WEB-INF/jsp/debug-taglib.tld
index e9f7f92..66f0824 100644 (file)
--- a/webapps/examples/WEB-INF/jsp/debug-taglib.tld
+++ b/webapps/examples/WEB-INF/jsp/debug-taglib.tld
@@ -25,7 +25,7 @@
   <tlib-version>1.0</tlib-version>
   <jsp-version>1.2</jsp-version>
   <short-name>debug</short-name>
-  <uri>http://jakarta.apache.org/tomcat/debug-taglib</uri>
+  <uri>http://tomcat.apache.org/debug-taglib</uri>
   <description>
     This tag library defines no tags.  Instead, its purpose is encapsulated
     in the TagLibraryValidator implementation that simply outputs the XML
diff --git a/webapps/examples/WEB-INF/jsp/example-taglib.tld b/webapps/examples/WEB-INF/jsp/example-taglib.tld
index c6bb592..d8c2659 100644 (file)
--- a/webapps/examples/WEB-INF/jsp/example-taglib.tld
+++ b/webapps/examples/WEB-INF/jsp/example-taglib.tld
@@ -24,7 +24,7 @@
   <tlib-version>1.0</tlib-version>
   <jsp-version>1.2</jsp-version>
   <short-name>simple</short-name>
-  <uri>http://jakarta.apache.org/tomcat/example-taglib</uri>
+  <uri>http://tomcat.apache.org/example-taglib</uri>
   <description>
        A simple tab library for the examples
   </description>
diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index 478bdd5..fb40623 100644 (file)
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -184,7 +184,7 @@
     <jsp-config>
         <taglib>
            <taglib-uri>
-              http://jakarta.apache.org/tomcat/debug-taglib
+              http://tomcat.apache.org/debug-taglib
            </taglib-uri>
            <taglib-location>
               /WEB-INF/jsp/debug-taglib.tld
@@ -193,7 +193,7 @@
 
        <taglib>
            <taglib-uri>
-              http://jakarta.apache.org/tomcat/examples-taglib
+              http://tomcat.apache.org/examples-taglib
            </taglib-uri>
            <taglib-location>
               /WEB-INF/jsp/example-taglib.tld
@@ -202,7 +202,7 @@
 
        <taglib>
            <taglib-uri>
-              http://jakarta.apache.org/tomcat/jsp2-example-taglib
+              http://tomcat.apache.org/jsp2-example-taglib
            </taglib-uri>
            <taglib-location>
               /WEB-INF/jsp2/jsp2-example-taglib.tld
diff --git a/webapps/examples/jsp/jsp2/el/functions.jsp b/webapps/examples/jsp/jsp2/el/functions.jsp
index 709e856..f3370a2 100644 (file)
--- a/webapps/examples/jsp/jsp2/el/functions.jsp
+++ b/webapps/examples/jsp/jsp2/el/functions.jsp
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://tomcat.apache.org/jsp2-example-taglib"%>
 
 <html>
   <head>
diff --git a/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp b/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
index c465b31..d28148e 100644 (file)
--- a/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
+++ b/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://tomcat.apache.org/jsp2-example-taglib"%>
 
 <html>
   <head>
diff --git a/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp b/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
index a8d31b5..38864a3 100644 (file)
--- a/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
+++ b/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://tomcat.apache.org/jsp2-example-taglib"%>
 
 <html>
   <head>
diff --git a/webapps/examples/jsp/jsp2/misc/config.jsp b/webapps/examples/jsp/jsp2/misc/config.jsp
index 3bec16a..2814412 100644 (file)
--- a/webapps/examples/jsp/jsp2/misc/config.jsp
+++ b/webapps/examples/jsp/jsp2/misc/config.jsp
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://tomcat.apache.org/jsp2-example-taglib"%>
     <h1>JSP 2.0 Examples - JSP Configuration</h1>
     <hr>
     <p>Using a &lt;jsp-property-group&gt; element in the web.xml 
diff --git a/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp b/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
index 83f8a02..3f9748a 100644 (file)
--- a/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
+++ b/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://tomcat.apache.org/jsp2-example-taglib"%>
 <html>
   <head>
     <title>JSP 2.0 Examples - Dynamic Attributes</title>
diff --git a/webapps/examples/jsp/simpletag/foo.jsp b/webapps/examples/jsp/simpletag/foo.jsp
index 1a7dba0..bda0311 100644 (file)
--- a/webapps/examples/jsp/simpletag/foo.jsp
+++ b/webapps/examples/jsp/simpletag/foo.jsp
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <body>
-<%@ taglib uri="http://jakarta.apache.org/tomcat/examples-taglib" prefix="eg"%>
+<%@ taglib uri="http://tomcat.apache.org/examples-taglib" prefix="eg"%>
 
 Radio stations that rock:
 
diff --git a/webapps/examples/jsp/source.jsp b/webapps/examples/jsp/source.jsp
index d26ee51..1d49a0d 100644 (file)
--- a/webapps/examples/jsp/source.jsp
+++ b/webapps/examples/jsp/source.jsp
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<%@ taglib uri="http://jakarta.apache.org/tomcat/examples-taglib"
+<%@ taglib uri="http://tomcat.apache.org/examples-taglib"
         prefix="eg" %>
 
 <eg:ShowSource jspFile="<%= util.HTMLFilter.filter(request.getQueryString()) %>"/>
Unnamed repository; edit this file to name it for gitweb.