incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r956799 - in /sling/trunk/bundles/extensions/formauth: ./ src/main/java/org/apache/sling/formauth/ src/main/java/org/apache/sling/formauth/impl/ src/test/java/org/apache/sling/formauth/ src/test/java/org/apache/sling/formauth/impl/
Date Tue, 22 Jun 2010 07:38:20 GMT
Author: fmeschbe
Date: Tue Jun 22 07:38:19 2010
New Revision: 956799

URL: http://svn.apache.org/viewvc?rev=956799&view=rev
Log:
SLING-1565 Move private implementation classes to the impl package and export the o.a.s.formauth
package for login forms to be able to interpret the j_reason value with the FormReason enum.

Added:
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java
      - copied, changed from r956797, sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java
      - copied, changed from r956797, sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java
      - copied, changed from r956796, sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/TokenStore.java
      - copied, changed from r956796, sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/TokenStore.java
    sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/impl/
    sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java
      - copied, changed from r956796, sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java
Removed:
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/TokenStore.java
    sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java
Modified:
    sling/trunk/bundles/extensions/formauth/pom.xml
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormReason.java

Modified: sling/trunk/bundles/extensions/formauth/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/pom.xml?rev=956799&r1=956798&r2=956799&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/pom.xml (original)
+++ sling/trunk/bundles/extensions/formauth/pom.xml Tue Jun 22 07:38:19 2010
@@ -59,8 +59,11 @@
                         <Bundle-DocURL>
                             http://sling.apache.org/site/form-based-authenticationhandler.html
                         </Bundle-DocURL>
+                        <Export-Package>
+                            org.apache.sling.formauth;version=1.0
+                        </Export-Package>
                         <Private-Package>
-                            org.apache.sling.formauth.*
+                            org.apache.sling.formauth.impl.*
                         </Private-Package>
                         <Import-Package>
                             javax.security.auth.callback;

Modified: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormReason.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormReason.java?rev=956799&r1=956798&r2=956799&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormReason.java
(original)
+++ sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormReason.java
Tue Jun 22 07:38:19 2010
@@ -18,7 +18,7 @@
  */
 package org.apache.sling.formauth;
 
-enum FormReason {
+public enum FormReason {
 
     /**
      * The login form is request because the credentials previously entered very

Copied: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java
(from r956797, sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java?p2=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java&p1=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java&r1=956797&r2=956799&rev=956799&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
(original)
+++ sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java
Tue Jun 22 07:38:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth;
+package org.apache.sling.formauth.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,6 +27,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.sling.formauth.FormReason;
+
 /**
  * The <code>AuthenticationFormServlet</code> provides the default login form
  * used for Form Based Authentication.

Copied: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java
(from r956797, 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/impl/FormAuthenticationHandler.java?p2=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java&p1=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java&r1=956797&r2=956799&rev=956799&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/impl/FormAuthenticationHandler.java
Tue Jun 22 07:38:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth;
+package org.apache.sling.formauth.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,6 +41,7 @@ import org.apache.sling.commons.auth.spi
 import org.apache.sling.commons.auth.spi.AuthenticationInfo;
 import org.apache.sling.commons.auth.spi.DefaultAuthenticationFeedbackHandler;
 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;
@@ -49,11 +50,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * The <code>CookieAuthenticationHandler</code> class implements the
+ * 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"
+ *                name="org.apache.sling.formauth.FormAuthenticationHandler"
  * @scr.property name="service.description"
  *               value="Apache Sling Form Based Authentication Handler"
  * @scr.property name="service.vendor" value="The Apache Software Foundation"

Copied: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java
(from r956796, sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java?p2=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java&p1=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java&r1=956796&r2=956799&rev=956799&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java
(original)
+++ sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java
Tue Jun 22 07:38:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth;
+package org.apache.sling.formauth.impl;
 
 import java.security.Principal;
 import java.util.Hashtable;

Copied: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/TokenStore.java
(from r956796, sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/TokenStore.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/TokenStore.java?p2=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/TokenStore.java&p1=sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/TokenStore.java&r1=956796&r2=956799&rev=956799&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/TokenStore.java
(original)
+++ sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/impl/TokenStore.java
Tue Jun 22 07:38:19 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;
+package org.apache.sling.formauth.impl;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

Copied: sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java
(from r956796, sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java?p2=sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java&p1=sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java&r1=956796&r2=956799&rev=956799&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java
(original)
+++ sling/trunk/bundles/extensions/formauth/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java
Tue Jun 22 07:38:19 2010
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.formauth;
+package org.apache.sling.formauth.impl;
 
 import java.io.File;
 
 import junit.framework.TestCase;
 
+import org.apache.sling.formauth.impl.FormAuthenticationHandler;
 import org.hamcrest.Description;
 import org.hamcrest.text.StringStartsWith;
 import org.jmock.Expectations;



Mime
View raw message