svn commit: r988019 - in /sling/trunk/bundles/auth/core/src/main: java/org/apache/sling/auth/core/impl/SlingAuthenticator.java resources/OSGI-INF/metatype/metatype.properties

[fm...@apache.org]

Author: fmeschbe
Date: Mon Aug 23 07:50:22 2010
New Revision: 988019

URL: http://svn.apache.org/viewvc?rev=988019&view=rev
Log:
SLING-1678 Metatype Service labels

Modified:
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
    sling/trunk/bundles/auth/core/src/main/resources/OSGI-INF/metatype/metatype.properties

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java?rev=988019&r1=988018&r2=988019&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java Mon Aug 23 07:50:22 2010
@@ -115,18 +115,6 @@ public class SlingAuthenticator implemen
     private static final String PAR_AUTH_REQ = "sling.auth.requirements";
 
     /**
-     * The default realm for the built-in HTTP Basic authentication handler.
-     */
-    private static final String DEFAULT_REALM = "Sling (Development)";
-
-    /**
-     * The name of the configuration property used to set the Realm of the
-     * built-in HTTP Basic authentication handler.
-     */
-    @Property(value = DEFAULT_REALM)
-    public static final String PAR_REALM_NAME = "auth.http.realm";
-
-    /**
      * Value of the {@link #PAR_HTTP_AUTH} property to fully enable the built-in
      * HTTP Authentication Handler (value is "enabled").
      */
@@ -154,6 +142,18 @@ public class SlingAuthenticator implemen
     private static final String PAR_HTTP_AUTH = "auth.http";
 
     /**
+     * The default realm for the built-in HTTP Basic authentication handler.
+     */
+    private static final String DEFAULT_REALM = "Sling (Development)";
+
+    /**
+     * The name of the configuration property used to set the Realm of the
+     * built-in HTTP Basic authentication handler.
+     */
+    @Property(value = DEFAULT_REALM)
+    public static final String PAR_REALM_NAME = "auth.http.realm";
+
+    /**
      * The name of the {@link AuthenticationInfo} property providing the option
      * {@link org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler}
      * handler to be called back on login failure or success.

Modified: sling/trunk/bundles/auth/core/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=988019&r1=988018&r2=988019&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ sling/trunk/bundles/auth/core/src/main/resources/OSGI-INF/metatype/metatype.properties Mon Aug 23 07:50:22 2010
@@ -68,5 +68,14 @@ auth.sudo.parameter.description = The na
  impersonated session (instead of the actually authenticated session) and set \
  a session cookie of the name defined in the Impersonation Cookie setting.
 
+auth.http.name = HTTP Basic Authentication
+auth.http.description = Level of support for HTTP Basic Authentication. Such \
+ support can be provided in three levels: (1) no support at all, that is \
+ disabled, (2) preemptive support, that is HTTP Basic Authentication is \
+ supported if the authentication header is set in the request, (3) full \
+ support. The default is preemptive support.
+
 auth.http.realm.name = Realm
-auth.http.realm.description = HTTP BASIC authentication realm
\ No newline at end of file
+auth.http.realm.description = HTTP BASIC authentication realm. This property \
+ is only used if the HTTP Basic Authentication support is not disabled. The \
+ default value is "Sling (Development)".
\ No newline at end of file