From: markt Date: Wed, 15 Jul 2009 06:53:20 +0000 (+0000) Subject: Partial fix for bug 47444. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=08ae9c02abc8b8f8ca3c3f78699c71af6ff3475a;p=tomcat7.0 Partial fix for bug 47444. 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 --- diff --git a/webapps/examples/WEB-INF/jsp/debug-taglib.tld b/webapps/examples/WEB-INF/jsp/debug-taglib.tld index e9f7f921d..66f082470 100644 --- a/webapps/examples/WEB-INF/jsp/debug-taglib.tld +++ b/webapps/examples/WEB-INF/jsp/debug-taglib.tld @@ -25,7 +25,7 @@ 1.0

1.2

debug - http://jakarta.apache.org/tomcat/debug-taglib + http://tomcat.apache.org/debug-taglib 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 c6bb592db..d8c2659e8 100644 --- a/webapps/examples/WEB-INF/jsp/example-taglib.tld +++ b/webapps/examples/WEB-INF/jsp/example-taglib.tld @@ -24,7 +24,7 @@ 1.0

1.2

simple - http://jakarta.apache.org/tomcat/example-taglib + http://tomcat.apache.org/example-taglib A simple tab library for the examples diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml index 478bdd572..fb40623df 100644 --- a/webapps/examples/WEB-INF/web.xml +++ b/webapps/examples/WEB-INF/web.xml @@ -184,7 +184,7 @@

- http://jakarta.apache.org/tomcat/debug-taglib + http://tomcat.apache.org/debug-taglib

/WEB-INF/jsp/debug-taglib.tld @@ -193,7 +193,7 @@

- http://jakarta.apache.org/tomcat/examples-taglib + http://tomcat.apache.org/examples-taglib

/WEB-INF/jsp/example-taglib.tld @@ -202,7 +202,7 @@

- http://jakarta.apache.org/tomcat/jsp2-example-taglib + http://tomcat.apache.org/jsp2-example-taglib

/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 709e8568f..f3370a2e4 100644 --- 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"%> diff --git a/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp b/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp index c465b31ab..d28148e7a 100644 --- 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"%> diff --git a/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp b/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp index a8d31b51e..38864a317 100644 --- 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"%> diff --git a/webapps/examples/jsp/jsp2/misc/config.jsp b/webapps/examples/jsp/jsp2/misc/config.jsp index 3bec16a82..281441218 100644 --- 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"%>

JSP 2.0 Examples - JSP Configuration

Using a <jsp-property-group> element in the web.xml diff --git a/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp b/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp index 83f8a0243..3f9748aed 100644 --- 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"%> JSP 2.0 Examples - Dynamic Attributes diff --git a/webapps/examples/jsp/simpletag/foo.jsp b/webapps/examples/jsp/simpletag/foo.jsp index 1a7dba0fe..bda0311d8 100644 --- a/webapps/examples/jsp/simpletag/foo.jsp +++ b/webapps/examples/jsp/simpletag/foo.jsp @@ -16,7 +16,7 @@ limitations under the License. --> -<%@ 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 d26ee51c8..1d49a0d6e 100644 --- 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" %>