Author: markt
Date: Wed Jul 15 06:53:20 2009
New Revision: 794156
URL: http://svn.apache.org/viewvc?rev=794156&view=rev
Log:
Partial fix for bug 47444.
Update taglib URIs in examples, removing Jakarta references
Modified:
tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
tomcat/trunk/webapps/examples/WEB-INF/web.xml
tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp
tomcat/trunk/webapps/examples/jsp/source.jsp
Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld Wed Jul 15
06:53:20 2009
@@ -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
Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld Wed Jul 15
06:53:20 2009
@@ -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>
Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Wed Jul 15 06:53:20 2009
@@ -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
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp Wed Jul 15 06:53:20
2009
@@ -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>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
(original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp Wed
Jul 15 06:53:20 2009
@@ -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>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp Wed Jul 15
06:53:20 2009
@@ -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>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp Wed Jul 15 06:53:20
2009
@@ -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 <jsp-property-group> element in the web.xml
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp Wed Jul 15
06:53:20 2009
@@ -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>
Modified: tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp Wed Jul 15 06:53:20 2009
@@ -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:
Modified: tomcat/trunk/webapps/examples/jsp/source.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/source.jsp?rev=794156&r1=794155&r2=794156&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/source.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/source.jsp Wed Jul 15 06:53:20 2009
@@ -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())
%>"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
