[sling-org-apache-sling-launchpad-test-services-war] 44/46: Migrate to R6 annotations

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-test-services-war.git

commit 6fdf97df4d584fbc8576b1ebdbcabdfe36b81561
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Thu Jul 6 19:57:35 2017 +0000

    Migrate to R6 annotations
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1801101 13f79535-47bb-0310-9956-ffa450edef68
---
 .../testservices/war/servlets/SelectorServlet.java  | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java b/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java
index 2cf0792..efe92ca 100644
--- a/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java
+++ b/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java
@@ -18,20 +18,17 @@
  */
 package org.apache.sling.launchpad.testservices.war.servlets;
 
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 /** Example/test Sling Servlet registered with two selectors */
-@Component(immediate=true, metatype=false)
-@Service(value=javax.servlet.Servlet.class)
-@Properties({
-    @Property(name="service.description", value="Selector Test Servlet"),
-    @Property(name="service.vendor", value="The Apache Software Foundation"),
-    @Property(name="sling.servlet.resourceTypes", value="sling/servlet/default"),
-    @Property(name="sling.servlet.selectors", value={"WAR_TEST_SEL_1","WAR_TEST_SEL_2"}),
-    @Property(name="sling.servlet.extensions", value="txt")
+@Component(immediate=true, service = javax.servlet.Servlet.class,
+property = {
+    "service.description=Selector Test Servlet",
+    "service.vendor=The Apache Software Foundation",
+    "sling.servlet.resourceTypes=sling/servlet/default",
+    "sling.servlet.selectors=WAR_TEST_SEL_1",
+    "sling.servlet.selectors=WAR_TEST_SEL_2",
+    "sling.servlet.extensions=txt"
 })
 @SuppressWarnings("serial")
 public class SelectorServlet extends TestServlet {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.