This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.auth.form-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-form.git
commit 217e197a4c4fa3b83b733a25545432eae12c8c70 Author: Felix Meschberger <[email protected]> AuthorDate: Tue Jun 22 07:38:19 2010 +0000 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. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/formauth@956799 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 ++++- src/main/java/org/apache/sling/formauth/FormReason.java | 2 +- .../apache/sling/formauth/{ => impl}/AuthenticationFormServlet.java | 4 +++- .../apache/sling/formauth/{ => impl}/FormAuthenticationHandler.java | 6 ++++-- .../org/apache/sling/formauth/{ => impl}/FormLoginModulePlugin.java | 2 +- src/main/java/org/apache/sling/formauth/{ => impl}/TokenStore.java | 2 +- .../sling/formauth/{ => impl}/FormAuthenticationHandlerTest.java | 3 ++- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 5666b0c..5202b4f 100644 --- a/pom.xml +++ b/pom.xml @@ -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; diff --git a/src/main/java/org/apache/sling/formauth/FormReason.java b/src/main/java/org/apache/sling/formauth/FormReason.java index 2b69869..4510a21 100644 --- a/src/main/java/org/apache/sling/formauth/FormReason.java +++ b/src/main/java/org/apache/sling/formauth/FormReason.java @@ -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 diff --git a/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java b/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java similarity index 98% rename from src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java rename to src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java index 0513205..463f2de 100644 --- a/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java +++ b/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java @@ -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. diff --git a/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java b/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java similarity index 99% rename from src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java rename to src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java index 56849b5..9e78e89 100644 --- a/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java +++ b/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java @@ -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.AuthenticationHandler; 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" diff --git a/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java b/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java similarity index 99% rename from src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java rename to src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java index b2776bf..79d9fa1 100644 --- a/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java +++ b/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java @@ -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; diff --git a/src/main/java/org/apache/sling/formauth/TokenStore.java b/src/main/java/org/apache/sling/formauth/impl/TokenStore.java similarity index 99% rename from src/main/java/org/apache/sling/formauth/TokenStore.java rename to src/main/java/org/apache/sling/formauth/impl/TokenStore.java index 390f1b2..2fe06ea 100644 --- a/src/main/java/org/apache/sling/formauth/TokenStore.java +++ b/src/main/java/org/apache/sling/formauth/impl/TokenStore.java @@ -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; diff --git a/src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java b/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java similarity index 98% rename from src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java rename to src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java index 31e8e21..c0f6cff 100644 --- a/src/test/java/org/apache/sling/formauth/FormAuthenticationHandlerTest.java +++ b/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java @@ -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; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
