Author: fmeschbe
Date: Tue Jul 27 14:13:39 2010
New Revision: 979711
URL: http://svn.apache.org/viewvc?rev=979711&view=rev
Log:
SLING-1575 Add @scr.service tag for login form servlets and fully qualify path
property definition in the authentication handler
Modified:
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/AuthenticationFormServlet.java
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/OpenIDAuthenticationHandler.java
Modified:
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java?rev=979711&r1=979710&r2=979711&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java
(original)
+++
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java
Tue Jul 27 14:13:39 2010
@@ -30,6 +30,7 @@ import org.apache.sling.formauth.FormRea
* @scr.property name="service.vendor" value="The Apache Software Foundation"
* @scr.property name="service.description"
* value="Default Login Form for Form Based Authentication"
+ * @scr.service interface="javax.servlet.Servlet"
*/
@SuppressWarnings("serial")
public class AuthenticationFormServlet extends
AbstractAuthenticationFormServlet {
Modified:
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java?rev=979711&r1=979710&r2=979711&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java
(original)
+++
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java
Tue Jul 27 14:13:39 2010
@@ -55,8 +55,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The <code>FormAuthenticationHandler</code> class implements the
- * authorization steps based on a cookie.
+ * The <code>FormAuthenticationHandler</code> class implements the
authorization
+ * steps based on a cookie.
*
* @scr.component immediate="false" label="%auth.form.name"
* description="%auth.form.description"
@@ -64,8 +64,12 @@ import org.slf4j.LoggerFactory;
* @scr.property name="service.description"
* value="Apache Sling Form Based Authentication Handler"
* @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property nameRef="AuthenticationHandler.PATH_PROPERTY" value="/"
- * @scr.property nameRef="AuthenticationHandler.TYPE_PROPERTY" value="FORM"
+ * @scr.property nameRef=
+ *
"org.apache.sling.commons.auth.spi.AuthenticationHandler.PATH_PROPERTY"
+ * values.0="/"
+ * @scr.property nameRef=
+ *
"org.apache.sling.commons.auth.spi.AuthenticationHandler.TYPE_PROPERTY"
+ * valueRef="javax.servlet.http.HttpServletRequest.FORM_AUTH"
* private="true"
* @scr.service
*/
Modified:
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/AuthenticationFormServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/AuthenticationFormServlet.java?rev=979711&r1=979710&r2=979711&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/AuthenticationFormServlet.java
(original)
+++
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/AuthenticationFormServlet.java
Tue Jul 27 14:13:39 2010
@@ -31,6 +31,7 @@ import org.apache.sling.openidauth.OpenI
* @scr.property name="service.vendor" value="The Apache Software Foundation"
* @scr.property name="service.description"
* value="Default Login Form for OpenID Authentication"
+ * @scr.service interface="javax.servlet.Servlet"
*/
@SuppressWarnings("serial")
public class AuthenticationFormServlet extends
AbstractAuthenticationFormServlet {
Modified:
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/OpenIDAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/OpenIDAuthenticationHandler.java?rev=979711&r1=979710&r2=979711&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/OpenIDAuthenticationHandler.java
(original)
+++
sling/trunk/bundles/extensions/openidauth/src/main/java/org/apache/sling/openidauth/impl/OpenIDAuthenticationHandler.java
Tue Jul 27 14:13:39 2010
@@ -64,7 +64,12 @@ import com.dyuproject.openid.manager.Coo
* @scr.property name="service.description"
* value="Apache Sling OpenID Authentication Handler"
* @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property nameRef="AuthenticationHandler.PATH_PROPERTY" values.0="/"
+ * @scr.property nameRef=
+ *
"org.apache.sling.commons.auth.spi.AuthenticationHandler.PATH_PROPERTY"
+ * values.0="/"
+ * @scr.property nameRef=
+ *
"org.apache.sling.commons.auth.spi.AuthenticationHandler.TYPE_PROPERTY"
+ * valueRef="OpenIDConstants.OPENID_AUTH" private="true"
* @scr.service
*/
public class OpenIDAuthenticationHandler extends AbstractAuthenticationHandler
{
