This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2 in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit ad699d72e2b872edee112e958e42e1ec0f0cdc31 Author: Justin Edelson <[email protected]> AuthorDate: Fri Jul 15 20:24:07 2011 +0000 SLING-2145 - switching to use @SlingServlet git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1147307 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/ByPathServlet.java | 26 +++++++++++-------- .../src/main/java/ByResourceTypeServlet.java | 30 +++++++++++++--------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java b/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java index a737ed9..8ab1c12 100644 --- a/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java +++ b/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java @@ -21,15 +21,11 @@ package ${package}; import java.io.IOException; import java.io.Writer; -import javax.servlet.Servlet; import javax.servlet.ServletException; -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.Reference; -import org.apache.felix.scr.annotations.Service; - +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.servlets.SlingSafeMethodsServlet; @@ -38,13 +34,23 @@ import org.slf4j.LoggerFactory; /** * Hello World Servlet registered by path + * + * Annotations below are short version of: + * + * @Component + * @Service(Servlet.class) + * @Properties({ + * @Property(name="service.description", value="Hello World Path Servlet"), + * @Property(name="service.vendor", value="The Apache Software Foundation"), + * @Property(name="sling.servlet.paths", value="/hello-world-servlet") + * }) */ -@Component -@Service(Servlet.class) -@Properties({ @Property(name="service.description", value="Hello World Path Servlet"), - @Property(name="service.vendor", value="The Apache Software Foundation"), - @Property(name="sling.servlet.paths", value="/hello-world-servlet") +@SlingServlet(paths="/hello-world-servlet") +@Properties({ + @Property(name="service.description", value="Hello World Path Servlet"), + @Property(name="service.vendor", value="The Apache Software Foundation") }) +@SuppressWarnings("serial") public class ByPathServlet extends SlingSafeMethodsServlet { private final Logger log = LoggerFactory.getLogger(ByPathServlet.class); diff --git a/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java b/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java index 1ee9ff4..f87823f 100644 --- a/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java +++ b/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java @@ -21,15 +21,11 @@ package ${package}; import java.io.IOException; import java.io.Writer; -import javax.servlet.Servlet; import javax.servlet.ServletException; -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.Reference; -import org.apache.felix.scr.annotations.Service; - +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; @@ -39,15 +35,25 @@ import org.slf4j.LoggerFactory; /** * Hello World Servlet registered by resource type + * + * Annotations below are short version of: + * + * @Component + * @Service(Servlet.class) + * @Properties({ + * @Property(name="service.description", value="Hello World Type 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="hello"), + * @Property(name="sling.servlet.extensions", value="html") + * }) */ -@Component -@Service(Servlet.class) -@Properties({ @Property(name="service.description", value="Hello World Type 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 = "hello"), - @Property(name = "sling.servlet.extensions", value = "html") +@SlingServlet(resourceTypes="sling/servlet/default", selectors="hello", extensions="html") +@Properties({ + @Property(name="service.description", value="Hello World Type Servlet"), + @Property(name="service.vendor", value="The Apache Software Foundation") }) +@SuppressWarnings("serial") public class ByResourceTypeServlet extends SlingSafeMethodsServlet { private final Logger log = LoggerFactory.getLogger(ByResourceTypeServlet.class); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
