Author: cziegeler
Date: Wed Apr 14 18:09:29 2010
New Revision: 934075
URL: http://svn.apache.org/viewvc?rev=934075&view=rev
Log:
SLING-1479 : Add JSP Tag for new script resolution - create new version for
taglib
Added:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib11.tld
(with props)
Modified:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib.tld
Modified:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib.tld
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib.tld?rev=934075&r1=934074&r2=934075&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib.tld
(original)
+++
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib.tld
Wed Apr 14 18:09:29 2010
@@ -235,70 +235,4 @@
<rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
-
- <tag>
- <description>
- Evaluates a script invocation and includes the result
- in the current page.
- </description>
- <name>eval</name>
- <tag-class>
- org.apache.sling.scripting.jsp.taglib.EvalTagHandler
- </tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>
- Whether to flush the output before including the target
- </description>
- <name>flush</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The path to the script object to include in the current
- request processing. By default, the current resource
- is used for script resolving. This behaviour can
- be changed by specifying either resource, resourceType
- or ignoreResourceTypeHierarchy.
- </description>
- <name>script</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
- The resource object to include in the current request
- processing. This attribute is optional. If it is
- specified, resourceType should not be used. If both
- are used, resource takes precedence.
- </description>
- <name>resource</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>org.apache.sling.api.resource.Resource</type>
- </attribute>
- <attribute>
- <description>
- The resource type of a resource to include. This
- attribute is optional. If it is specified, resource
- should not be used. If bot are used, resource
- takes precedence.
- </description>
- <name>resourceType</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
- Prevents using the resource type hierarchy for searching
- a script.
- </description>
- <name>ignoreResourceTypeHierarchy</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>boolean</type>
- </attribute>
- </tag>
</taglib>
Added:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib11.tld
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib11.tld?rev=934075&view=auto
==============================================================================
---
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib11.tld
(added)
+++
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib11.tld
Wed Apr 14 18:09:29 2010
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";
+ version="2.0">
+
+ <description>A supporting tab library for Apache Sling</description>
+ <tlib-version>1.1</tlib-version>
+ <short-name>sling</short-name>
+ <uri>http://sling.apache.org/taglibs/sling/1.1</uri>
+
+ <tag>
+ <description>
+ Includes a resource rendering into the current page
+ </description>
+ <name>include</name>
+ <tag-class>
+ org.apache.sling.scripting.jsp.taglib.IncludeTagHandler
+ </tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description>
+ Whether to flush the output before including the target
+ </description>
+ <name>flush</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description>
+ The resource object to include in the current request
+ processing. Either resource or path must be specified. If
+ both are specified, the resource takes precedences.
+ </description>
+ <name>resource</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>org.apache.sling.api.resource.Resource</type>
+ </attribute>
+ <attribute>
+ <description>
+ The path to the resource object to include in the current
+ request processing. If this path is relative it is
+ appended to the path of the current resource whose
+ script is including the given resource. Either resource
+ or path must be specified. If both are specified, the
+ resource takes precedences.
+ </description>
+ <name>path</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ The resource type of a resource to include. If the resource
+ to be included is specified with the path attribute,
+ which cannot be resolved to a resource, the tag may
+ create a synthetic resource object out of the path and
+ this resource type. If the resource type is set the path
+ must be the exact path to a resource object. That is,
+ adding parameters, selectors and extensions to the path
+ is not supported if the resource type is set.
+ </description>
+ <name>resourceType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ When dispatching, replace selectors by the value
+ provided by this option.
+ </description>
+ <name>replaceSelectors</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ When dispatching, add the value provided by this option to the
selectors.
+ </description>
+ <name>addSelectors</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ When dispatching, replace the suffix by the value
+ provided by this option.
+ </description>
+ <name>replaceSuffix</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Forwards a request to a resource rendering the current page
+ </description>
+ <name>forward</name>
+ <tag-class>
+ org.apache.sling.scripting.jsp.taglib.ForwardTagHandler
+ </tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description>
+ The resource object to forward the request to. Either
+ resource or path must be specified. If both are
+ specified, the resource takes precedences.
+ </description>
+ <name>resource</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>org.apache.sling.api.resource.Resource</type>
+ </attribute>
+ <attribute>
+ <description>
+ The path to the resource object to forward the request
+ to. If this path is relative it is appended to the path
+ of the current resource whose script is forwarding the
+ given resource. Either resource or path must be specified.
+ If both are specified, the resource takes precedences.
+ </description>
+ <name>path</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ The resource type of a resource to forward. If the resource
+ to be forwarded is specified with the path attribute,
+ which cannot be resolved to a resource, the tag may
+ create a synthetic resource object out of the path and
+ this resource type. If the resource type is set the path
+ must be the exact path to a resource object. That is,
+ adding parameters, selectors and extensions to the path
+ is not supported if the resource type is set.
+ </description>
+ <name>resourceType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ When dispatching, replace selectors by the value
+ provided by this option.
+ </description>
+ <name>replaceSelectors</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ When dispatching, add the value provided by this option to the
selectors.
+ </description>
+ <name>addSelectors</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ When dispatching, replace the suffix by the value
+ provided by this option.
+ </description>
+ <name>replaceSuffix</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Defines regularly used scripting variables
+ </description>
+ <name>defineObjects</name>
+ <tag-class>
+ org.apache.sling.scripting.jsp.taglib.DefineObjectsTag
+ </tag-class>
+ <tei-class>
+ org.apache.sling.scripting.jsp.taglib.DefineObjectsTEI
+ </tei-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>requestName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>responseName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>resourceName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>nodeName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>logName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>resourceResolverName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>slingName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Evaluates a script invocation and includes the result
+ in the current page.
+ </description>
+ <name>eval</name>
+ <tag-class>
+ org.apache.sling.scripting.jsp.taglib.EvalTagHandler
+ </tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description>
+ Whether to flush the output before including the target
+ </description>
+ <name>flush</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description>
+ The path to the script object to include in the current
+ request processing. By default, the current resource
+ is used for script resolving. This behaviour can
+ be changed by specifying either resource, resourceType
+ or ignoreResourceTypeHierarchy.
+ </description>
+ <name>script</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ The resource object to include in the current request
+ processing. This attribute is optional. If it is
+ specified, resourceType should not be used. If both
+ are used, resource takes precedence.
+ </description>
+ <name>resource</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>org.apache.sling.api.resource.Resource</type>
+ </attribute>
+ <attribute>
+ <description>
+ The resource type of a resource to include. This
+ attribute is optional. If it is specified, resource
+ should not be used. If bot are used, resource
+ takes precedence.
+ </description>
+ <name>resourceType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ Prevents using the resource type hierarchy for searching
+ a script.
+ </description>
+ <name>ignoreResourceTypeHierarchy</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>boolean</type>
+ </attribute>
+ </tag>
+</taglib>
Propchange:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib11.tld
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/bundles/scripting/jsp-taglib/src/main/resources/META-INF/taglib11.tld
------------------------------------------------------------------------------
svn:mime-type = text/plain
