From ee12d54beca2908f8ef77722a8f81487334e4174 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gmail.com>
Date: Tue, 5 Oct 2010 21:42:44 -0500
Subject: [PATCH] SEC-1536: moved web.authentication.jaas to web.jaasapi

Renamed org.springframework.security.web.authentication.jaas to org.springframework.security.web.jaasapi to be better aligned with org.springframework.security.web.servletapi, added package-info.java, and removed trailing whitespaces
---
 .../config/http/DefaultFilterChainValidator.java       |  2 +-
 .../security/config/http/HttpConfigurationBuilder.java |  2 +-
 .../security/config/http/MiscHttpConfigTests.groovy    |  2 +-
 .../jaas => jaasapi}/JaasApiIntegrationFilter.java     | 10 +++++-----
 .../security/web/jaasapi/package-info.java             |  6 ++++++
 .../jaas => jaasapi}/JaasApiIntegrationFilterTest.java |  5 +++--
 6 files changed, 17 insertions(+), 10 deletions(-)
 rename web/src/main/java/org/springframework/security/web/{authentication/jaas => jaasapi}/JaasApiIntegrationFilter.java (98%)
 create mode 100644 web/src/main/java/org/springframework/security/web/jaasapi/package-info.java
 rename web/src/test/java/org/springframework/security/web/{authentication/jaas => jaasapi}/JaasApiIntegrationFilterTest.java (98%)

diff --git a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java
index 02a7be95c4..3bb5a29ab4 100644
--- a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java
+++ b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java
@@ -17,10 +17,10 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept
 import org.springframework.security.web.authentication.AnonymousAuthenticationFilter;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.authentication.jaas.JaasApiIntegrationFilter;
 import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 import org.springframework.security.web.context.SecurityContextPersistenceFilter;
+import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter;
 import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;
 import org.springframework.security.web.session.SessionManagementFilter;
 
diff --git a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java
index 5b2ccfa8da..40f1aff8e1 100644
--- a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java
@@ -34,12 +34,12 @@ import org.springframework.security.web.access.expression.WebExpressionVoter;
 import org.springframework.security.web.access.intercept.DefaultFilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
-import org.springframework.security.web.authentication.jaas.JaasApiIntegrationFilter;
 import org.springframework.security.web.authentication.session.ConcurrentSessionControlStrategy;
 import org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 import org.springframework.security.web.context.NullSecurityContextRepository;
 import org.springframework.security.web.context.SecurityContextPersistenceFilter;
+import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter;
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.savedrequest.RequestCacheAwareFilter;
diff --git a/config/src/test/groovy/org/springframework/security/config/http/MiscHttpConfigTests.groovy b/config/src/test/groovy/org/springframework/security/config/http/MiscHttpConfigTests.groovy
index 5ab2134811..74be8df651 100644
--- a/config/src/test/groovy/org/springframework/security/config/http/MiscHttpConfigTests.groovy
+++ b/config/src/test/groovy/org/springframework/security/config/http/MiscHttpConfigTests.groovy
@@ -30,7 +30,6 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept
 import org.springframework.security.web.authentication.AnonymousAuthenticationFilter
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-import org.springframework.security.web.authentication.jaas.JaasApiIntegrationFilter
 import org.springframework.security.web.authentication.logout.LogoutFilter
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler
 import org.springframework.security.web.authentication.preauth.x509.X509AuthenticationFilter
@@ -39,6 +38,7 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository
 import org.springframework.security.web.context.SecurityContextPersistenceFilter
+import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache
 import org.springframework.security.web.savedrequest.RequestCacheAwareFilter
 import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter
diff --git a/web/src/main/java/org/springframework/security/web/authentication/jaas/JaasApiIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
similarity index 98%
rename from web/src/main/java/org/springframework/security/web/authentication/jaas/JaasApiIntegrationFilter.java
rename to web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
index b2bdba2ce1..4d5b60c630 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/jaas/JaasApiIntegrationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.web.authentication.jaas;
+package org.springframework.security.web.jaasapi;
 
 import java.io.IOException;
 import java.security.PrivilegedActionException;
@@ -44,7 +44,7 @@ import org.springframework.web.filter.GenericFilterBean;
  * simultaneously. This is useful when integrating with code that requires a
  * JAAS <code>Subject</code> to be populated.
  * </p>
- * 
+ *
  * @author Rob Winch
  * @see #doFilter(ServletRequest, ServletResponse, FilterChain)
  * @see #obtainSubject(ServletRequest)
@@ -61,7 +61,7 @@ public class JaasApiIntegrationFilter extends GenericFilterBean {
      * Attempts to obtain and run as a JAAS <code>Subject</code> using
      * {@link #obtainSubject(ServletRequest)}.
      * </p>
-     * 
+     *
      * <p>
      * If the <code>Subject</code> is <code>null</code> and
      * <tt>createEmptySubject</tt> is <code>true</code>, an empty, writeable
@@ -120,7 +120,7 @@ public class JaasApiIntegrationFilter extends GenericFilterBean {
      * the <code>Subject</code> is returned from it. Otherwise,
      * <code>null</code> is returned.
      * </p>
-     * 
+     *
      * @param request
      *            the current <code>ServletRequest</code>
      * @return the Subject to run as or <code>null</code> if no
@@ -153,7 +153,7 @@ public class JaasApiIntegrationFilter extends GenericFilterBean {
      * and {@link #obtainSubject(ServletRequest)} returns <code>null</code>, an
      * empty, writeable <code>Subject</code> is created instead. Otherwise no
      * <code>Subject</code> is used. The default is <code>false</code>.
-     * 
+     *
      * @param createEmptySubject
      *            the new value
      */
diff --git a/web/src/main/java/org/springframework/security/web/jaasapi/package-info.java b/web/src/main/java/org/springframework/security/web/jaasapi/package-info.java
new file mode 100644
index 0000000000..65bbf43800
--- /dev/null
+++ b/web/src/main/java/org/springframework/security/web/jaasapi/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Makes a JAAS Subject available as the current Subject.
+ * <p>
+ * To use, simply add the {@code JaasApiIntegrationFilter} to the Spring Security filter chain.
+ */
+package org.springframework.security.web.jaasapi;
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/authentication/jaas/JaasApiIntegrationFilterTest.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTest.java
similarity index 98%
rename from web/src/test/java/org/springframework/security/web/authentication/jaas/JaasApiIntegrationFilterTest.java
rename to web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTest.java
index c6f187f25f..22178b4182 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/jaas/JaasApiIntegrationFilterTest.java
+++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.web.authentication.jaas;
+package org.springframework.security.web.jaasapi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -50,10 +50,11 @@ import org.springframework.security.authentication.jaas.TestLoginModule;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter;
 
 /**
  * Tests the JaasApiIntegrationFilter.
- * 
+ *
  * @author Rob Winch
  */
 public class JaasApiIntegrationFilterTest {