Author: rombert Date: Fri May 5 10:27:38 2017 New Revision: 1794003 URL: http://svn.apache.org/viewvc?rev=1794003&view=rev Log: SLING-6800 switch to R6 annotations
Submitted-By: Nicolas Peltier This closes #220 Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1794003&r1=1794002&r2=1794003&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original) +++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Fri May 5 10:27:38 2017 @@ -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> Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java?rev=1794003&r1=1794002&r2=1794003&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java Fri May 5 10:27:38 2017 @@ -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.ContainerP 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 Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java?rev=1794003&r1=1794002&r2=1794003&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java Fri May 5 10:27:38 2017 @@ -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.OutputWrit 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());