svn commit: r1614318 - in /sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector: SelectorAuthenticationHandler.java SelectorFormServlet.java

[cz...@apache.org]

Author: cziegeler
Date: Tue Jul 29 12:13:19 2014
New Revision: 1614318

URL: http://svn.apache.org/r1614318
Log:
Clean up usage of SCR annotations

Modified:
    sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorAuthenticationHandler.java
    sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorFormServlet.java

Modified: sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorAuthenticationHandler.java?rev=1614318&r1=1614317&r2=1614318&view=diff
==============================================================================
--- sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorAuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorAuthenticationHandler.java Tue Jul 29 12:13:19 2014
@@ -49,12 +49,12 @@ import org.slf4j.LoggerFactory;
  * The default form provided by this handler allows the client to choose from
  * Form Based and OpenID authentication.
  */
-@Component(label = "%auth.selector.name", description = "%auth.selector.description", name = "org.apache.sling.auth.selector.SelectorAuthenticationHandler")
+@Component(name = "org.apache.sling.auth.selector.SelectorAuthenticationHandler")
 @Properties( {
     @Property(name = "service.description", value = "Apache Sling Selector Form Handler"),
     @Property(name = "service.vendor", value = "The Apache Software Foundation"),
     @Property(name = org.apache.sling.auth.core.spi.AuthenticationHandler.PATH_PROPERTY, value = "/"),
-    @Property(name = "service.ranking", intValue = 5000, propertyPrivate = false) })
+    @Property(name = "service.ranking", intValue = 5000) })
 @Service
 public class SelectorAuthenticationHandler extends
         AbstractAuthenticationHandler {

Modified: sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorFormServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorFormServlet.java?rev=1614318&r1=1614317&r2=1614318&view=diff
==============================================================================
--- sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorFormServlet.java (original)
+++ sling/trunk/bundles/auth/selector/src/main/java/org/apache/sling/auth/selector/SelectorFormServlet.java Tue Jul 29 12:13:19 2014
@@ -38,7 +38,7 @@ import org.apache.sling.auth.openid.Open
  * The <code>SelectorFormServlet</code> provides the default login form used for
  * Form Based or OpenID Authentication.
  */
-@Component(metatype = false)
+@Component
 @Properties({
     @Property(name = "service.vendor", value = "The Apache Software Foundation"),
     @Property(name = "service.description", value = "Default Login Form for the Authenticator Selector") })
@@ -56,7 +56,7 @@ public class SelectorFormServlet extends
      * This constant is used to provide the service registration property
      * indicating to pass requests to this servlet unauthenticated.
      */
-    @Property(name = "sling.auth.requirements", propertyPrivate = true)
+    @Property(name = "sling.auth.requirements")
     @SuppressWarnings("unused")
     private static final String[] AUTH_REQUIREMENT = { "-" + SERVLET_PATH,
         "-/sling.css", "-/sling-logo.png", "-/signup.html" };