Author: dklco
Date: Tue Jun 18 15:27:18 2013
New Revision: 1494174
URL: http://svn.apache.org/r1494174
Log:
Fixed SLING-2921 - Renamed the .tld file to sling.tld which seems to just make
more sense and updated the URI to not contain the TagLib version
Added:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/sling.tld
- copied, changed from r1494162,
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib13.tld
Removed:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib13.tld
Modified:
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
Copied:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/sling.tld
(from r1494162,
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib13.tld)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/sling.tld?p2=sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/sling.tld&p1=sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib13.tld&r1=1494162&r2=1494174&rev=1494174&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib13.tld
(original)
+++
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/sling.tld
Tue Jun 18 15:27:18 2013
@@ -16,7 +16,7 @@
<description>A supporting tab library for Apache Sling</description>
<tlib-version>1.3</tlib-version>
<short-name>sling</short-name>
- <uri>http://sling.apache.org/taglibs/sling/1.3</uri>
+ <uri>http://sling.apache.org/taglibs/sling</uri>
<function>
<name>adaptTo</name>
Modified:
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp?rev=1494174&r1=1494173&r2=1494174&view=diff
==============================================================================
---
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
Tue Jun 18 15:27:18 2013
@@ -1,5 +1,5 @@
<%@page session="false" contentType="text/html; charset=utf-8"%>
-<%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.3"; %>
+<%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling"; %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<sling:defineObjects/><c:set var="success" value="true" />
AdaptTo Tag
