Author: kwin
Date: Fri Feb 13 14:35:04 2015
New Revision: 1659574
URL: http://svn.apache.org/r1659574
Log:
SLING-4383 extend @since in Javadoc to always mention the bundle version in
addition to the package version
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestPathInfo.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestUtil.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/ResponseUtil.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AttributableResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/DynamicResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/LoginException.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifiableValueMap.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/PersistenceException.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
Fri Feb 13 14:35:04 2015
@@ -265,7 +265,7 @@ public class SlingConstants {
* to the resource tree.
* The event contains at least the {@link #PROPERTY_PATH}, {@link
#PROPERTY_RESOURCE_SUPER_TYPE}
* and {@link #PROPERTY_RESOURCE_TYPE} properties.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_RESOURCE_ADDED =
"org/apache/sling/api/resource/Resource/ADDED";
@@ -274,7 +274,7 @@ public class SlingConstants {
* from the resource tree.
* The event contains at least the {@link #PROPERTY_PATH}. As the resource
has already been removed
* no further information like resource type etc. might be available.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_RESOURCE_REMOVED =
"org/apache/sling/api/resource/Resource/REMOVED";
@@ -286,7 +286,7 @@ public class SlingConstants {
* Since 2.2.0 the event might contain these properties {@link
#PROPERTY_ADDED_ATTRIBUTES},
* {@link #PROPERTY_REMOVED_ATTRIBUTES}, {@link
#PROPERTY_CHANGED_ATTRIBUTES}. All of them are
* optional.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_RESOURCE_CHANGED =
"org/apache/sling/api/resource/Resource/CHANGED";
@@ -294,7 +294,7 @@ public class SlingConstants {
* The topic for the OSGi event which is sent when a resource provider has
been
* added to the resource tree.
* The event contains at least the {@link #PROPERTY_PATH} property.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_RESOURCE_PROVIDER_ADDED =
"org/apache/sling/api/resource/ResourceProvider/ADDED";
@@ -302,37 +302,37 @@ public class SlingConstants {
* The topic for the OSGi event which is sent when a resource provider has
been
* removed from the resource tree.
* The event contains at least the {@link #PROPERTY_PATH} property.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_RESOURCE_PROVIDER_REMOVED =
"org/apache/sling/api/resource/ResourceProvider/REMOVED";
/**
* The topic for the OSGi event which is sent when the resource mapping
changes.
- * @since 2.2.0
+ * @since 2.2.0 (Sling API Bundle 2.2.0)
*/
public static final String TOPIC_RESOURCE_RESOLVER_MAPPING_CHANGED =
"org/apache/sling/api/resource/ResourceResolverMapping/CHANGED";
/**
* The name of the event property holding the resource path.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_PATH = "path";
/**
* The name of the event property holding the userid. This property is
optional.
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public static final String PROPERTY_USERID = "userid";
/**
* The name of the event property holding the resource type.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_RESOURCE_TYPE = "resourceType";
/**
* The name of the event property holding the resource super type.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_RESOURCE_SUPER_TYPE =
"resourceSuperType";
@@ -340,7 +340,7 @@ public class SlingConstants {
* The name of the event property holding the changed attribute names
* of a resource for an {@link #TOPIC_RESOURCE_CHANGED} event.
* The value of the property is a string array.
- * @since 2.2.0
+ * @since 2.2.0 (Sling API Bundle 2.2.0)
*/
public static final String PROPERTY_CHANGED_ATTRIBUTES =
"resourceChangedAttributes";
@@ -348,7 +348,7 @@ public class SlingConstants {
* The name of the event property holding the added attribute names
* of a resource for an {@link #TOPIC_RESOURCE_CHANGED} event.
* The value of the property is a string array.
- * @since 2.2.0
+ * @since 2.2.0 (Sling API Bundle 2.2.0)
*/
public static final String PROPERTY_ADDED_ATTRIBUTES =
"resourceAddedAttributes";
@@ -356,7 +356,7 @@ public class SlingConstants {
* The name of the event property holding the removed attribute names
* of a resource for an {@link #TOPIC_RESOURCE_CHANGED} event.
* The value of the property is a string array.
- * @since 2.2.0
+ * @since 2.2.0 (Sling API Bundle 2.2.0)
*/
public static final String PROPERTY_REMOVED_ATTRIBUTES =
"resourceRemovedAttributes";
@@ -364,7 +364,7 @@ public class SlingConstants {
* The topic for the OSGi event which is sent when an adapter factory has
been added.
* The event contains at least the {@link #PROPERTY_ADAPTABLE_CLASSES},
* and {@link #PROPERTY_ADAPTER_CLASSES} poperties.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_ADAPTER_FACTORY_ADDED =
"org/apache/sling/api/adapter/AdapterFactory/ADDED";
@@ -372,7 +372,7 @@ public class SlingConstants {
* The topic for the OSGi event which is sent when an adapter factory has
been removed.
* The event contains at least the {@link #PROPERTY_ADAPTABLE_CLASSES},
* and {@link #PROPERTY_ADAPTER_CLASSES} poperties.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_ADAPTER_FACTORY_REMOVED =
"org/apache/sling/api/adapter/AdapterFactory/REMOVED";
@@ -380,7 +380,7 @@ public class SlingConstants {
* The event property listing the fully qualified names of
* classes which can be adapted by this adapter factory (value is
* "adaptables"). The type of the value is a string array.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_ADAPTABLE_CLASSES = "adaptables";
@@ -388,7 +388,7 @@ public class SlingConstants {
* The event property listing the fully qualified names of
* classes to which this factory can adapt adaptables (value is
"adapters").
* The type of the value is a string array.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_ADAPTER_CLASSES = "adapters";
@@ -398,7 +398,7 @@ public class SlingConstants {
* attribute is set immediately before calling the
* <code>Servlet.service()</code> method and reset to any previously
* stored value after the service method returns.
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
public static final String SLING_CURRENT_SERVLET_NAME =
"sling.core.current.servletName";
}
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
Fri Feb 13 14:35:04 2015
@@ -152,7 +152,7 @@ public interface SlingHttpServletRequest
*
* @return The list of {@link RequestParameter} in request declaration
* order.
- * @since 2.3 (bundle version 2.6)
+ * @since 2.3 (Sling API Bundle 2.6.0)
*/
List<RequestParameter> getRequestParameterList();
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
Fri Feb 13 14:35:04 2015
@@ -30,7 +30,7 @@ import java.util.Map;
* using their own knowledge of adapters and should call this base class
* implementation to fall back for other types.
*
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
public abstract class SlingAdaptable implements Adaptable {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
Fri Feb 13 14:35:04 2015
@@ -40,7 +40,7 @@ public interface RequestParameter {
/**
* @return the name of this {@code RequestParameter}
- * @since 2.4 (bundle version 2.6)
+ * @since 2.4 (Sling API Bundle 2.6)
*/
String getName();
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestPathInfo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestPathInfo.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestPathInfo.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestPathInfo.java
Fri Feb 13 14:35:04 2015
@@ -215,7 +215,7 @@ public interface RequestPathInfo {
* {@link
org.apache.sling.api.resource.ResourceResolver#getResource(String)}
* method.
*
- * @since 2.3 (Sling API 2.3.2)
+ * @since 2.3 (Sling API Bundle 2.3.2)
*/
Resource getSuffixResource();
}
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestUtil.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestUtil.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestUtil.java
Fri Feb 13 14:35:04 2015
@@ -34,7 +34,7 @@ import org.apache.sling.api.SlingHttpSer
* This class is not intended to be extended or instantiated because it just
* provides static utility methods not intended to be overwritten.
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
public class RequestUtil {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/ResponseUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/ResponseUtil.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/ResponseUtil.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/ResponseUtil.java
Fri Feb 13 14:35:04 2015
@@ -27,7 +27,7 @@ import java.io.Writer;
* This class is not intended to be extended or instantiated because it just
* provides static utility methods not intended to be overwritten.
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
public class ResponseUtil {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
Fri Feb 13 14:35:04 2015
@@ -29,7 +29,7 @@ import javax.servlet.ServletRequest;
* This class is not intended to be extended or instantiated by clients.
*
* @see org.apache.sling.api.request.SlingRequestListener
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public class SlingRequestEvent {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java
Fri Feb 13 14:35:04 2015
@@ -36,7 +36,7 @@ import org.apache.sling.api.wrappers.Val
* always be able to support new methods that might be introduced in the
* {@link Resource} interface in the future.
*
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public abstract class AbstractResource
extends SlingAdaptable
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java
Fri Feb 13 14:35:04 2015
@@ -26,7 +26,7 @@ import java.util.Iterator;
* from application code. Concrete subclasses should implement
* the {@link ResourceVisitor#visit(Resource)} method.
*
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
public abstract class AbstractResourceVisitor {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AttributableResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AttributableResourceProvider.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AttributableResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AttributableResourceProvider.java
Fri Feb 13 14:35:04 2015
@@ -34,7 +34,7 @@ import aQute.bnd.annotation.ConsumerType
* @see ResourceResolver#getAttribute(String)
* @see ResourceResolver#getAttributeNames()
*
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
@ConsumerType
public interface AttributableResourceProvider extends ResourceProvider {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/DynamicResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/DynamicResourceProvider.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/DynamicResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/DynamicResourceProvider.java
Fri Feb 13 14:35:04 2015
@@ -37,7 +37,7 @@ import aQute.bnd.annotation.ConsumerType
* @see ResourceProviderFactory#getResourceProvider(java.util.Map)
* @see
ResourceProviderFactory#getAdministrativeResourceProvider(java.util.Map)
*
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
@ConsumerType
public interface DynamicResourceProvider extends ResourceProvider {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/LoginException.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/LoginException.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/LoginException.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/LoginException.java
Fri Feb 13 14:35:04 2015
@@ -26,7 +26,7 @@ package org.apache.sling.api.resource;
* , and <code>{@link ResourceResolver#clone(java.util.Map)}</code> if a
resource
* resolver cannot be created because the credential data is not valid.
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
public class LoginException extends Exception {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifiableValueMap.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifiableValueMap.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifiableValueMap.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifiableValueMap.java
Fri Feb 13 14:35:04 2015
@@ -58,7 +58,7 @@ import aQute.bnd.annotation.ConsumerType
* A modifiable value map must not support deep writes. A call of a
modification method
* with a path should result in an IllegalArgumentException.
*
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
@ConsumerType
public interface ModifiableValueMap extends ValueMap {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
Fri Feb 13 14:35:04 2015
@@ -41,7 +41,7 @@ import aQute.bnd.annotation.ConsumerType
* @see ResourceProviderFactory#getResourceProvider(java.util.Map)
* @see
ResourceProviderFactory#getAdministrativeResourceProvider(java.util.Map)
*
- * @since 2.2.0
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
@ConsumerType
public interface ModifyingResourceProvider extends ResourceProvider {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/PersistenceException.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/PersistenceException.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/PersistenceException.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/PersistenceException.java
Fri Feb 13 14:35:04 2015
@@ -78,7 +78,7 @@ public class PersistenceException extend
/**
* Get the resource path related to this exception.
* @return The resource path or <code>null</code>
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
public String getResourcePath() {
return this.resourcePath;
@@ -87,7 +87,7 @@ public class PersistenceException extend
/**
* Get the property name related to this exception.
* @return The property name or <code>null</code>
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
public String getPropertyName() {
return this.propertyName;
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java
Fri Feb 13 14:35:04 2015
@@ -30,7 +30,7 @@ import aQute.bnd.annotation.ConsumerType
* {@link ResourceProvider} interface and {@link ResourceProvider}s
* returned through a {@link ResourceProviderFactory}.
*
- * @since 2.2.0
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
@ConsumerType
public interface QueriableResourceProvider extends ResourceProvider {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java
Fri Feb 13 14:35:04 2015
@@ -34,7 +34,7 @@ import aQute.bnd.annotation.ConsumerType
* @see ResourceProviderFactory#getResourceProvider(java.util.Map)
* @see
ResourceProviderFactory#getAdministrativeResourceProvider(java.util.Map)
*
- * @since 2.3.0
+ * @since 2.3 (Sling API Bundle 2.4.0)
*/
@ConsumerType
public interface RefreshableResourceProvider extends ResourceProvider {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
Fri Feb 13 14:35:04 2015
@@ -68,7 +68,7 @@ public interface Resource extends Adapta
* Returns the name of this resource. The name of a resource is the last
* segment of the {@link #getPath() path}.
*
- * @since 2.1.0
+ * @since 2.1 (Sling API Bundle 2.2.0)
*/
String getName();
@@ -76,7 +76,7 @@ public interface Resource extends Adapta
* Returns the parent resource or <code>null</code> if this resource
* represents the root of the resource tree.
*
- * @since 2.1.0
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
Resource getParent();
@@ -86,7 +86,7 @@ public interface Resource extends Adapta
* This method is a convenience and returns exactly the same resources as
* calling <code>getResourceResolver().listChildren(resource)</code>.
*
- * @since 2.1.0
+ * @since 2.1 (Sling API Bundle 2.1.0)
* @see ResourceResolver#listChildren(Resource)
*/
Iterator<Resource> listChildren();
@@ -97,7 +97,7 @@ public interface Resource extends Adapta
* This method is a convenience and returns exactly the same resources as
* calling <code>getResourceResolver().getChildren(resource)</code>.
*
- * @since 2.2.0
+ * @since 2.2 (Sling API Bundle 2.2.0)
* @see ResourceResolver#getChildren(Resource)
*/
Iterable<Resource> getChildren();
@@ -109,7 +109,7 @@ public interface Resource extends Adapta
* This method is a convenience and returns exactly the same resources as
* calling <code>getResourceResolver().getResource(resource,
relPath)</code>.
*
- * @since 2.1.0
+ * @since 2.1 (Sling API Bundle 2.1.0)
* @see ResourceResolver#getResource(Resource, String)
*/
Resource getChild(String relPath);
@@ -141,7 +141,7 @@ public interface Resource extends Adapta
* Checks if the resource has any child resources.
*
* @return <code>true</code> if the resource has any child resources
- * @since 2.4.4
+ * @since 2.4.4 (Sling API Bundle 2.5.0)
*/
boolean hasChildren();
@@ -154,7 +154,7 @@ public interface Resource extends Adapta
* super type(s) equals the given resource type. <code>false</code>
* is also returned if <code>resourceType</code> is
* <code>null</code>.
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
boolean isResourceType(String resourceType);
@@ -179,7 +179,7 @@ public interface Resource extends Adapta
* Returns a value map for this resource.
* The value map allows to read the properties of the resource.
* @return A value map
- * @since 2.5
+ * @since 2.5 (Sling API Bundle 2.7.0)
*/
ValueMap getValueMap();
}
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
Fri Feb 13 14:35:04 2015
@@ -28,7 +28,7 @@ import aQute.bnd.annotation.ConsumerType
* based on the resource path)
* - add metadata
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
@ConsumerType
public interface ResourceDecorator {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
Fri Feb 13 14:35:04 2015
@@ -64,7 +64,7 @@ public class ResourceMetadata extends Ha
* This property is optional. If missing, it should be assumed equal to an
* empty string.
*
- * @since 2.0.4
+ * @since 2.0.4 (Sling API Bundle 2.0.4)
*/
public static final String RESOLUTION_PATH_INFO =
"sling.resolutionPathInfo";
@@ -123,7 +123,7 @@ public class ResourceMetadata extends Ha
* This flag should never be manipulated by application code!
* The value of this property has no meaning, the resource resolver
* just checks whether this flag is set or not.
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
public static final String INTERNAL_CONTINUE_RESOLVING =
":org.apache.sling.resource.internal.continue.resolving";
@@ -330,7 +330,7 @@ public class ResourceMetadata extends Ha
/**
* Make this object read-only. All method calls trying to modify this
object
* result in an exception!
- * @since 2.3
+ * @since 2.3 (Sling API Bundle 2.4.0)
*/
public void lock() {
this.isReadOnly = true;
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
Fri Feb 13 14:35:04 2015
@@ -63,7 +63,7 @@ public interface ResourceProvider {
* no other providers are asked for resources under this root if this
* provider does not have a resource. (value is "provider.ownsRoots").
*
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
String OWNS_ROOTS = "provider.ownsRoots";
@@ -75,7 +75,7 @@ public interface ResourceProvider {
* the underlying storage already provides it.
* The default for this value is <code>false</code>.
* (value is "provider.useResourceAccessSecurity")
- * @since 2.4
+ * @since 2.4 (Sling API Bundle 2.5.0)
*/
String USE_RESOURCE_ACCESS_SECURITY = "provider.useResourceAccessSecurity";
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
Fri Feb 13 14:35:04 2015
@@ -32,7 +32,7 @@ import aQute.bnd.annotation.ConsumerType
* If the resource provider is not used anymore and implements the
* {@link DynamicResourceProvider} interface, the close method should be
called.
*
- * @since 2.2.0
+ * @since 2.2.0 (Sling API Bundle 2.2.0)
*/
@ConsumerType
public interface ResourceProviderFactory {
@@ -61,7 +61,7 @@ public interface ResourceProviderFactory
* The type of this property, if present, is
* <code>org.osgi.framework.Bundle</code>.
*
- * @since 2.4 (bundle version 2.5.0)
+ * @since 2.4 (Sling API Bundle 2.5.0)
*/
String SERVICE_BUNDLE = "sling.service.bundle";
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
Fri Feb 13 14:35:04 2015
@@ -111,7 +111,7 @@ public interface ResourceResolver extend
* {@link #resolve(HttpServletRequest, String)} if not the default
workspace
* should be used to resolve the resource.
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
* @deprecated
*/
@Deprecated
@@ -125,7 +125,7 @@ public interface ResourceResolver extend
* this attribute is the name of the primary user provided to the resource
* resolver factory method.
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
String USER_IMPERSONATOR = "user.impersonator";
@@ -136,7 +136,7 @@ public interface ResourceResolver extend
* However the exact way to set the resource type of a resource is defined
* by the underlying resource provider. It should value this property but
* is not required to do so.
- * @since 2.3
+ * @since 2.3 (Sling API Bundle 2.4.0)
*/
String PROPERTY_RESOURCE_TYPE = "sling:resourceType";
@@ -167,7 +167,7 @@ public interface ResourceResolver extend
* thrown if an error occurs trying to resolve the resource.
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
- * @since 2.0.4
+ * @since 2.0.4 (Sling API Bundle 2.0.4)
*/
Resource resolve(HttpServletRequest request, String absPath);
@@ -275,7 +275,7 @@ public interface ResourceResolver extend
* @return The mapped URL.
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
- * @since 2.0.4
+ * @since 2.0.4 (Sling API Bundle 2.0.4)
*/
String map(HttpServletRequest request, String resourcePath);
@@ -396,7 +396,7 @@ public interface ResourceResolver extend
* the child resource iterator.
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
Iterable<Resource> getChildren(Resource parent);
@@ -463,7 +463,7 @@ public interface ResourceResolver extend
* @param resource
* the resource to check for direct children
* @return <code>true</code> if the resource has any child resources
- * @since 2.4.4
+ * @since 2.4.4 (Sling API Bundle 2.5.0)
*/
boolean hasChildren(Resource resource);
@@ -493,7 +493,7 @@ public interface ResourceResolver extend
* data.
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
ResourceResolver clone(Map<String, Object> authenticationInfo)
throws LoginException;
@@ -509,7 +509,7 @@ public interface ResourceResolver extend
* @return <code>true</code> if the resource resolver has not been closed
* yet. Once the resource resolver has been closed, this method
* returns <code>false</code>.
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
boolean isLive();
@@ -520,7 +520,7 @@ public interface ResourceResolver extend
* exceptions if still used - with the exception of this method, which
* can be called several times with no ill effects.
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
void close();
@@ -532,7 +532,7 @@ public interface ResourceResolver extend
* @return the user ID
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
String getUserID();
@@ -573,7 +573,7 @@ public interface ResourceResolver extend
* @throws UnsupportedOperationException If the resource provider does not
allow to
* delete this resource.
* @throws PersistenceException If the operation fails.
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
void delete(Resource resource)
throws PersistenceException;
@@ -590,14 +590,14 @@ public interface ResourceResolver extend
* @throws UnsupportedOperationException If the resource provider does not
allow to
* create a resource at that
location.
* @throws PersistenceException If the operation fails.
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
Resource create(Resource parent, String name, Map<String, Object>
properties)
throws PersistenceException;
/**
* Revert all pending changes.
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
void revert();
@@ -605,13 +605,13 @@ public interface ResourceResolver extend
* Persist all pending changes.
*
* @throws PersistenceException
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
void commit() throws PersistenceException;
/**
* Are there any pending changes?
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
boolean hasChanges();
@@ -626,7 +626,7 @@ public interface ResourceResolver extend
* @return The resource super type or <code>null</code>. This
* method also returns <code>null</code> if the
* provided resource is <code>null</code>
- * @since 2.3
+ * @since 2.3 (Sling API Bundle 2.4.0)
*/
String getParentResourceType(final Resource resource);
@@ -641,7 +641,7 @@ public interface ResourceResolver extend
* <code>null</code> if the resource type does not exist or returns
* <code>null</code> for its super type. It also returns
* <code>null</code> if <code>resourceType> is null.
- * @since 2.3
+ * @since 2.3 (Sling API Bundle 2.4.0)
*/
public String getParentResourceType(final String resourceType);
@@ -655,14 +655,14 @@ public interface ResourceResolver extend
* super type(s) equals the given resource type. <code>false</code>
* is also returned if <code>resource</code>
or<code>resourceType</code>
* are <code>null</code>.
- * @since 2.3
+ * @since 2.3 (Sling API Bundle 2.4.0)
*/
boolean isResourceType(final Resource resource, final String resourceType);
/**
* The resolver is updated to reflect the latest state.
* Resources which have changes pending are not discarded.
- * @since 2.3
+ * @since 2.3 (Sling API Bundle 2.4.0)
*/
void refresh();
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java
Fri Feb 13 14:35:04 2015
@@ -32,7 +32,7 @@ import aQute.bnd.annotation.ProviderType
* All resource resolvers returned by the same resource resolver factory
* must use the same search path
*
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
@ProviderType
public interface ResourceResolverFactory {
@@ -61,7 +61,7 @@ public interface ResourceResolverFactory
* the user for which to create a resource resolver and change the
password during login.
* <p>
* The type of this property, if present, is <code>String</code>.
- * @since 2.7
+ * @since 2.7 (Sling API Bundle 2.9.0)
*/
String NEW_PASSWORD = "user.newpassword";
@@ -91,7 +91,7 @@ public interface ResourceResolverFactory
* The type of this property, if present, is <code>String</code>.
*
* @see #getServiceResourceResolver(Map)
- * @since 2.4 (bundle version 2.5.0)
+ * @since 2.4 (Sling API Bundle 2.5.0)
*/
String SUBSERVICE = "sling.service.subservice";
@@ -177,7 +177,7 @@ public interface ResourceResolverFactory
* @throws LoginException If an error occurs creating the new
* <code>ResourceResolver</code> for the service represented by
* the calling bundle.
- * @since 2.4 (bundle version 2.5.0) to replace
+ * @since 2.4 (Sling API Bundle 2.5.0) to replace
* {@link #getAdministrativeResourceResolver(Map)}
* @see <a
*
href="http://sling.apache.org/documentation/the-sling-engine/service-authentication.html";>Service
@@ -195,7 +195,7 @@ public interface ResourceResolverFactory
*
* @return A {@link ResourceResolver} created from the current thread or
<code>null</code>.
*
- * @since 2.6
+ * @since 2.6 (Sling API Bundle 2.8.0)
*/
ResourceResolver getThreadResourceResolver();
}
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
Fri Feb 13 14:35:04 2015
@@ -184,7 +184,7 @@ public class ResourceUtil {
* @throws IllegalArgumentException If the path cannot be normalized by the
* {@link #normalize(String)} method or if <code>level</code>
< 0.
* @throws NullPointerException If <code>path</code> is <code>null</code>.
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.2.0)
*/
public static String getParent(final String path, final int level) {
if ( level < 0 ) {
@@ -377,7 +377,7 @@ public class ResourceUtil {
*
* @param type The resource type to be converted into a path
* @return The resource type as a path.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static String resourceTypeToPath(final String type) {
return type.replace(':', '/');
@@ -401,7 +401,7 @@ public class ResourceUtil {
* @return the super type of the <code>resourceType</code> or
* <code>null</code> if the resource type does not exists or
returns
* <code>null</code> for its super type.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
* @deprecated Use {@link ResourceResolver#getParentResourceType(String)}
*/
@Deprecated
@@ -420,7 +420,7 @@ public class ResourceUtil {
* @param resource The resource to return the resource super type for.
* @return the super type of the <code>resource</code> or <code>null</code>
* if no super type could be computed.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
* @deprecated Use {@link ResourceResolver#getParentResourceType(Resource)}
*/
@Deprecated
@@ -442,7 +442,7 @@ public class ResourceUtil {
* Otherwise returns the result of calling
* {@link Resource#isResourceType(String)} with the given
* <code>resourceType</code>.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
* @deprecated Use {@link ResourceResolver#isResourceType(Resource,
String)}
*/
@Deprecated
@@ -463,7 +463,7 @@ public class ResourceUtil {
*
* @param iterator A resource iterator.
* @param <T> The adapted type
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static <T> Iterator<T> adaptTo(final Iterator<Resource> iterator,
final Class<T> type) {
@@ -507,7 +507,7 @@ public class ResourceUtil {
* @param resourceType The optional resource type of the final resource to
create
* @param intermediateResourceType THe optional resource type of all
intermediate resources
* @param autoCommit If set to true, a commit is performed after each
resource creation.
- * @since 2.3.0
+ * @since 2.3.0 (Sling API Bundle 2.4.0)
*/
public static Resource getOrCreateResource(
final ResourceResolver resolver,
@@ -536,7 +536,7 @@ public class ResourceUtil {
* @param resourceProperties The optional resource properties of the final
resource to create
* @param intermediateResourceType THe optional resource type of all
intermediate resources
* @param autoCommit If set to true, a commit is performed after each
resource creation.
- * @since 2.3.0
+ * @since 2.3.0 (Sling API Bundle 2.4.0)
*/
public static Resource getOrCreateResource(
final ResourceResolver resolver,
@@ -658,7 +658,7 @@ public class ResourceUtil {
*
* @throws PersistenceException if it can not find unique name for child
resource.
* @throws NullPointerException if <code>parent</code> is null
- * @since 2.5.0
+ * @since 2.5 (Sling API Bundle 2.7.0)
*/
public static String createUniqueChildName(final Resource parent, final
String name)
throws PersistenceException {
@@ -686,7 +686,7 @@ public class ResourceUtil {
* Unwrap the resource and return the wrapped implementation.
* @param rsrc The resource to unwrap
* @return The unwrapped resource
- * @since 2.5
+ * @since 2.5 (Sling API Bundle 2.7.0)
*/
public static Resource unwrap(final Resource rsrc) {
Resource result = rsrc;
@@ -702,7 +702,7 @@ public class ResourceUtil {
* trees are deleted resource by resource starting with the deepest
children first.
* Once all resources have been passed to the batch resource remover, a
final
* commit needs to be called on the resource resolver.
- * @since 2.6
+ * @since 2.6 (Sling API Bundle 2.8.0)
*/
public static class BatchResourceRemover {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
Fri Feb 13 14:35:04 2015
@@ -60,7 +60,7 @@ public class ResourceWrapper implements
* Returns the value of calling <code>getName</code> on the
* {@link #getResource() wrapped resource}.
*
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public String getName() {
return getResource().getName();
@@ -70,7 +70,7 @@ public class ResourceWrapper implements
* Returns the value of calling <code>getParent</code> on the
* {@link #getResource() wrapped resource}.
*
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public Resource getParent() {
return getResource().getParent();
@@ -80,7 +80,7 @@ public class ResourceWrapper implements
* Returns the value of calling <code>getChild</code> on the
* {@link #getResource() wrapped resource}.
*
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public Resource getChild(String relPath) {
return getResource().getChild(relPath);
@@ -90,7 +90,7 @@ public class ResourceWrapper implements
* Returns the value of calling <code>listChildren</code> on the
* {@link #getResource() wrapped resource}.
*
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public Iterator<Resource> listChildren() {
return getResource().listChildren();
@@ -139,7 +139,7 @@ public class ResourceWrapper implements
* Returns the value of calling <code>hasChildren</code> on the
* {@link #getResource() wrapped resource}.
*
- * @since 2.4.4
+ * @since 2.4.4 (Sling API Bundle 2.5.0)
*/
public boolean hasChildren() {
return getResource().hasChildren();
@@ -149,7 +149,7 @@ public class ResourceWrapper implements
* Returns the value of calling <code>isResourceType</code> on the
* {@link #getResource() wrapped resource}.
*
- * @since 2.1.0
+ * @since 2.1.0 (Sling API Bundle 2.1.0)
*/
public boolean isResourceType(final String resourceType) {
return getResource().isResourceType(resourceType);
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java
Fri Feb 13 14:35:04 2015
@@ -24,7 +24,7 @@ package org.apache.sling.api.scripting;
* This class is not intended to be extended or instantiated because it just
* provides constants not intended to be overwritten.
*
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public class SlingScriptConstants {
@@ -33,13 +33,13 @@ public class SlingScriptConstants {
* has been used to resolve the script. This resource resolver can be used
by the
* script engines to further locate scripts (for includes etc.).
* The value is set in the {@link SlingScriptConstants#SLING_SCOPE} of the
script context.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String ATTR_SCRIPT_RESOURCE_RESOLVER =
"org.apache.sling.api.scripting.ScriptResourceResolver";
/**
* The name of the script scope holding the {@link
#ATTR_SCRIPT_RESOURCE_RESOLVER}.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final int SLING_SCOPE = -314;
@@ -51,7 +51,7 @@ public class SlingScriptConstants {
* {@link #PROPERTY_SCRIPT_ENGINE_FACTORY_LANGUAGE_NAME},
* {@link #PROPERTY_SCRIPT_ENGINE_FACTORY_LANGUAGE_VERSION},
* and {@link #PROPERTY_SCRIPT_ENGINE_FACTORY_MIME_TYPES} poperties.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_SCRIPT_ENGINE_FACTORY_ADDED =
"javax/script/ScriptEngineFactory/ADDED";
@@ -63,47 +63,47 @@ public class SlingScriptConstants {
* {@link #PROPERTY_SCRIPT_ENGINE_FACTORY_LANGUAGE_NAME},
* {@link #PROPERTY_SCRIPT_ENGINE_FACTORY_LANGUAGE_VERSION},
* and {@link #PROPERTY_SCRIPT_ENGINE_FACTORY_MIME_TYPES} poperties.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String TOPIC_SCRIPT_ENGINE_FACTORY_REMOVED =
"javax/script/ScriptEngineFactory/REMOVED";
/**
* The event property listing the script engine factory name. The value is
a string.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_SCRIPT_ENGINE_FACTORY_NAME =
"engineName";
/**
* The event property listing the script engine factory name. The value is
a string.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_SCRIPT_ENGINE_FACTORY_VERSION =
"engineVersion";
/**
* The event property listing the script engine factory extensions. The
value is
* a string array.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_SCRIPT_ENGINE_FACTORY_EXTENSIONS =
"extensions";
/**
* The event property listing the script engine factory language. The
value is
* a string.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_SCRIPT_ENGINE_FACTORY_LANGUAGE_NAME =
"languageName";
/**
* The event property listing the script engine factory language version.
The value is
* a string.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_SCRIPT_ENGINE_FACTORY_LANGUAGE_VERSION
= "languageVersion";
/**
* The event property listing the script engine factory mime types. The
value is
* a string array.
- * @since 2.0.6
+ * @since 2.0.6 (Sling API Bundle 2.0.6)
*/
public static final String PROPERTY_SCRIPT_ENGINE_FACTORY_MIME_TYPES =
"mimeTypes";
}
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/ServletResolver.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
Fri Feb 13 14:35:04 2015
@@ -88,7 +88,7 @@ public interface ServletResolver {
* while trying to find an appropriate servlet to handle the
* request or if no servlet could be resolved to handle the
* request.
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
Servlet resolveServlet(Resource resource, String scriptName);
@@ -115,7 +115,7 @@ public interface ServletResolver {
* while trying to find an appropriate servlet to handle the
* request or if no servlet could be resolved to handle the
* request.
- * @since 2.1
+ * @since 2.1 (Sling API Bundle 2.1.0)
*/
Servlet resolveServlet(ResourceResolver resolver, String scriptName);
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java
Fri Feb 13 14:35:04 2015
@@ -33,7 +33,7 @@ import org.apache.sling.api.resource.Val
* In case you would like to avoid duplicating properties on multiple
resources,
* you can use a <code>CompositeValueMap</code> to get a concatenated map of
* properties.
- * @since 2.3
+ * @since 2.3 (Sling API Bundle 2.5.0)
*/
public class CompositeValueMap implements ValueMap {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java
Fri Feb 13 14:35:04 2015
@@ -25,7 +25,7 @@ import org.apache.sling.api.resource.Val
/**
* A value map wrapper which implements deep reading of properties
* based on the resource tree and also supports {@link ModifiableValueMap}.
- * @since 2.5
+ * @since 2.5 (Sling API Bundle 2.7.0)
*/
public class DeepReadModifiableValueMapDecorator
extends DeepReadValueMapDecorator
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java
Fri Feb 13 14:35:04 2015
@@ -25,7 +25,7 @@ import org.apache.sling.api.resource.Val
/**
* A value map wrapper which implements deep reading of properties
* based on the resource tree.
- * @since 2.5
+ * @since 2.5 (Sling API Bundle 2.7.0)
*/
public class DeepReadValueMapDecorator extends ValueMapDecorator {
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java?rev=1659574&r1=1659573&r2=1659574&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java
Fri Feb 13 14:35:04 2015
@@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Mod
* to provide a basic implementation for the additional methods
* of a {@link ModifiableValueMap}.
*
- * @since 2.2
+ * @since 2.2 (Sling API Bundle 2.7.0)
*/
public class ModifiableValueMapDecorator
extends ValueMapDecorator
