svn commit: r938518 - in /sling/trunk/bundles/extensions/formauth: pom.xml src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java src/main/resources/OSGI-INF/metatype/metatype.properties

[ju...@apache.org]

Author: justin
Date: Tue Apr 27 15:28:03 2010
New Revision: 938518

URL: http://svn.apache.org/viewvc?rev=938518&view=rev
Log:
SLING-1497 - adding tentative configuration for configuring service.ranking via ConfigAdmin/Metatype

Modified:
    sling/trunk/bundles/extensions/formauth/pom.xml
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java
    sling/trunk/bundles/extensions/formauth/src/main/resources/OSGI-INF/metatype/metatype.properties

Modified: sling/trunk/bundles/extensions/formauth/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/pom.xml?rev=938518&r1=938517&r2=938518&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/pom.xml (original)
+++ sling/trunk/bundles/extensions/formauth/pom.xml Tue Apr 27 15:28:03 2010
@@ -48,6 +48,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
+                <version>LATEST</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>

Modified: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java?rev=938518&r1=938517&r2=938518&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java (original)
+++ sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java Tue Apr 27 15:28:03 2010
@@ -42,6 +42,7 @@ import org.apache.sling.commons.auth.spi
 import org.apache.sling.commons.auth.spi.DefaultAuthenticationFeedbackHandler;
 import org.apache.sling.commons.osgi.OsgiUtil;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
@@ -207,6 +208,14 @@ public class FormAuthenticationHandler i
     static final String PAR_J_REASON = "j_reason";
 
     /**
+     * The service ranking property.
+     *
+     * @scr.property type="Integer" value="0" private="false"
+     */
+    @SuppressWarnings("unused")
+    private static final String PAR_SERVICE_RANKING = Constants.SERVICE_RANKING;
+
+    /**
      * The factor to convert minute numbers into milliseconds used internally
      */
     private static final long MINUTES = 60L * 1000L;

Modified: sling/trunk/bundles/extensions/formauth/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=938518&r1=938517&r2=938518&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ sling/trunk/bundles/extensions/formauth/src/main/resources/OSGI-INF/metatype/metatype.properties Tue Apr 27 15:28:03 2010
@@ -66,3 +66,7 @@ form.token.file.description = The name o
  sling.home framework property or - if sling.home is not set - the current \
  working directory. In the future this file may be store in the JCR Repository \
  to support clustering scenarios.
+
+service.ranking.name = Ranking
+service.ranking.description = The relative ranking of this service.
+