Author: pauls
Date: Thu Jul 6 19:57:35 2017
New Revision: 1801101
URL: http://svn.apache.org/viewvc?rev=1801101&view=rev
Log:
Migrate to R6 annotations
Modified:
sling/trunk/launchpad/test-services-war/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java
Modified:
sling/trunk/launchpad/test-services-war/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services-war/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java?rev=1801101&r1=1801100&r2=1801101&view=diff
==============================================================================
---
sling/trunk/launchpad/test-services-war/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java
(original)
+++
sling/trunk/launchpad/test-services-war/src/main/java/org/apache/sling/launchpad/testservices/war/servlets/SelectorServlet.java
Thu Jul 6 19:57:35 2017
@@ -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 {
