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 f4f4bfcebf862a34b4c9e4fdf5eb987ce9cddbe1 Author: Felix Meschberger <[email protected]> AuthorDate: Mon Aug 16 05:15:00 2010 +0000 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. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/auth/form@985787 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- .../apache/sling/{formauth => auth/form}/FormReason.java | 2 +- .../form}/impl/AuthenticationFormServlet.java | 7 ++++--- .../form}/impl/FormAuthenticationHandler.java | 16 ++++++++-------- .../form}/impl/FormLoginModulePlugin.java | 2 +- .../sling/{formauth => auth/form}/impl/TokenStore.java | 2 +- .../sling/{formauth => auth/form}/FormReasonTest.java | 4 +++- .../form}/impl/FormAuthenticationHandlerTest.java | 4 ++-- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index edd5d28..3a8132d 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/main/java/org/apache/sling/formauth/FormReason.java b/src/main/java/org/apache/sling/auth/form/FormReason.java similarity index 98% rename from src/main/java/org/apache/sling/formauth/FormReason.java rename to src/main/java/org/apache/sling/auth/form/FormReason.java index 4510a21..5405cea 100644 --- a/src/main/java/org/apache/sling/formauth/FormReason.java +++ b/src/main/java/org/apache/sling/auth/form/FormReason.java @@ -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 { diff --git a/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java b/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java similarity index 95% rename from src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java rename to src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java index 1127f74..2a38ff6 100644 --- a/src/main/java/org/apache/sling/formauth/impl/AuthenticationFormServlet.java +++ b/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java @@ -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 diff --git a/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java b/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java similarity index 98% rename from src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java rename to src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java index 1e9663b..4322234 100644 --- a/src/main/java/org/apache/sling/formauth/impl/FormAuthenticationHandler.java +++ b/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java @@ -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.LoginException; 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 diff --git a/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java b/src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java similarity index 99% rename from src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java rename to src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java index 79d9fa1..786750b 100644 --- a/src/main/java/org/apache/sling/formauth/impl/FormLoginModulePlugin.java +++ b/src/main/java/org/apache/sling/auth/form/impl/FormLoginModulePlugin.java @@ -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; diff --git a/src/main/java/org/apache/sling/formauth/impl/TokenStore.java b/src/main/java/org/apache/sling/auth/form/impl/TokenStore.java similarity index 99% rename from src/main/java/org/apache/sling/formauth/impl/TokenStore.java rename to src/main/java/org/apache/sling/auth/form/impl/TokenStore.java index 2fe06ea..31a3977 100644 --- a/src/main/java/org/apache/sling/formauth/impl/TokenStore.java +++ b/src/main/java/org/apache/sling/auth/form/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.impl; +package org.apache.sling.auth.form.impl; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/test/java/org/apache/sling/formauth/FormReasonTest.java b/src/test/java/org/apache/sling/auth/form/FormReasonTest.java similarity index 94% rename from src/test/java/org/apache/sling/formauth/FormReasonTest.java rename to src/test/java/org/apache/sling/auth/form/FormReasonTest.java index 2db1617..4409621 100644 --- a/src/test/java/org/apache/sling/formauth/FormReasonTest.java +++ b/src/test/java/org/apache/sling/auth/form/FormReasonTest.java @@ -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; diff --git a/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java b/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java similarity index 98% rename from src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java rename to src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java index c0f6cff..20f5054 100644 --- a/src/test/java/org/apache/sling/formauth/impl/FormAuthenticationHandlerTest.java +++ b/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java @@ -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; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
