sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r985787 - in /sling/trunk/bundles/auth: core/ core/src/main/java/org/apache/sling/auth/ core/src/main/java/org/apache/sling/auth/core/ core/src/main/java/org/apache/sling/auth/core/impl/ core/src/main/java/org/apache/sling/auth/core/impl/en...
Date Mon, 16 Aug 2010 05:15:03 GMT
Author: fmeschbe
Date: Mon Aug 16 05:15:00 2010
New Revision: 985787

URL: http://svn.apache.org/viewvc?rev=985787&view=rev
Log:
SLING-1650 Refactor auth/core, auth/form, auth/openid for the new packages identifying the auth component and refer to the new auth/core for the authentication handlers.

Added:
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/AuthenticationSupport.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AbstractAuthenticationHandlerHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationHandlerHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationRequirementHolder.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationRequirementHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticatorWebConsolePlugin.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/HttpBasicAuthenticationHandler.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LoginServlet.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LogoutServlet.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolder.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolderCache.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
      - copied, changed from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/
      - copied from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/engine/
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/
      - copied from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/spi/
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/impl/
      - copied from r985662, sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/commons/auth/impl/
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/spi/
      - copied from r985662, sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/commons/auth/spi/
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/FormReason.java
      - copied, changed from r985662, sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/formauth/FormReason.java
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/
      - copied from r985662, sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/formauth/impl/
    sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/
    sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/
    sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/FormReasonTest.java
      - copied, changed from r985662, sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/formauth/FormReasonTest.java
    sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/impl/
      - copied from r985662, sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/formauth/impl/
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java
      - copied, changed from r985662, sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDConstants.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java
      - copied, changed from r985662, sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDFailure.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/
      - copied from r985662, sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/impl/
    sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/
    sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/openid/
    sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/openid/impl/
      - copied from r985662, sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/openidauth/impl/
Removed:
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/AuthenticationSupport.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AbstractAuthenticationHandlerHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationHandlerHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationRequirementHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticatorWebConsolePlugin.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/HttpBasicAuthenticationHandler.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LoginServlet.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LogoutServlet.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolderCache.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/engine/
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/spi/
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/commons/auth/impl/
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/commons/auth/spi/
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/formauth/FormReason.java
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/formauth/impl/
    sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/formauth/FormReasonTest.java
    sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/formauth/impl/
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDConstants.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDFailure.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/impl/
    sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/openidauth/impl/
Modified:
    sling/trunk/bundles/auth/core/pom.xml
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/Authenticator.java
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java
    sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java
    sling/trunk/bundles/auth/form/pom.xml
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java
    sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/TokenStore.java
    sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java
    sling/trunk/bundles/auth/openid/pom.xml
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/AuthenticationFormServlet.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDLoginModulePlugin.java
    sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandlerTest.java

Modified: sling/trunk/bundles/auth/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/pom.xml?rev=985787&r1=985786&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/pom.xml (original)
+++ sling/trunk/bundles/auth/core/pom.xml Mon Aug 16 05:15:00 2010
@@ -58,6 +58,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Bundle-DocURL>
+                            http://sling.apache.org/site/authentication.html
+                        </Bundle-DocURL>
                         <Export-Package>
                             org.apache.sling.auth.core;version=1.0.0,
                             org.apache.sling.auth.core.spi;version=1.0.0,

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/AuthenticationSupport.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/AuthenticationSupport.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/AuthenticationSupport.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth;
+package org.apache.sling.auth.core;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -68,7 +68,7 @@ public interface AuthenticationSupport {
     /**
      * The name under which this service is registered.
      */
-    static final String SERVICE_NAME = "org.apache.sling.commons.auth.AuthenticationSupport";
+    static final String SERVICE_NAME = "org.apache.sling.auth.core.AuthenticationSupport";
 
     /**
      * The name of the request attribute set by the
@@ -79,7 +79,7 @@ public interface AuthenticationSupport {
      * attached to the JCR repository using the credentials provided by the
      * request.
      */
-    static final String REQUEST_ATTRIBUTE_RESOLVER = "org.apache.sling.commons.auth.ResourceResolver";
+    static final String REQUEST_ATTRIBUTE_RESOLVER = "org.apache.sling.auth.core.ResourceResolver";
 
     /**
      * The name of the request parameter indicating where to redirect to after
@@ -91,7 +91,7 @@ public interface AuthenticationSupport {
      * because anonymous authentication fails or because anonymous
      * authentication is not allowed for the request, the parameter is ignored
      * and the
-     * {@link org.apache.sling.commons.auth.spi.AuthenticationHandler#requestCredentials(HttpServletRequest, HttpServletResponse)}
+     * {@link org.apache.sling.auth.core.spi.AuthenticationHandler#requestCredentials(HttpServletRequest, HttpServletResponse)}
      * method is called to request authentication.
      */
     static final String REDIRECT_PARAMETER = "sling.auth.redirect";
@@ -100,7 +100,7 @@ public interface AuthenticationSupport {
      * Handles security on behalf of a custom OSGi Http Service
      * <code>HttpContext</code> instance extracting credentials from the request
      * using any registered
-     * {@link org.apache.sling.commons.auth.spi.AuthenticationHandler} services.
+     * {@link org.apache.sling.auth.core.spi.AuthenticationHandler} services.
      * If the credentials can be extracted and used to log into the JCR
      * repository this method sets the request attributes required by the OSGi
      * Http Service specification plus the {@link #REQUEST_ATTRIBUTE_RESOLVER}

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AbstractAuthenticationHandlerHolder.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AbstractAuthenticationHandlerHolder.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AbstractAuthenticationHandlerHolder.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java Mon Aug 16 05:15:00 2010
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.sling.commons.auth.spi.AuthenticationFeedbackHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationInfo;
+import org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.spi.AuthenticationHandler;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
 import org.osgi.framework.ServiceReference;
 
 /**

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationHandlerHolder.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationHandlerHolder.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationHandlerHolder.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java Mon Aug 16 05:15:00 2010
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.sling.commons.auth.spi.AuthenticationFeedbackHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationInfo;
+import org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.spi.AuthenticationHandler;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
 import org.apache.sling.commons.osgi.OsgiUtil;
 import org.osgi.framework.ServiceReference;
 

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationRequirementHolder.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationRequirementHolder.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationRequirementHolder.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationRequirementHolder.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationRequirementHolder.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticationRequirementHolder.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticationRequirementHolder.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import org.osgi.framework.ServiceReference;
 

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticatorWebConsolePlugin.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticatorWebConsolePlugin.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/AuthenticatorWebConsolePlugin.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/HttpBasicAuthenticationHandler.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/HttpBasicAuthenticationHandler.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/HttpBasicAuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -25,9 +25,9 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.sling.commons.auth.spi.AuthenticationHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationInfo;
-import org.apache.sling.commons.auth.spi.DefaultAuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.spi.AuthenticationHandler;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
+import org.apache.sling.auth.core.spi.DefaultAuthenticationFeedbackHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LoginServlet.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LoginServlet.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LoginServlet.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import java.io.IOException;
 

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LogoutServlet.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LogoutServlet.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/LogoutServlet.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import javax.servlet.http.HttpServletResponse;
 

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolder.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolder.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolder.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolder.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolder.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolder.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolder.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import org.apache.sling.commons.osgi.OsgiUtil;
 import org.osgi.framework.Constants;

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolderCache.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolderCache.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/PathBasedHolderCache.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java (from r985662, sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/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?p2=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java&p1=sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -38,13 +38,13 @@ import org.apache.sling.api.auth.NoAuthe
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.commons.auth.AuthenticationSupport;
-import org.apache.sling.commons.auth.impl.engine.EngineAuthenticationHandlerHolder;
-import org.apache.sling.commons.auth.spi.AuthenticationFeedbackHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationInfo;
-import org.apache.sling.commons.auth.spi.AuthenticationInfoPostProcessor;
-import org.apache.sling.commons.auth.spi.DefaultAuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.AuthenticationSupport;
+import org.apache.sling.auth.core.impl.engine.EngineAuthenticationHandlerHolder;
+import org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.spi.AuthenticationHandler;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
+import org.apache.sling.auth.core.spi.AuthenticationInfoPostProcessor;
+import org.apache.sling.auth.core.spi.DefaultAuthenticationFeedbackHandler;
 import org.apache.sling.commons.osgi.OsgiUtil;
 import org.osgi.framework.AllServiceListener;
 import org.osgi.framework.BundleContext;
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
  *
  * Register for three services
  * @scr.service interface="org.apache.sling.api.auth.Authenticator"
- * @scr.service interface="org.apache.sling.commons.auth.AuthenticationSupport"
+ * @scr.service interface="org.apache.sling.auth.core.AuthenticationSupport"
  * @scr.service interface="javax.servlet.ServletRequestListener"
  *
  * @scr.property name="service.vendor" value="The Apache Software Foundation"
@@ -144,7 +144,7 @@ public class SlingAuthenticator implemen
 
     /**
      * The name of the {@link AuthenticationInfo} property providing the option
-     * {@link org.apache.sling.commons.auth.spi.AuthenticationFeedbackHandler}
+     * {@link org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler}
      * handler to be called back on login failure or success.
      */
     private static final String AUTH_INFO_PROP_FEEDBACK_HANDLER = "$$sling.auth.AuthenticationFeedbackHandler$$";
@@ -447,7 +447,7 @@ public class SlingAuthenticator implemen
 
     /**
      * Logs out the user calling all applicable
-     * {@link org.apache.sling.commons.auth.spi.AuthenticationHandler}
+     * {@link org.apache.sling.auth.core.spi.AuthenticationHandler}
      * authentication handlers.
      */
     public void logout(HttpServletRequest request, HttpServletResponse response) {
@@ -1091,7 +1091,7 @@ public class SlingAuthenticator implemen
 
     private static class SlingAuthenticatorResourceResolver {
 
-        static final String ATTR_NAME = "$$org.apache.sling.commons.auth.impl.SlingAuthenticatorResourceResolver$$";
+        static final String ATTR_NAME = "$$org.apache.sling.auth.core.impl.SlingAuthenticatorResourceResolver$$";
 
         private ResourceResolver resolver;
 

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java Mon Aug 16 05:15:00 2010
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl.engine;
+package org.apache.sling.auth.core.impl.engine;
 
 import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.sling.commons.auth.impl.AbstractAuthenticationHandlerHolder;
-import org.apache.sling.commons.auth.spi.AuthenticationFeedbackHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationInfo;
+import org.apache.sling.auth.core.impl.AbstractAuthenticationHandlerHolder;
+import org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
 import org.apache.sling.engine.auth.AuthenticationHandler;
 import org.osgi.framework.ServiceReference;
 
@@ -33,7 +33,7 @@ import org.osgi.framework.ServiceReferen
  * The <code>EngineAuthenticationHandlerHolder</code> class represents an
  * old-style Sling {@link AuthenticationHandler} service in the internal data
  * structure of the
- * {@link org.apache.sling.commons.auth.impl.SlingAuthenticator}.
+ * {@link org.apache.sling.auth.core.impl.SlingAuthenticator}.
  */
 @SuppressWarnings("deprecation")
 public final class EngineAuthenticationHandlerHolder extends

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl.engine;
+package org.apache.sling.auth.core.impl.engine;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,7 +28,7 @@ import org.apache.sling.engine.auth.NoAu
  * The <code>EngineSlingAuthenticator</code> class is a simple proxy service
  * providing the old Sling Engine {@link Authenticator} service calling into the
  * new standalone Apache Sling
- * {@link org.apache.sling.commons.auth.Authenticator} service.
+ * {@link org.apache.sling.auth.core.Authenticator} service.
  *
  * @scr.component metatype="no"
  * @scr.service interface="org.apache.sling.engine.auth.Authenticator"

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import javax.servlet.http.HttpServletRequest;
 import org.apache.sling.api.auth.Authenticator;

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import java.io.IOException;
 
@@ -34,7 +34,7 @@ public interface AuthenticationHandler {
      * The name under which an implementation of this interface must be
      * registered to be used as an authentication handler.
      */
-    static final String SERVICE_NAME = "org.apache.sling.commons.auth.spi.AuthenticationHandler";
+    static final String SERVICE_NAME = "org.apache.sling.auth.core.spi.AuthenticationHandler";
 
     /**
      * The name of the service registration property listing one or more URL

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java Mon Aug 16 05:15:00 2010
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -30,7 +30,7 @@ public interface AuthenticationInfoPostP
      * The name under which an implementation of this interface must be
      * registered to be used as an authentication info post processor.
      */
-    static final String SERVICE_NAME = "org.apache.sling.commons.auth.spi.AuthenticationInfoPostProcessor";
+    static final String SERVICE_NAME = "org.apache.sling.auth.core.spi.AuthenticationInfoPostProcessor";
 
     /**
      * Perform some post-processing on the AuthenticationInfo object.

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java Mon Aug 16 05:15:00 2010
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.sling.commons.auth.AuthenticationSupport;
+import org.apache.sling.auth.core.AuthenticationSupport;
 import org.slf4j.LoggerFactory;
 
 public class DefaultAuthenticationFeedbackHandler implements

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java?rev=985787&r1=985786&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java Mon Aug 16 05:15:00 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
  * extracting credentials from the request.
  *
  * @deprecated use
- *             {@link org.apache.sling.commons.auth.spi.AuthenticationHandler}
+ *             {@link org.apache.sling.auth.core.spi.AuthenticationHandler}
  *             instead
  */
 public interface AuthenticationHandler {

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/Authenticator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/Authenticator.java?rev=985787&r1=985786&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/Authenticator.java (original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/Authenticator.java Mon Aug 16 05:15:00 2010
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @since 2.0.4 This is version of the sling engine module where these classes where
  *              hosted before.
- * @deprecated use {@link org.apache.sling.commons.auth.Authenticator} instead
+ * @deprecated use {@link org.apache.sling.auth.core.Authenticator} instead
  */
 @Deprecated
 public interface Authenticator {

Modified: sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java (original)
+++ sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.impl;
+package org.apache.sling.auth.core.impl;
+
+import org.apache.sling.auth.core.impl.SlingAuthenticator;
 
 import junit.framework.TestCase;
 

Modified: sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java (original)
+++ sling/trunk/bundles/auth/core/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.commons.auth.spi;
+package org.apache.sling.auth.core.spi;
 
 import static junit.framework.Assert.failNotEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,6 +28,7 @@ import javax.jcr.Credentials;
 import javax.jcr.SimpleCredentials;
 
 import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: sling/trunk/bundles/auth/form/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/pom.xml?rev=985787&r1=985786&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/pom.xml (original)
+++ sling/trunk/bundles/auth/form/pom.xml Mon Aug 16 05:15:00 2010
@@ -105,7 +105,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.auth</artifactId>
+            <artifactId>org.apache.sling.auth.core</artifactId>
             <version>0.9.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>

Copied: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/FormReason.java (from r985662, sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/formauth/FormReason.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/FormReason.java?p2=sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/FormReason.java&p1=sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/formauth/FormReason.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/formauth/FormReason.java (original)
+++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/FormReason.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth;
+package org.apache.sling.auth.form;
 
 public enum FormReason {
 

Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java (original)
+++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java Mon Aug 16 05:15:00 2010
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth.impl;
+package org.apache.sling.auth.form.impl;
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.sling.commons.auth.spi.AbstractAuthenticationFormServlet;
-import org.apache.sling.formauth.FormReason;
+
+import org.apache.sling.auth.core.spi.AbstractAuthenticationFormServlet;
+import org.apache.sling.auth.form.FormReason;
 
 /**
  * The <code>AuthenticationFormServlet</code> provides the default login form

Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth.impl;
+package org.apache.sling.auth.form.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,11 +42,11 @@ import org.apache.sling.api.resource.Log
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.commons.auth.spi.AbstractAuthenticationHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationInfo;
-import org.apache.sling.commons.auth.spi.DefaultAuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.spi.AbstractAuthenticationHandler;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
+import org.apache.sling.auth.core.spi.DefaultAuthenticationFeedbackHandler;
+import org.apache.sling.auth.form.FormReason;
 import org.apache.sling.commons.osgi.OsgiUtil;
-import org.apache.sling.formauth.FormReason;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
@@ -60,15 +60,15 @@ import org.slf4j.LoggerFactory;
  *
  * @scr.component immediate="false" label="%auth.form.name"
  *                description="%auth.form.description"
- *                name="org.apache.sling.formauth.FormAuthenticationHandler"
+ *                name="org.apache.sling.auth.form.FormAuthenticationHandler"
  * @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=
- *               "org.apache.sling.commons.auth.spi.AuthenticationHandler.PATH_PROPERTY"
+ *               "org.apache.sling.auth.core.spi.AuthenticationHandler.PATH_PROPERTY"
  *               values.0="/"
  * @scr.property nameRef=
- *               "org.apache.sling.commons.auth.spi.AuthenticationHandler.TYPE_PROPERTY"
+ *               "org.apache.sling.auth.core.spi.AuthenticationHandler.TYPE_PROPERTY"
  *               valueRef="javax.servlet.http.HttpServletRequest.FORM_AUTH"
  *               private="true"
  * @scr.service

Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java (original)
+++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth.impl;
+package org.apache.sling.auth.form.impl;
 
 import java.security.Principal;
 import java.util.Hashtable;

Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/TokenStore.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/TokenStore.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/TokenStore.java (original)
+++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/TokenStore.java Mon Aug 16 05:15:00 2010
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.sling.formauth.impl;
+package org.apache.sling.auth.form.impl;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

Copied: sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/FormReasonTest.java (from r985662, sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/formauth/FormReasonTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/FormReasonTest.java?p2=sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/FormReasonTest.java&p1=sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/formauth/FormReasonTest.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/formauth/FormReasonTest.java (original)
+++ sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/FormReasonTest.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth;
+package org.apache.sling.auth.form;
+
+import org.apache.sling.auth.form.FormReason;
 
 import junit.framework.TestCase;
 

Modified: sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java (original)
+++ sling/trunk/bundles/auth/form/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java Mon Aug 16 05:15:00 2010
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth.impl;
+package org.apache.sling.auth.form.impl;
 
 import java.io.File;
 
 import junit.framework.TestCase;
 
-import org.apache.sling.formauth.impl.FormAuthenticationHandler;
+import org.apache.sling.auth.form.impl.FormAuthenticationHandler;
 import org.hamcrest.Description;
 import org.hamcrest.text.StringStartsWith;
 import org.jmock.Expectations;

Modified: sling/trunk/bundles/auth/openid/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/pom.xml?rev=985787&r1=985786&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/pom.xml (original)
+++ sling/trunk/bundles/auth/openid/pom.xml Mon Aug 16 05:15:00 2010
@@ -113,7 +113,7 @@
         </dependency>
 		<dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.auth</artifactId>
+            <artifactId>org.apache.sling.auth.core</artifactId>
             <version>0.9.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>

Copied: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java (from r985662, sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDConstants.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java?p2=sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java&p1=sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDConstants.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDConstants.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.openidauth;
+package org.apache.sling.auth.openid;
 
 /**
  * The <code>OpenIDConstants</code> class defines useful constants for

Copied: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java (from r985662, sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDFailure.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java?p2=sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java&p1=sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDFailure.java&r1=985662&r2=985787&rev=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/openidauth/OpenIDFailure.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.openidauth;
+package org.apache.sling.auth.openid;
 
 /**
  * The <code>OpenIDFailure</code> defines the OpenID authentication failure

Modified: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/AuthenticationFormServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/AuthenticationFormServlet.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/AuthenticationFormServlet.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/AuthenticationFormServlet.java Mon Aug 16 05:15:00 2010
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.openidauth.impl;
+package org.apache.sling.auth.openid.impl;
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.sling.commons.auth.spi.AbstractAuthenticationFormServlet;
-import org.apache.sling.openidauth.OpenIDConstants;
-import org.apache.sling.openidauth.OpenIDFailure;
+
+import org.apache.sling.auth.core.spi.AbstractAuthenticationFormServlet;
+import org.apache.sling.auth.openid.OpenIDConstants;
+import org.apache.sling.auth.openid.OpenIDFailure;
 
 /**
  * The <code>AuthenticationFormServlet</code> provides the default login form

Modified: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.openidauth.impl;
+package org.apache.sling.auth.openid.impl;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -36,13 +36,13 @@ import org.apache.jackrabbit.api.Jackrab
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.sling.api.auth.Authenticator;
-import org.apache.sling.commons.auth.spi.AbstractAuthenticationHandler;
-import org.apache.sling.commons.auth.spi.AuthenticationInfo;
-import org.apache.sling.commons.auth.spi.DefaultAuthenticationFeedbackHandler;
+import org.apache.sling.auth.core.spi.AbstractAuthenticationHandler;
+import org.apache.sling.auth.core.spi.AuthenticationInfo;
+import org.apache.sling.auth.core.spi.DefaultAuthenticationFeedbackHandler;
+import org.apache.sling.auth.openid.OpenIDConstants;
+import org.apache.sling.auth.openid.OpenIDFailure;
 import org.apache.sling.commons.osgi.OsgiUtil;
 import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.openidauth.OpenIDConstants;
-import org.apache.sling.openidauth.OpenIDFailure;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
@@ -60,15 +60,15 @@ import com.dyuproject.openid.manager.Coo
  *
  * @scr.component immediate="false" label="%auth.openid.name"
  *                description="%auth.openid.description"
- *                name="org.apache.sling.openidauth.OpenIDAuthenticationHandler"
+ *                name="org.apache.sling.auth.openid.OpenIDAuthenticationHandler"
  * @scr.property name="service.description"
  *               value="Apache Sling OpenID Authentication Handler"
  * @scr.property name="service.vendor" value="The Apache Software Foundation"
  * @scr.property nameRef=
- *               "org.apache.sling.commons.auth.spi.AuthenticationHandler.PATH_PROPERTY"
+ *               "org.apache.sling.auth.core.spi.AuthenticationHandler.PATH_PROPERTY"
  *               values.0="/"
  * @scr.property nameRef=
- *               "org.apache.sling.commons.auth.spi.AuthenticationHandler.TYPE_PROPERTY"
+ *               "org.apache.sling.auth.core.spi.AuthenticationHandler.TYPE_PROPERTY"
  *               valueRef="OpenIDConstants.OPENID_AUTH" private="true"
  * @scr.service
  */

Modified: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDLoginModulePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDLoginModulePlugin.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDLoginModulePlugin.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDLoginModulePlugin.java Mon Aug 16 05:15:00 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.openidauth.impl;
+package org.apache.sling.auth.openid.impl;
 
 import java.security.Principal;
 import java.util.Hashtable;

Modified: sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandlerTest.java?rev=985787&r1=985662&r2=985787&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandlerTest.java (original)
+++ sling/trunk/bundles/auth/openid/src/test/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandlerTest.java Mon Aug 16 05:15:00 2010
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.openidauth.impl;
+package org.apache.sling.auth.openid.impl;
 
 import javax.servlet.http.HttpServletRequest;
 
 import junit.framework.TestCase;
 
+import org.apache.sling.auth.openid.impl.OpenIDAuthenticationHandler;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 



Mime
View raw message