This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.pipes-1.0.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git
commit 5279c85b8700c0dc839b5a6d2e1b39a814112f75
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Fri May 5 10:27:38 2017 +0000
SLING-6800 switch to R6 annotations
Submitted-By: Nicolas Peltier
This closes #220
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-pipes@1794003
13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 12 +---------
.../apache/sling/pipes/internal/PlumberImpl.java | 16 ++++++-------
.../sling/pipes/internal/PlumberServlet.java | 27 ++++++++++++++--------
3 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 967c219..71c6d37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -96,7 +92,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.9.0</version>
+ <version>2.16.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -106,12 +102,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.8</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.query</artifactId>
<version>3.0.0</version>
diff --git a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
index d924768..87645b0 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
@@ -23,12 +23,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
@@ -42,6 +36,11 @@ import org.apache.sling.pipes.ContainerPipe;
import org.apache.sling.pipes.Pipe;
import org.apache.sling.pipes.Plumber;
import org.apache.sling.pipes.ReferencePipe;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,14 +48,13 @@ import org.slf4j.LoggerFactory;
/**
* implements plumber interface, and registers default pipes
*/
-@Component
-@Service
+@Component(service = {Plumber.class})
public class PlumberImpl implements Plumber {
private final Logger log = LoggerFactory.getLogger(this.getClass());
Map<String, Class<? extends BasePipe>> registry;
- @Reference(policy= ReferencePolicy.DYNAMIC, cardinality=
ReferenceCardinality.OPTIONAL_UNARY)
+ @Reference(policy= ReferencePolicy.DYNAMIC, cardinality=
ReferenceCardinality.OPTIONAL)
protected volatile Distributor distributor = null;
@Activate
diff --git a/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
b/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
index 3322421..a62f028 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
@@ -21,16 +21,18 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.sling.SlingServlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
+import org.apache.sling.api.servlets.ServletResolverConstants;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.pipes.BasePipe;
@@ -39,6 +41,9 @@ import org.apache.sling.pipes.OutputWriter;
import org.apache.sling.pipes.Pipe;
import org.apache.sling.pipes.PipeBindings;
import org.apache.sling.pipes.Plumber;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,13 +52,17 @@ import org.slf4j.LoggerFactory;
* it can also be launched against a container pipe resource directly (no need
for path parameter)
*
*/
-@SlingServlet(resourceTypes = {Plumber.RESOURCE_TYPE,
- ContainerPipe.RESOURCE_TYPE,
- AuthorizablePipe.RESOURCE_TYPE,
- WritePipe.RESOURCE_TYPE,
- SlingQueryPipe.RESOURCE_TYPE},
- methods={"GET","POST"},
- extensions = {"json"})
+@Component(service = {Servlet.class},
+ property= {
+ ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES + "=" +
Plumber.RESOURCE_TYPE,
+ ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES + "=" +
ContainerPipe.RESOURCE_TYPE,
+ ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES + "=" +
AuthorizablePipe.RESOURCE_TYPE,
+ ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES + "=" +
WritePipe.RESOURCE_TYPE,
+ ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES + "=" +
SlingQueryPipe.RESOURCE_TYPE,
+ ServletResolverConstants.SLING_SERVLET_METHODS + "=GET",
+ ServletResolverConstants.SLING_SERVLET_METHODS + "=POST",
+ ServletResolverConstants.SLING_SERVLET_EXTENSIONS + "=json"
+ })
public class PlumberServlet extends SlingAllMethodsServlet {
Logger log = LoggerFactory.getLogger(this.getClass());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
