You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2013/08/23 17:12:10 UTC
svn commit: r1516877 - in /sling/trunk/bundles/api: ./
src/main/java/org/apache/sling/api/
src/main/java/org/apache/sling/api/adapter/
src/main/java/org/apache/sling/api/auth/
src/main/java/org/apache/sling/api/request/
src/main/java/org/apache/sling/a...
Author: fmeschbe
Date: Fri Aug 23 15:12:08 2013
New Revision: 1516877
URL: http://svn.apache.org/r1516877
Log:
SLING-2993 Add @ConsumerType and @ProviderType annotations as appropriate
- Update to latest BND library dependencies and bundle plugin
- Mark classes (constant and utility classes) not intended to be
subclassed with JavaDoc.
Modified:
sling/trunk/bundles/api/pom.xml
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/SlingHttpServletResponse.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/Adaptable.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterManager.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/Authenticator.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/RequestParameterMap.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/RequestProgressTracker.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/request/SlingRequestListener.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/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/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/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/ValueMap.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.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/scripting/SlingScriptHelper.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/HttpConstants.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/OptingServlet.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/SlingRequestPaths.java
Modified: sling/trunk/bundles/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/pom.xml (original)
+++ sling/trunk/bundles/api/pom.xml Fri Aug 23 15:12:08 2013
@@ -65,9 +65,9 @@
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
- <version>1.50.0</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -23,6 +23,9 @@ package org.apache.sling.api;
* for well known constant strings in Sling. Even though these constants will
* never change, it is recommended that applications refer to the symbolic
* constants instead of code the strings themselves.
+ * <p>
+ * This class is not intended to be extended or instantiated because it just
+ * provides constants not intended to be overwritten.
*/
public class SlingConstants {
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -35,6 +35,8 @@ import org.apache.sling.api.request.Requ
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>SlingHttpServletRequest</code> defines the interface to provide
* client request information to a servlet.
@@ -57,11 +59,12 @@ import org.apache.sling.api.resource.Res
* Starting with Sling API 2.0.6, this interface als extends the
* {@link Adaptable} interface.
*/
+@ProviderType
public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
/**
* Returns the {@link Resource} object on whose behalf the servlet acts.
- *
+ *
* @return The <code>Resource</code> object of this request.
*/
Resource getResource();
@@ -69,14 +72,14 @@ public interface SlingHttpServletRequest
/**
* Returns the {@link ResourceResolver} which resolved the
* {@link #getResource() resource} of this request.
- *
+ *
* @return The resource resolver
*/
ResourceResolver getResourceResolver();
/**
* Returns the {@link RequestPathInfo} pertaining to this request.
- *
+ *
* @return the request path info.
*/
RequestPathInfo getRequestPathInfo();
@@ -95,7 +98,7 @@ public interface SlingHttpServletRequest
* <p>
* This method is a shortcut for
* <code>getRequestParameterMap().getValue(String)</code>.
- *
+ *
* @param name a <code>String</code> specifying the name of the parameter
* @return a {@link RequestParameter} representing the single value of the
* parameter
@@ -114,7 +117,7 @@ public interface SlingHttpServletRequest
* <p>
* This method is a shortcut for
* <code>getRequestParameterMap().getValues(String)</code>.
- *
+ *
* @param name a <code>String</code> containing the name of the parameter
* the value of which is requested
* @return an array of {@link RequestParameter} objects containing the
@@ -132,7 +135,7 @@ public interface SlingHttpServletRequest
* {@link RequestParameter} array (<code>RequestParameter[]</code>).
* <p>
* If no parameters exist this method returns an empty <code>Map</code>.
- *
+ *
* @return an immutable <code>Map</code> containing parameter names as
* keys and parameter values as map values, or an empty
* <code>Map</code> if no parameters exist. The keys in the
@@ -149,7 +152,7 @@ public interface SlingHttpServletRequest
* <p>
* Returns <code>null</code> if a <code>RequestDispatcher</code> cannot
* be returned for any reason.
- *
+ *
* @param path a <code>String</code> specifying the pathname to the
* resource. If it is relative, it must be relative against the
* current servlet.
@@ -169,7 +172,7 @@ public interface SlingHttpServletRequest
* <p>
* Returns <code>null</code> if a <code>RequestDispatcher</code> cannot
* be returned for any reason.
- *
+ *
* @param resource The {@link Resource} instance whose response content may
* be included by the returned dispatcher.
* @param options influence the rendering of the included Resource
@@ -189,7 +192,7 @@ public interface SlingHttpServletRequest
/**
* Returns the named cookie from the HTTP request or <code>null</code> if
* no such cookie exists in the request.
- *
+ *
* @param name The name of the cookie to return.
* @return The named cookie or <code>null</code> if no such cookie exists.
*/
@@ -202,7 +205,7 @@ public interface SlingHttpServletRequest
* For included resources this method will returned the same string as
* returned by the <code>ServletResponse.getContentType()</code> without
* the character set.
- *
+ *
* @return preferred MIME type of the response
*/
String getResponseContentType();
@@ -217,14 +220,14 @@ public interface SlingHttpServletRequest
* containing a single entry which is the same string as returned by the
* <code>ServletResponse.getContentType()</code> without the character
* set.
- *
+ *
* @return ordered list of MIME types for the response
*/
Enumeration<String> getResponseContentTypes();
/**
* Returns the resource bundle for the given locale.
- *
+ *
* @param locale the locale for which to retrieve the resource bundle. If
* this is <code>null</code>, the locale returned by
* {@link #getLocale()} is used to select the resource bundle.
@@ -234,7 +237,7 @@ public interface SlingHttpServletRequest
/**
* Returns the resource bundle of the given base name for the given locale.
- *
+ *
* @param baseName The base name of the resource bundle to returned. If this
* parameter is <code>null</code>, the same resource bundle
* must be returned as if the {@link #getResourceBundle(Locale)}
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java Fri Aug 23 15:12:08 2013
@@ -22,6 +22,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.sling.api.adapter.Adaptable;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>SlingHttpServletResponse</code> defines the interface to assist a
* servlet in creating and sending a response to the client.
@@ -32,6 +34,7 @@ import org.apache.sling.api.adapter.Adap
* Starting with Sling API 2.0.6, this interface als extends the
* {@link Adaptable} interface.
*/
+@ProviderType
public interface SlingHttpServletResponse extends HttpServletResponse,
Adaptable {
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/Adaptable.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/Adaptable.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/Adaptable.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/Adaptable.java Fri Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.adapter;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>Adaptable</code> interface identifies objects which can be adapted
* to other types or representations of the same object. For example a JCR Node
@@ -25,6 +27,7 @@ package org.apache.sling.api.adapter;
* underlying JCR Node or a file based resource could adapt to the underlying
* <code>java.io.File</code>.
*/
+@ConsumerType
public interface Adaptable {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java Fri Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.adapter;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>AdapterFactory</code> interface defines the API for helpers which
* may be provided to enhance the adaptability of adaptable objects.
@@ -33,6 +35,7 @@ package org.apache.sling.api.adapter;
* registration properties {@link #ADAPTABLE_CLASSES} and
* {@link #ADAPTER_CLASSES}.
*/
+@ConsumerType
public interface AdapterFactory {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterManager.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterManager.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterManager.java Fri Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.adapter;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>AdapterManager</code> defines the service interface for a manager
* for object adaption. The adapter manager coordinates the registered
@@ -31,6 +33,7 @@ package org.apache.sling.api.adapter;
* <p>
* This interface is not intended to be implemented by clients.
*/
+@ProviderType
public interface AdapterManager {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/Authenticator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/Authenticator.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/Authenticator.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/Authenticator.java Fri Aug 23 15:12:08 2013
@@ -21,6 +21,8 @@ package org.apache.sling.api.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>Authenticator</code> interface defines the service interface which
* may be used by applications to enforce requests to be authenticated (see
@@ -66,6 +68,7 @@ import javax.servlet.http.HttpServletRes
*
* @since 1.0 (Sling API Bundle 2.1.0)
*/
+@ProviderType
public interface Authenticator {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>RequestParameter</code> class represents a single parameter sent
* with the client request. Instances of this class are returned by the
@@ -33,6 +35,7 @@ import java.io.UnsupportedEncodingExcept
* @see org.apache.sling.api.SlingHttpServletRequest#getRequestParameters(String)
* @see org.apache.sling.api.SlingHttpServletRequest#getRequestParameterMap()
*/
+@ProviderType
public interface RequestParameter {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameterMap.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameterMap.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameterMap.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameterMap.java Fri Aug 23 15:12:08 2013
@@ -20,11 +20,14 @@ package org.apache.sling.api.request;
import java.util.Map;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>RequestParameterMap</code> encapsulates all request parameters of
* a request.
*/
+@ProviderType
public interface RequestParameterMap extends Map<String, RequestParameter[]> {
/** Returns all values for the named parameter or null if none
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@ package org.apache.sling.api.request;
import org.apache.sling.api.resource.Resource;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Sling breaks the request URI into four parts: the path itself, optional
* dot-separated selectors and extension that follow it, and an optional path
@@ -145,6 +147,7 @@ import org.apache.sling.api.resource.Res
* </tr>
* </table>
*/
+@ProviderType
public interface RequestPathInfo {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java Fri Aug 23 15:12:08 2013
@@ -21,6 +21,8 @@ package org.apache.sling.api.request;
import java.io.PrintWriter;
import java.util.Iterator;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>RequestProgressTracker</code> class provides the functionality to
* track the progress of request processing. Instances of this class are
@@ -77,6 +79,7 @@ import java.util.Iterator;
* iterator of messages through the {@link #getMessages()} method. The
* formatting of the tracking entries is implementation specific.
*/
+@ProviderType
public interface RequestProgressTracker {
/** Creates an entry with the given message */
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -29,6 +29,11 @@ import org.apache.sling.api.servlets.Htt
import org.apache.sling.api.SlingHttpServletRequest;
/**
+ * Request related utility methods.
+ * <p>
+ * 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
*/
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -22,7 +22,11 @@ import java.io.IOException;
import java.io.Writer;
/**
- * Response-related utilities
+ * Response related utility methods
+ * <p>
+ * 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
*/
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -25,6 +25,8 @@ import javax.servlet.ServletRequest;
/**
* represents an event published by the Sling engine while
* dispatching a request.
+ * <p>
+ * This class is not intended to be extended or instantiated by clients.
*
* @see org.apache.sling.api.request.SlingRequestListener
* @since 2.1.0
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestListener.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestListener.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/SlingRequestListener.java Fri Aug 23 15:12:08 2013
@@ -19,6 +19,8 @@
package org.apache.sling.api.request;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Implementations of this service interface receive notifications about
* changes to Sling request of the Sling application they are part of.
@@ -26,6 +28,7 @@ package org.apache.sling.api.request;
* registered as an OSGi service with the service name
* org.apache.sling.api.request.SlingRequestListener.
*/
+@ConsumerType
public interface SlingRequestListener {
String SERVICE_NAME = "org.apache.sling.api.request.SlingRequestListener";
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -20,6 +20,8 @@ package org.apache.sling.api.resource;
import java.util.Collection;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The attributes provider is an extensions of a {@link ResourceProvider}.
* It allows to add attributes to the set of available attributes from a
@@ -34,6 +36,7 @@ import java.util.Collection;
*
* @since 2.2
*/
+@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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.resource;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* A dynamic resource provider is an extension of a resource provider which
* is only supported if the resource provider has been created through
@@ -37,6 +39,7 @@ package org.apache.sling.api.resource;
*
* @since 2.2
*/
+@ConsumerType
public interface DynamicResourceProvider extends ResourceProvider {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.resource;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>ModifiableValueMap</code> is an extension
* of the {@link ValueMap} which allows to modify and
@@ -55,6 +57,7 @@ package org.apache.sling.api.resource;
*
* @since 2.2
*/
+@ConsumerType
public interface ModifiableValueMap extends ValueMap {
// just a marker
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -20,6 +20,8 @@ package org.apache.sling.api.resource;
import java.util.Map;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* A modifying resource provider is an extension of a resource provider which
* is only supported if the resource provider has been created through
@@ -41,6 +43,7 @@ import java.util.Map;
*
* @since 2.2.0
*/
+@ConsumerType
public interface ModifyingResourceProvider extends ResourceProvider {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -20,6 +20,8 @@ package org.apache.sling.api.resource;
import java.util.Iterator;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* A queriable resource provider is an extension of a resource provider.
@@ -30,6 +32,7 @@ import java.util.Iterator;
*
* @since 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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.resource;
+import aQute.bnd.annotation.ConsumerType;
+
/**
@@ -34,6 +36,7 @@ package org.apache.sling.api.resource;
*
* @since 2.3.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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -20,6 +20,8 @@ import java.util.Iterator;
import org.apache.sling.api.adapter.Adaptable;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Resources are pieces of content on which Sling acts
* <p>
@@ -33,6 +35,7 @@ import org.apache.sling.api.adapter.Adap
* suffering from missing method problems should the Sling Resource API be
* extended in the future.
*/
+@ProviderType
public interface Resource extends Adaptable {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -18,6 +18,8 @@ package org.apache.sling.api.resource;
import javax.servlet.http.HttpServletRequest;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Optional service to decorate {@link Resource}s returned by
* the {@link ResourceResolver}.
@@ -28,6 +30,7 @@ import javax.servlet.http.HttpServletReq
*
* @since 2.1
*/
+@ConsumerType
public interface ResourceDecorator {
/**
@@ -52,7 +55,7 @@ public interface ResourceDecorator {
* @param resource The resource to decorate
* @param request The current request.
* @return The decorated resource, the original resource or null.
- *
+ *
* @deprecated since 2.3.0 (and JCR Resource 2.1.0), this method will not be invoked.
*/
@Deprecated
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -24,6 +24,8 @@ import javax.servlet.http.HttpServletReq
import org.apache.sling.api.SlingException;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* API for providers of resources. Used by the {@link ResourceResolver} to
* transparently access resources from different locations such as a JCR
@@ -38,6 +40,7 @@ import org.apache.sling.api.SlingExcepti
* upon successful authentication returns a resource provider with the
* given user credentials.
*/
+@ConsumerType
public interface ResourceProvider {
/**
@@ -67,10 +70,10 @@ public interface ResourceProvider {
/**
* The name of the service registration property containing the a boolean
* flag indicating if the ResourceAccessSecurity service should be used for
- * this provider or not. ResourceProvider implementations are encouraged
+ * this provider or not. ResourceProvider implementations are encouraged
* to use the ResourceAccessSecurity service for access control unless
* the underlying storage already provides it.
- * The default for this value is <code>false</code>.
+ * The default for this value is <code>false</code>.
* (value is "provider.useResourceAccessSecurity")
*/
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -20,6 +20,8 @@ package org.apache.sling.api.resource;
import java.util.Map;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>ResourceProviderFactory</code> defines the service API to get and
* create <code>ResourceProviders</code>s dynamically on a per usage base.
@@ -32,6 +34,7 @@ import java.util.Map;
*
* @since 2.2.0
*/
+@ConsumerType
public interface ResourceProviderFactory {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -25,6 +25,8 @@ import javax.servlet.http.HttpServletReq
import org.apache.sling.api.adapter.Adaptable;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>ResourceResolver</code> defines the service API which may be used
* to resolve {@link Resource} objects. The resource resolver is available to
@@ -94,6 +96,7 @@ import org.apache.sling.api.adapter.Adap
* sensitive properties like {@link ResourceResolverFactory#PASSWORD} which is
* not exposed.
*/
+@ProviderType
public interface ResourceResolver extends Adaptable {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -20,6 +20,8 @@ package org.apache.sling.api.resource;
import java.util.Map;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>ResourceResolverFactory</code> defines the service API to get and
* create <code>ResourceResolver</code>s.
@@ -29,6 +31,7 @@ import java.util.Map;
*
* @since 2.1
*/
+@ProviderType
public interface ResourceResolverFactory {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -29,6 +29,9 @@ import org.apache.sling.api.wrappers.Val
/**
* The <code>ResourceUtil</code> class provides helper methods dealing with
* resources.
+ * <p>
+ * This class is not intended to be extended or instantiated because it just
+ * provides static utility methods not intended to be overwritten.
*/
public class ResourceUtil {
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ValueMap.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ValueMap.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ValueMap.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ValueMap.java Fri Aug 23 15:12:08 2013
@@ -23,12 +23,15 @@ import java.util.Map;
import org.apache.sling.api.wrappers.ValueMapDecorator;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>ValueMap</code> is an easy way to access properties of a resource.
* With most resources you can use {@link Resource#adaptTo(Class)} to adapt the
* resource to a value map. The various getter methods can be used to get the
* properties of the resource.
*/
+@ConsumerType
public interface ValueMap extends Map<String, Object> {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java Fri Aug 23 15:12:08 2013
@@ -20,6 +20,8 @@ package org.apache.sling.api.scripting;
import org.apache.sling.api.resource.Resource;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>SlingScript</code> defines the API for objects which encapsulate
* a script. To evaluate a script prepare a {@link SlingBindings} instance of
@@ -31,6 +33,7 @@ import org.apache.sling.api.resource.Res
* and then trying to adapt the resource to a script by
* calling {@link Resource#adaptTo(Class)}.
*/
+@ConsumerType
public interface SlingScript {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -20,9 +20,13 @@ package org.apache.sling.api.scripting;
/**
* Some constants for the scripting.
+ * <p>
+ * This class is not intended to be extended or instantiated because it just
+ * provides constants not intended to be overwritten.
+ *
* @since 2.0.6
*/
-public abstract class SlingScriptConstants {
+public class SlingScriptConstants {
/**
* The name of the script context attribute holding the {@link org.apache.sling.api.resource.ResourceResolver} which
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java Fri Aug 23 15:12:08 2013
@@ -23,11 +23,14 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>SlingScriptHelper</code> interface defines the API of a helper
* class which is provided to the scripts called from sling through the global
* <code>{@link SlingBindings#SLING sling}</code> variable.
*/
+@ProviderType
public interface SlingScriptHelper {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java Fri Aug 23 15:12:08 2013
@@ -18,15 +18,18 @@ package org.apache.sling.api.scripting;
import org.apache.sling.api.resource.ResourceResolver;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>ScriptResolver</code> interface defines the API for a service
* capable of locating scripts. Where the script is actually located is an
* implementation detail of the service implementation.
- *
- * @deprecated The SlingScriptResolver interface is intended to be implemented
- * and also used by project specific code. To keep the API as clean as possible
+ *
+ * @deprecated The SlingScriptResolver interface is intended to be implemented
+ * and also used by project specific code. To keep the API as clean as possible
* this interface was deprecated
*/
+@ProviderType
public interface SlingScriptResolver {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java Fri Aug 23 15:12:08 2013
@@ -21,6 +21,8 @@ package org.apache.sling.api.security;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>ResourceAccessSecurity</code> defines a service API which might be
* used in implementations of resource providers where the underlying
@@ -36,6 +38,7 @@ import org.apache.sling.api.resource.Res
* fully delegated to the underlying repository, and mixing security models would
* be a bad idea.
*/
+@ProviderType
public interface ResourceAccessSecurity {
/** If supplied Resource can be read, return it (or a wrapped
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/HttpConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/HttpConstants.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/HttpConstants.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/HttpConstants.java Fri Aug 23 15:12:08 2013
@@ -16,7 +16,12 @@
*/
package org.apache.sling.api.servlets;
-/** HTTP-related constants */
+/**
+ * HTTP-related constants
+ * <p>
+ * This class is not intended to be extended or instantiated because it just
+ * provides constants not intended to be overwritten.
+ */
public class HttpConstants {
public static final String METHOD_OPTIONS = "OPTIONS";
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/OptingServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/OptingServlet.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/OptingServlet.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/OptingServlet.java Fri Aug 23 15:12:08 2013
@@ -22,12 +22,15 @@ import javax.servlet.Servlet;
import org.apache.sling.api.SlingHttpServletRequest;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>OptingServlet</code> interface may be implemented by
* <code>Servlets</code> used by Sling which may choose to not handle all
* requests for which they would be selected based on their registration
* properties.
*/
+@ConsumerType
public interface OptingServlet extends Servlet {
/**
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=1516877&r1=1516876&r2=1516877&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 Aug 23 15:12:08 2013
@@ -24,6 +24,8 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The <code>ServletResolver</code> defines the API for a service capable of
* resolving <code>javax.servlet.Servlet</code> instances to handle the
@@ -34,6 +36,7 @@ import org.apache.sling.api.resource.Res
* through a <code>RequestDispatcher</code> is handled by the Sling Framework.
* <p>
*/
+@ProviderType
public interface ServletResolver {
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java?rev=1516877&r1=1516876&r2=1516877&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java Fri Aug 23 15:12:08 2013
@@ -23,10 +23,13 @@ import javax.servlet.http.HttpServletReq
/**
* This class is not a "wrapper" per se, but computes the correct path info,
* request URI, etc. for included requests. When including a request via
- * {@link javax.servlet.RequestDispatcher}, the Servlet API specifies that target paths of
- * the included request are available as request attributes.
- * Request.getPathInfo(), for example will return the value for the including
- * request, *not* for the included one.
+ * {@link javax.servlet.RequestDispatcher}, the Servlet API specifies that
+ * target paths of the included request are available as request attributes.
+ * {@code Request.getPathInfo()}, for example will return the value for the
+ * including request, *not* for the included one.
+ * <p>
+ * This class is not intended to be extended or instantiated because it just
+ * provides constants and static utility methods not intended to be overwritten.
*/
public class SlingRequestPaths {