You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/07/24 10:17:19 UTC
svn commit: r1753895 - 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: cziegeler
Date: Sun Jul 24 10:17:19 2016
New Revision: 1753895
URL: http://svn.apache.org/viewvc?rev=1753895&view=rev
Log:
Adjust api to parent pom 27
Modified:
sling/trunk/bundles/api/pom.xml
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/adapter/package-info.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/auth/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.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/SlingRequestListener.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.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/ParametrizableResourceProvider.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/ValueMap.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ExternalResourceChangeListener.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/path/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/package-info.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/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/scripting/package-info.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/security/package-info.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/servlets/SlingSafeMethodsServlet.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
sling/trunk/bundles/api/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
Modified: sling/trunk/bundles/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/pom.xml (original)
+++ sling/trunk/bundles/api/pom.xml Sun Jul 24 10:17:19 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>27</version>
<relativePath />
</parent>
@@ -57,26 +57,16 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>3.0.0</version>
- <scope>provided</scope>
</dependency>
<!-- Testing -->
<dependency>
@@ -90,7 +80,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.6</version>
+ <version>2.0.27-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -101,17 +91,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-DocURL>
http://sling.apache.org/site/sling-api.html
</Bundle-DocURL>
- <!-- Require explicit version of the servlet API -->
- <Import-Package>
- javax.servlet.*;version=2.4,*
- </Import-Package>
</instructions>
</configuration>
</plugin>
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -38,7 +38,7 @@ 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;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>SlingHttpServletRequest</code> defines the interface to provide
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -21,17 +21,16 @@ package org.apache.sling.api;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.adapter.Adaptable;
-
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>SlingHttpServletResponse</code> defines the interface to assist a
* servlet in creating and sending a response to the client.
* <p>
- * This interface is currently empty and merely exists to paralell the
+ * This interface is currently empty and merely exists to parallel the
* {@link SlingHttpServletRequest} interface.
* <p>
- * Starting with Sling API 2.0.6, this interface als extends the
+ * Starting with Sling API 2.0.6, this interface also extends the
* {@link Adaptable} interface.
*/
@ProviderType
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -21,7 +21,7 @@ package org.apache.sling.api.adapter;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>Adaptable</code> interface identifies objects which can be adapted
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -21,7 +21,7 @@ package org.apache.sling.api.adapter;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>AdapterFactory</code> interface defines the API for helpers which
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -21,7 +21,7 @@ package org.apache.sling.api.adapter;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>AdapterManager</code> defines the service interface for a manager
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.2.1")
+@Version("2.2.2")
package org.apache.sling.api.adapter;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>Authenticator</code> interface defines the service interface which
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/auth/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("1.0.1")
+@Version("1.0.2")
package org.apache.sling.api.auth;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.3.1")
+@Version("2.3.2")
package org.apache.sling.api;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -25,7 +25,7 @@ import java.io.UnsupportedEncodingExcept
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>RequestParameter</code> class represents a single parameter sent
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -21,7 +21,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.Resource;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Sling breaks the request URI into four parts: the path itself, optional
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -24,7 +24,7 @@ import java.util.Iterator;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>RequestProgressTracker</code> class provides the functionality to
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -19,7 +19,7 @@
package org.apache.sling.api.request;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Implementations of this service interface receive notifications about
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.4.1")
+@Version("2.4.2")
package org.apache.sling.api.request;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -20,7 +20,7 @@ package org.apache.sling.api.resource;
import java.util.Collection;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The attributes provider is an extensions of a {@link 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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api.resource;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* A dynamic resource provider is an extension of a resource provider which
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api.resource;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>ModifiableValueMap</code> is an extension
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -20,7 +20,7 @@ package org.apache.sling.api.resource;
import java.util.Map;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* A modifying resource provider is an extension of a resource provider which
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java Sun Jul 24 10:17:19 2016
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* This extension allows resource provider implementations to support
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -20,7 +20,7 @@ package org.apache.sling.api.resource;
import java.util.Iterator;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api.resource;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.adapter.Adaptable;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Resources are pieces of content on which Sling acts
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -20,7 +20,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Optional service to decorate {@link Resource}s returned by
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.sling.api.SlingException;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* API for providers of resources. Used by the {@link ResourceResolver} to
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -22,7 +22,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>ResourceProviderFactory</code> defines the service API to get and
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.sling.api.adapter.Adaptable;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>ResourceResolver</code> defines the service API which may be used
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>ResourceResolverFactory</code> defines the service API to get and
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -26,7 +26,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.wrappers.ValueMapDecorator;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>ValueMap</code> is an easy way to access properties of a resource.
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ExternalResourceChangeListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ExternalResourceChangeListener.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ExternalResourceChangeListener.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ExternalResourceChangeListener.java Sun Jul 24 10:17:19 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api.resource.observation;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* This is a marker interface to receive external events.
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java Sun Jul 24 10:17:19 2016
@@ -23,7 +23,7 @@ import java.util.Set;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* A resource change event is immutable.
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java Sun Jul 24 10:17:19 2016
@@ -22,7 +22,7 @@ import java.util.List;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Listener for resource change events.
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/observation/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.sling.api.resource.observation;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.9.1")
+@Version("2.9.2")
package org.apache.sling.api.resource;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/path/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/path/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/path/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/path/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.sling.api.resource.path;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java Sun Jul 24 10:17:19 2016
@@ -20,7 +20,7 @@ package org.apache.sling.api.resource.ru
import org.apache.sling.api.resource.runtime.dto.RuntimeDTO;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Runtime service providing introspection of the state of the resource resolver
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java Sun Jul 24 10:17:19 2016
@@ -20,5 +20,5 @@
@Version("1.0.0")
package org.apache.sling.api.resource.runtime.dto;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/runtime/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.sling.api.resource.runtime;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.Resource;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>SlingScript</code> defines the API for objects which encapsulate
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -26,7 +26,7 @@ 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;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>SlingScriptHelper</code> interface defines the API of a helper
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -21,7 +21,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.ResourceResolver;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>ScriptResolver</code> interface defines the API for a service
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.3.0")
+@Version("2.3.1")
package org.apache.sling.api.scripting;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>ResourceAccessSecurity</code> defines a service API which is
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("1.0.1")
+@Version("1.0.2")
package org.apache.sling.api.security;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -23,7 +23,7 @@ import javax.servlet.Servlet;
import org.apache.sling.api.SlingHttpServletRequest;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>OptingServlet</code> interface may be implemented by
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=1753895&r1=1753894&r2=1753895&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 Sun Jul 24 10:17:19 2016
@@ -26,7 +26,7 @@ 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;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>ServletResolver</code> defines the API for a service capable of
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java Sun Jul 24 10:17:19 2016
@@ -32,6 +32,7 @@ import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
@@ -367,6 +368,7 @@ public class SlingSafeMethodsServlet ext
* {@link #service(SlingHttpServletRequest, SlingHttpServletResponse)}
* called.
*/
+ @Override
public void service(@Nonnull ServletRequest req, @Nonnull ServletResponse res)
throws ServletException, IOException {
@@ -387,6 +389,7 @@ public class SlingSafeMethodsServlet ext
* Returns the simple class name of this servlet class. Extensions of this
* class may overwrite to return more specific information.
*/
+ @Override
public @Nonnull String getServletInfo() {
return getClass().getSimpleName();
}
@@ -507,6 +510,7 @@ public class SlingSafeMethodsServlet ext
* Overwrite this to prevent setting the content length at the end of
* the request through {@link #setContentLength()}
*/
+ @Override
public void setContentLength(int len) {
super.setContentLength(len);
didSetContentLength = true;
@@ -516,6 +520,7 @@ public class SlingSafeMethodsServlet ext
* Just return the null output stream and don't check whether a writer
* has already been acquired.
*/
+ @Override
public ServletOutputStream getOutputStream() {
return noBody;
}
@@ -524,6 +529,7 @@ public class SlingSafeMethodsServlet ext
* Just return the writer to the null output stream and don't check
* whether an output stram has already been acquired.
*/
+ @Override
public PrintWriter getWriter() throws UnsupportedEncodingException {
if (writer == null) {
OutputStreamWriter w;
@@ -550,10 +556,12 @@ public class SlingSafeMethodsServlet ext
return contentLength;
}
+ @Override
public void write(int b) {
contentLength++;
}
+ @Override
public void write(byte buf[], int offset, int len) {
if (len >= 0) {
contentLength += len;
@@ -561,6 +569,16 @@ public class SlingSafeMethodsServlet ext
throw new IndexOutOfBoundsException();
}
}
+
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ // nothing to do
+ }
}
}
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/servlets/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.1.2")
+@Version("2.1.3")
package org.apache.sling.api.servlets;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.5")
+@Version("2.5.0")
package org.apache.sling.api.wrappers;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java Sun Jul 24 10:17:19 2016
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.observation.ResourceChange;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A {@code ResourceProvider} must use an observation reporter
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java Sun Jul 24 10:17:19 2016
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.path.PathSet;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A observer configuration describes active configurations from registered listeners.
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java Sun Jul 24 10:17:19 2016
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.path.PathSet;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The provider context...
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java Sun Jul 24 10:17:19 2016
@@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java Sun Jul 24 10:17:19 2016
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.ResourceResolver;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The resolve context is passed to most of the methods of the {@link ResourceProvider}
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java Sun Jul 24 10:17:19 2016
@@ -22,7 +22,7 @@ import java.util.Map;
import javax.annotation.CheckForNull;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The resource context provides additional information for resource resolving.
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java Sun Jul 24 10:17:19 2016
@@ -34,7 +34,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.SyntheticResource;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* API for providers of resources. Used by the {@link ResourceResolver} to
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/package-info.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/package-info.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/package-info.java Sun Jul 24 10:17:19 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("1.0.1")
+@Version("1.0.2")
package org.apache.sling.spi.resource.provider;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/api/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/test/java/org/apache/sling/api/request/RequestUtilTest.java?rev=1753895&r1=1753894&r2=1753895&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/test/java/org/apache/sling/api/request/RequestUtilTest.java (original)
+++ sling/trunk/bundles/api/src/test/java/org/apache/sling/api/request/RequestUtilTest.java Sun Jul 24 10:17:19 2016
@@ -20,6 +20,7 @@ package org.apache.sling.api.request;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Collection;
import java.util.Locale;
import javax.servlet.ServletOutputStream;
@@ -194,6 +195,36 @@ public class RequestUtilTest extends Tes
@Override
public void addCookie(Cookie cookie) {}
+
+ @Override
+ public void setContentLengthLong(long len) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public int getStatus() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public String getHeader(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Collection<String> getHeaders(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Collection<String> getHeaderNames() {
+ // TODO Auto-generated method stub
+ return null;
+ }
};
}