Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-562: Sandbox repackaging.

This commit is contained in:
Luke Taylor 2007-09-22 11:38:55 +00:00
parent e5e4f040a1
commit d8497a1642
50 changed files with 180 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
View File

@ -12,9 +12,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.providers.openid; package org.springframework.security.providers.openid;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
/** /**

20
sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
View File

@ -12,17 +12,17 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.providers.openid; package org.springframework.security.providers.openid;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationServiceException; import org.springframework.security.AuthenticationServiceException;
import org.acegisecurity.BadCredentialsException; import org.springframework.security.BadCredentialsException;
import org.acegisecurity.providers.AuthenticationProvider; import org.springframework.security.providers.AuthenticationProvider;
import org.acegisecurity.providers.cas.CasAuthoritiesPopulator; import org.springframework.security.providers.cas.CasAuthoritiesPopulator;
import org.acegisecurity.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetails;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
@ -46,7 +46,7 @@ public class OpenIDAuthenticationProvider implements AuthenticationProvider, Ini
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.providers.AuthenticationProvider#authenticate(org.acegisecurity.Authentication) * @see org.springframework.security.providers.AuthenticationProvider#authenticate(org.springframework.security.Authentication)
*/ */
public Authentication authenticate(Authentication authentication) public Authentication authenticate(Authentication authentication)
throws AuthenticationException { throws AuthenticationException {
@ -97,7 +97,7 @@ public class OpenIDAuthenticationProvider implements AuthenticationProvider, Ini
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.providers.AuthenticationProvider#supports(java.lang.Class) * @see org.springframework.security.providers.AuthenticationProvider#supports(java.lang.Class)
*/ */
public boolean supports(Class authentication) { public boolean supports(Class authentication) {
return OpenIDAuthenticationToken.class.isAssignableFrom(authentication); return OpenIDAuthenticationToken.class.isAssignableFrom(authentication);

2
sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.providers.openid; package org.springframework.security.providers.openid;
import java.io.ObjectStreamException; import java.io.ObjectStreamException;
import java.io.Serializable; import java.io.Serializable;

10
sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
View File

@ -12,11 +12,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.providers.openid; package org.springframework.security.providers.openid;
import org.acegisecurity.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.acegisecurity.providers.AbstractAuthenticationToken; import org.springframework.security.providers.AbstractAuthenticationToken;
/** /**
@ -61,7 +61,7 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.Authentication#getCredentials() * @see org.springframework.security.Authentication#getCredentials()
*/ */
public Object getCredentials() { public Object getCredentials() {
return null; return null;
@ -76,7 +76,7 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.Authentication#getPrincipal() * @see org.springframework.security.Authentication#getPrincipal()
*/ */
public Object getPrincipal() { public Object getPrincipal() {
return identityUrl; return identityUrl;

2
sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
/** /**
* Constants required by OpenID classes * Constants required by OpenID classes

4
sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
View File

@ -12,9 +12,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
import org.acegisecurity.providers.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;

2
sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
/** /**
* Thrown by an OpenIDConsumer if it cannot process a request * Thrown by an OpenIDConsumer if it cannot process a request

4
sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -34,7 +34,7 @@ import java.io.IOException;
* <br/> * <br/>
* <br/> &lt;servlet&gt; * <br/> &lt;servlet&gt;
* <br/> &nbsp;&nbsp; &lt;servlet-name&gt;openid&lt;/servlet-name&gt; * <br/> &nbsp;&nbsp; &lt;servlet-name&gt;openid&lt;/servlet-name&gt;
* <br/> &nbsp;&nbsp; &lt;servlet-class&gt;org.acegisecurity.ui.openid.OpenIDLoginInitiationServlet&lt;/servlet-class&gt; * <br/> &nbsp;&nbsp; &lt;servlet-class&gt;org.springframework.security.ui.openid.OpenIDLoginInitiationServlet&lt;/servlet-class&gt;
* <br/> &nbsp;&nbsp; &lt;load-on-startup&gt;1&lt;/load-on-startup&gt; * <br/> &nbsp;&nbsp; &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
* <br/> &nbsp;&nbsp; &lt;init-param&gt; * <br/> &nbsp;&nbsp; &lt;init-param&gt;
* <br/> &nbsp;&nbsp;&nbsp;&nbsp; &lt;description&gt;The error page - will receive error "message"&lt;/description&gt; * <br/> &nbsp;&nbsp;&nbsp;&nbsp; &lt;description&gt;The error page - will receive error "message"&lt;/description&gt;

18
sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
View File

@ -12,16 +12,16 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationServiceException; import org.springframework.security.AuthenticationServiceException;
import org.acegisecurity.providers.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
import org.acegisecurity.ui.AbstractProcessingFilter; import org.springframework.security.ui.AbstractProcessingFilter;
import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter; import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -40,7 +40,7 @@ public class OpenIDResponseProcessingFilter extends AbstractProcessingFilter {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest) * @see org.springframework.security.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest)
* @Override * @Override
*/ */
public Authentication attemptAuthentication(HttpServletRequest req) public Authentication attemptAuthentication(HttpServletRequest req)
@ -65,7 +65,7 @@ public class OpenIDResponseProcessingFilter extends AbstractProcessingFilter {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.ui.AbstractProcessingFilter#getDefaultFilterProcessesUrl() * @see org.springframework.security.ui.AbstractProcessingFilter#getDefaultFilterProcessesUrl()
* @Override * @Override
*/ */
public String getDefaultFilterProcessesUrl() { public String getDefaultFilterProcessesUrl() {

16
sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
View File

@ -13,15 +13,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationServiceException; import org.springframework.security.AuthenticationServiceException;
import org.acegisecurity.context.SecurityContextHolder; import org.springframework.security.context.SecurityContextHolder;
import org.acegisecurity.providers.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
import org.acegisecurity.ui.AbstractProcessingFilter; import org.springframework.security.ui.AbstractProcessingFilter;
import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter; import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

4
sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
View File

@ -1,6 +1,6 @@
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
/** /**
* @author Ray Krueger * @author Ray Krueger

16
sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid.consumers; package org.springframework.security.ui.openid.consumers;
import com.janrain.openid.consumer.AuthRequest; import com.janrain.openid.consumer.AuthRequest;
import com.janrain.openid.consumer.Consumer; import com.janrain.openid.consumer.Consumer;
@ -21,12 +21,12 @@ import com.janrain.openid.consumer.Response;
import com.janrain.openid.consumer.StatusCode; import com.janrain.openid.consumer.StatusCode;
import com.janrain.openid.store.OpenIDStore; import com.janrain.openid.store.OpenIDStore;
import org.acegisecurity.providers.openid.OpenIDAuthenticationStatus; import org.springframework.security.providers.openid.OpenIDAuthenticationStatus;
import org.acegisecurity.providers.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
import org.acegisecurity.ui.openid.OpenIDConstants; import org.springframework.security.ui.openid.OpenIDConstants;
import org.acegisecurity.ui.openid.OpenIDConsumer; import org.springframework.security.ui.openid.OpenIDConsumer;
import org.acegisecurity.ui.openid.OpenIDConsumerException; import org.springframework.security.ui.openid.OpenIDConsumerException;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
@ -64,7 +64,7 @@ public class JanRainOpenIDConsumer implements OpenIDConsumer, InitializingBean {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.ui.openid.OpenIDConsumer#beginConsumption(java.lang.String) * @see org.springframework.security.ui.openid.OpenIDConsumer#beginConsumption(java.lang.String)
*/ */
public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl) public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl)
throws OpenIDConsumerException { throws OpenIDConsumerException {
@ -110,7 +110,7 @@ public class JanRainOpenIDConsumer implements OpenIDConsumer, InitializingBean {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest) * @see org.springframework.security.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest)
*/ */
public OpenIDAuthenticationToken endConsumption(HttpServletRequest req) public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
throws OpenIDConsumerException { throws OpenIDConsumerException {

10
sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
View File

@ -12,13 +12,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid.consumers; package org.springframework.security.ui.openid.consumers;
import org.acegisecurity.providers.openid.OpenIDAuthenticationStatus; import org.springframework.security.providers.openid.OpenIDAuthenticationStatus;
import org.acegisecurity.providers.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
import org.acegisecurity.ui.openid.OpenIDConsumer; import org.springframework.security.ui.openid.OpenIDConsumer;
import org.acegisecurity.ui.openid.OpenIDConsumerException; import org.springframework.security.ui.openid.OpenIDConsumerException;
import org.openid4java.association.AssociationException; import org.openid4java.association.AssociationException;

14
sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
View File

@ -12,16 +12,16 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.providers.openid; package org.springframework.security.providers.openid;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.acegisecurity.GrantedAuthorityImpl; import org.springframework.security.GrantedAuthorityImpl;
import org.acegisecurity.providers.cas.CasAuthoritiesPopulator; import org.springframework.security.providers.cas.CasAuthoritiesPopulator;
import org.acegisecurity.userdetails.User; import org.springframework.security.userdetails.User;
import org.acegisecurity.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetails;
/** /**

26
sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
View File

@ -12,15 +12,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.providers.openid; package org.springframework.security.providers.openid;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationServiceException; import org.springframework.security.AuthenticationServiceException;
import org.acegisecurity.BadCredentialsException; import org.springframework.security.BadCredentialsException;
import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
/** /**
@ -36,7 +36,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
*/ */
public void testAuthenticateCancel() { public void testAuthenticateCancel() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@ -55,7 +55,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
*/ */
public void testAuthenticateError() { public void testAuthenticateError() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@ -74,7 +74,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
*/ */
public void testAuthenticateFailure() { public void testAuthenticateFailure() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@ -93,7 +93,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
*/ */
public void testAuthenticateSetupNeeded() { public void testAuthenticateSetupNeeded() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@ -112,7 +112,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
*/ */
public void testAuthenticateSuccess() { public void testAuthenticateSuccess() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@ -147,7 +147,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.supports(Class)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.supports(Class)'
*/ */
public void testDoesntSupport() { public void testDoesntSupport() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@ -157,7 +157,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
*/ */
public void testIgnoresUserPassAuthToken() { public void testIgnoresUserPassAuthToken() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@ -168,7 +168,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.supports(Class)' * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.supports(Class)'
*/ */
public void testSupports() { public void testSupports() {
OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();

26
sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
View File

@ -12,21 +12,21 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid; package org.springframework.security.ui.openid;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.AbstractAuthenticationManager; import org.springframework.security.AbstractAuthenticationManager;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.BadCredentialsException; import org.springframework.security.BadCredentialsException;
import org.acegisecurity.providers.cas.CasAuthoritiesPopulator; import org.springframework.security.providers.cas.CasAuthoritiesPopulator;
import org.acegisecurity.providers.openid.MockAuthoritiesPopulator; import org.springframework.security.providers.openid.MockAuthoritiesPopulator;
import org.acegisecurity.providers.openid.OpenIDAuthenticationStatus; import org.springframework.security.providers.openid.OpenIDAuthenticationStatus;
import org.acegisecurity.providers.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
import org.acegisecurity.ui.openid.consumers.MockOpenIDConsumer; import org.springframework.security.ui.openid.consumers.MockOpenIDConsumer;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
@ -44,7 +44,7 @@ public class OpenIDResponseProcessingFilterTests extends TestCase {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
/* /*
* Test method for 'org.acegisecurity.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)' * Test method for 'org.springframework.security.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)'
*/ */
public void testAttemptAuthenticationFailure() { public void testAttemptAuthenticationFailure() {
// set up mock objects // set up mock objects
@ -70,7 +70,7 @@ public class OpenIDResponseProcessingFilterTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)' * Test method for 'org.springframework.security.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)'
*/ */
public void testAttemptAuthenticationHttpServletRequest() { public void testAttemptAuthenticationHttpServletRequest() {
// set up mock objects // set up mock objects
@ -102,7 +102,7 @@ public class OpenIDResponseProcessingFilterTests extends TestCase {
} }
/* /*
* Test method for 'org.acegisecurity.ui.openid.OpenIDResponseProcessingFilter.getDefaultFilterProcessesUrl()' * Test method for 'org.springframework.security.ui.openid.OpenIDResponseProcessingFilter.getDefaultFilterProcessesUrl()'
*/ */
public void testGetDefaultFilterProcessesUrl() { public void testGetDefaultFilterProcessesUrl() {
OpenIDResponseProcessingFilter filter = new OpenIDResponseProcessingFilter(); OpenIDResponseProcessingFilter filter = new OpenIDResponseProcessingFilter();

14
sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
View File

@ -12,12 +12,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ui.openid.consumers; package org.springframework.security.ui.openid.consumers;
import org.acegisecurity.providers.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
import org.acegisecurity.ui.openid.OpenIDConsumer; import org.springframework.security.ui.openid.OpenIDConsumer;
import org.acegisecurity.ui.openid.OpenIDConsumerException; import org.springframework.security.ui.openid.OpenIDConsumerException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -36,7 +36,7 @@ public class MockOpenIDConsumer implements OpenIDConsumer {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.ui.openid.OpenIDConsumer#beginConsumption(javax.servlet.http.HttpServletRequest, java.lang.String) * @see org.springframework.security.ui.openid.OpenIDConsumer#beginConsumption(javax.servlet.http.HttpServletRequest, java.lang.String)
*/ */
public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl) public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl)
throws OpenIDConsumerException { throws OpenIDConsumerException {
@ -44,7 +44,7 @@ public class MockOpenIDConsumer implements OpenIDConsumer {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest) * @see org.springframework.security.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest)
*/ */
public OpenIDAuthenticationToken endConsumption(HttpServletRequest req) public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
throws OpenIDConsumerException { throws OpenIDConsumerException {
@ -61,7 +61,7 @@ public class MockOpenIDConsumer implements OpenIDConsumer {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.acegisecurity.ui.openid.OpenIDConsumer#setReturnToUrl(java.lang.String) * @see org.springframework.security.ui.openid.OpenIDConsumer#setReturnToUrl(java.lang.String)
*/ */
public void setReturnToUrl(String returnToUrl) { public void setReturnToUrl(String returnToUrl) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

2
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
/** /**
* @author Luke * @author Luke

2
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
/** /**
* @author Luke * @author Luke

2
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
/** /**
* @author Luke * @author Luke

2
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
/** /**
* @author Luke * @author Luke

2
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
import javax.naming.ldap.Control; import javax.naming.ldap.Control;

4
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
View File

@ -13,9 +13,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
import org.acegisecurity.ldap.ppolicy.PasswordPolicyControl; import org.springframework.security.ldap.ppolicy.PasswordPolicyControl;
import javax.naming.ldap.Control; import javax.naming.ldap.Control;
import javax.naming.ldap.ControlFactory; import javax.naming.ldap.ControlFactory;

4
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
View File

@ -1,6 +1,6 @@
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
/** /**
* @author Luke * @author Luke

8
sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
import netscape.ldap.ber.stream.BERChoice; import netscape.ldap.ber.stream.BERChoice;
import netscape.ldap.ber.stream.BERElement; import netscape.ldap.ber.stream.BERElement;
@ -28,8 +28,8 @@ import netscape.ldap.ber.stream.BERSequence;
import netscape.ldap.ber.stream.BERTag; import netscape.ldap.ber.stream.BERTag;
import netscape.ldap.ber.stream.BERTagDecoder; import netscape.ldap.ber.stream.BERTagDecoder;
import org.acegisecurity.ldap.LdapDataAccessException; import org.springframework.security.ldap.LdapDataAccessException;
import org.acegisecurity.ldap.ppolicy.PasswordPolicyControl; import org.springframework.security.ldap.ppolicy.PasswordPolicyControl;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -50,7 +50,7 @@ import java.io.InputStream;
* @author Luke Taylor * @author Luke Taylor
* @version $Id: PasswordPolicyResponseControl.java 1496 2006-05-23 13:38:33Z benalex $ * @version $Id: PasswordPolicyResponseControl.java 1496 2006-05-23 13:38:33Z benalex $
* *
* @see org.acegisecurity.ldap.ppolicy.PasswordPolicyControl * @see org.springframework.security.ldap.ppolicy.PasswordPolicyControl
* @see <a href="http://www.ibm.com/developerworks/tivoli/library/t-ldap-controls/">Stefan Zoerner's IBM developerworks * @see <a href="http://www.ibm.com/developerworks/tivoli/library/t-ldap-controls/">Stefan Zoerner's IBM developerworks
* article on LDAP controls.</a> * article on LDAP controls.</a>
*/ */

12
sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java
View File

@ -1,11 +1,9 @@
package org.acegisecurity.providers.ldap.authenticator; package org.springframework.security.providers.ldap.authenticator;
import org.acegisecurity.ldap.InitialDirContextFactory; import org.springframework.security.ldap.InitialDirContextFactory;
import org.acegisecurity.ldap.DefaultInitialDirContextFactory; import org.springframework.security.ldap.ppolicy.PasswordExpiredException;
import org.acegisecurity.ldap.ppolicy.PasswordExpiredException; import org.springframework.security.ldap.ppolicy.AccountLockedException;
import org.acegisecurity.ldap.ppolicy.AccountLockedException; import org.springframework.security.ldap.ppolicy.PasswordPolicyException;
import org.acegisecurity.ldap.ppolicy.PasswordPolicyException;
import org.acegisecurity.ldap.ppolicy.PasswordInHistoryException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

11
sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
View File

@ -13,16 +13,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.ldap.ppolicy; package org.springframework.security.ldap.ppolicy;
import junit.framework.TestCase; import junit.framework.TestCase;
import javax.naming.Context;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.Control; import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
import java.util.Hashtable;
/** /**
* Tests for <tt>PasswordPolicyResponse</tt>. * Tests for <tt>PasswordPolicyResponse</tt>.
@ -41,8 +38,8 @@ public class PasswordPolicyResponseControlTests extends TestCase {
// env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); // env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
// env.put(Context.PROVIDER_URL, "ldap://gorille:389/"); // env.put(Context.PROVIDER_URL, "ldap://gorille:389/");
// env.put(Context.SECURITY_AUTHENTICATION, "simple"); // env.put(Context.SECURITY_AUTHENTICATION, "simple");
// env.put(Context.SECURITY_PRINCIPAL, "cn=manager,dc=acegisecurity,dc=org"); // env.put(Context.SECURITY_PRINCIPAL, "cn=manager,dc=security,dc=org");
// env.put(Context.SECURITY_CREDENTIALS, "acegisecurity"); // env.put(Context.SECURITY_CREDENTIALS, "security");
// env.put(LdapContext.CONTROL_FACTORIES, PasswordPolicyControlFactory.class.getName()); // env.put(LdapContext.CONTROL_FACTORIES, PasswordPolicyControlFactory.class.getName());
// //
// InitialLdapContext ctx = new InitialLdapContext(env, null); // InitialLdapContext ctx = new InitialLdapContext(env, null);
@ -52,7 +49,7 @@ public class PasswordPolicyResponseControlTests extends TestCase {
// ctx.setRequestControls(rctls); // ctx.setRequestControls(rctls);
// //
// try { // try {
// ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, "uid=bob,ou=people,dc=acegisecurity,dc=org" ); // ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, "uid=bob,ou=people,dc=security,dc=org" );
// ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, "bobspassword"); // ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, "bobspassword");
// Object o = ctx.lookup(""); // Object o = ctx.lookup("");
// //

6
sandbox/spring-security-config/pom.xml
View File

@ -2,18 +2,18 @@
<project> <project>
<parent> <parent>
<artifactId>acegi-security-sandbox</artifactId> <artifactId>acegi-security-sandbox</artifactId>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId> <artifactId>spring-security-config</artifactId>
<name>spring-security-config</name> <name>spring-security-config</name>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-tiger</artifactId> <artifactId>acegi-security-tiger</artifactId>
<version>1.0.6-SNAPSHOT</version> <version>1.0.6-SNAPSHOT</version>
</dependency> </dependency>

12
sandbox/spring-security-config/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd
View File

@ -91,7 +91,7 @@
type="RememberMeFilter"> type="RememberMeFilter">
<xsd:annotation> <xsd:annotation>
<xsd:documentation <xsd:documentation
source="org.acegisecurity.ui.rememberme.RememberMeProcessingFilter"> source="org.springframework.security.ui.rememberme.RememberMeProcessingFilter">
<![CDATA[ <![CDATA[
makes the filter, but does little else, as it auto-detects everything makes the filter, but does little else, as it auto-detects everything
]]> ]]>
@ -243,10 +243,10 @@
type="AuthenticationManager"> type="AuthenticationManager">
<xsd:annotation> <xsd:annotation>
<xsd:documentation <xsd:documentation
source="org.acegisecurity.providers.ProviderManager"> source="org.springframework.security.providers.ProviderManager">
<![CDATA[ <![CDATA[
Resolves to 'org.acegisecurity.providers.ProviderManager' Resolves to 'org.springframework.security.providers.ProviderManager'
]]> ]]>
</xsd:documentation> </xsd:documentation>
</xsd:annotation> </xsd:annotation>
</xsd:element> </xsd:element>
@ -272,7 +272,7 @@
<xsd:element name="authentication-jdbc"> <xsd:element name="authentication-jdbc">
<xsd:annotation> <xsd:annotation>
<xsd:documentation <xsd:documentation
source="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> source="org.springframework.security.providers.dao.DaoAuthenticationProvider">
<![CDATA[ <![CDATA[
if not specified will be auto-tetected from the ApplicationContext and tried in order if not specified will be auto-tetected from the ApplicationContext and tried in order
]]> ]]>
@ -286,7 +286,7 @@
<xsd:element name="authentication-ldap"> <xsd:element name="authentication-ldap">
<xsd:annotation> <xsd:annotation>
<xsd:documentation <xsd:documentation
source="org.acegisecurity.providers.ldap.LdapAuthenticationProvider"> source="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
<![CDATA[ <![CDATA[
if not specified will be auto-tetected from the ApplicationContext and tried in order if not specified will be auto-tetected from the ApplicationContext and tried in order
]]> ]]>

30
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/applicationContext-acegi-security.xml
View File

@ -23,7 +23,7 @@
<bean id="filterChainProxy" <bean id="filterChainProxy"
class="org.acegisecurity.util.FilterChainProxy"> class="org.springframework.security.util.FilterChainProxy">
<property name="filterInvocationDefinitionSource"> <property name="filterInvocationDefinitionSource">
<value> <value>
CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@ -48,7 +48,7 @@
<bean id="securityContextLogoutHandler" <bean id="securityContextLogoutHandler"
class="org.acegisecurity.ui.logout.SecurityContextLogoutHandler" /> class="org.springframework.security.ui.logout.SecurityContextLogoutHandler" />
<!-- the URLs are all mandatory and have no defaults (well, except authenticationUrl) --> <!-- the URLs are all mandatory and have no defaults (well, except authenticationUrl) -->
<security:authentication-form id="authenticationProcessingFilter" <security:authentication-form id="authenticationProcessingFilter"
@ -72,14 +72,14 @@
<bean id="securityContextHolderAwareRequestFilter" <bean id="securityContextHolderAwareRequestFilter"
class="org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter" /> class="org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter" />
<!-- makes the filter, but does little else, as it auto-detects everything --> <!-- makes the filter, but does little else, as it auto-detects everything -->
<security:authentication-remember-me-filter <security:authentication-remember-me-filter
id="rememberMeProcessingFilter" /> id="rememberMeProcessingFilter" />
<bean id="anonymousProcessingFilter" <bean id="anonymousProcessingFilter"
class="org.acegisecurity.providers.anonymous.AnonymousProcessingFilter"> class="org.springframework.security.providers.anonymous.AnonymousProcessingFilter">
<property name="key" value="changeThis" /> <property name="key" value="changeThis" />
<property name="userAttribute" <property name="userAttribute"
value="anonymousUser,ROLE_ANONYMOUS" /> value="anonymousUser,ROLE_ANONYMOUS" />
@ -95,31 +95,31 @@
<bean id="authenticationEntryPoint" <bean id="authenticationEntryPoint"
class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint"> class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
<property name="loginFormUrl" value="/acegilogin.jsp" /> <property name="loginFormUrl" value="/acegilogin.jsp" />
<property name="forceHttps" value="false" /> <property name="forceHttps" value="false" />
</bean> </bean>
<bean id="accessDeniedHandler" <bean id="accessDeniedHandler"
class="org.acegisecurity.ui.AccessDeniedHandlerImpl"> class="org.springframework.security.ui.AccessDeniedHandlerImpl">
<property name="errorPage" value="/accessDenied.jsp" /> <property name="errorPage" value="/accessDenied.jsp" />
</bean> </bean>
<bean id="filterInvocationInterceptor" <bean id="filterInvocationInterceptor"
class="org.acegisecurity.intercept.web.FilterSecurityInterceptor"> class="org.springframework.security.intercept.web.FilterSecurityInterceptor">
<property name="authenticationManager" <property name="authenticationManager"
ref="authenticationManager" /> ref="authenticationManager" />
<property name="accessDecisionManager"> <property name="accessDecisionManager">
<bean class="org.acegisecurity.vote.AffirmativeBased"> <bean class="org.springframework.security.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" <property name="allowIfAllAbstainDecisions"
value="false" /> value="false" />
<property name="decisionVoters"> <property name="decisionVoters">
<list> <list>
<bean class="org.acegisecurity.vote.RoleVoter" /> <bean class="org.springframework.security.vote.RoleVoter" />
<bean <bean
class="org.acegisecurity.vote.AuthenticatedVoter" /> class="org.springframework.security.vote.AuthenticatedVoter" />
</list> </list>
</property> </property>
</bean> </bean>
@ -137,16 +137,16 @@
<!--<bean id="authenticationManager" <!--<bean id="authenticationManager"
class="org.acegisecurity.providers.ProviderManager"> class="org.springframework.security.providers.ProviderManager">
<property name="providers"> <property name="providers">
<list> <list>
<ref local="daoAuthenticationProvider" /> <ref local="daoAuthenticationProvider" />
<bean <bean
class="org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider"> class="org.springframework.security.providers.anonymous.AnonymousAuthenticationProvider">
<property name="key" value="changeThis" /> <property name="key" value="changeThis" />
</bean> </bean>
<bean <bean
class="org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider"> class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider">
<property name="key" value="changeThis" /> <property name="key" value="changeThis" />
</bean> </bean>
</list> </list>
@ -154,7 +154,7 @@
</bean>--> </bean>-->
<bean id="userCache" <bean id="userCache"
class="org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache"> class="org.springframework.security.providers.dao.cache.EhCacheBasedUserCache">
<property name="cache"> <property name="cache">
<bean <bean
class="org.springframework.cache.ehcache.EhCacheFactoryBean"> class="org.springframework.cache.ehcache.EhCacheFactoryBean">
@ -169,6 +169,6 @@
<!-- This bean is optional; it isn't used by any other bean as it only listens and logs --> <!-- This bean is optional; it isn't used by any other bean as it only listens and logs -->
<bean id="loggerListener" <bean id="loggerListener"
class="org.acegisecurity.event.authentication.LoggerListener" /> class="org.springframework.security.event.authentication.LoggerListener" />
</beans> </beans>

6
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-beanRef-attributes.xml
View File

@ -15,7 +15,7 @@
</security:authentication-repository> </security:authentication-repository>
<bean id="refToUserDetailsService" <bean id="refToUserDetailsService"
class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"> <property name="dataSource">
<ref bean="dataSource" /> <ref bean="dataSource" />
</property> </property>
@ -39,13 +39,13 @@
</bean> </bean>
<bean id="refToSaltSource" <bean id="refToSaltSource"
class="org.acegisecurity.providers.dao.salt.SystemWideSaltSource"> class="org.springframework.security.providers.dao.salt.SystemWideSaltSource">
<property name="systemWideSalt"> <property name="systemWideSalt">
<value>12345</value> <value>12345</value>
</property> </property>
</bean> </bean>
<bean id="refToPasswordEncoder" <bean id="refToPasswordEncoder"
class="org.acegisecurity.providers.encoding.Md5PasswordEncoder" /> class="org.springframework.security.providers.encoding.Md5PasswordEncoder" />
</beans> </beans>

6
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-dao-defaults.xml
View File

@ -19,7 +19,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
</security:authentication-repository> </security:authentication-repository>
<bean id="userDetailsService" <bean id="userDetailsService"
class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"> <property name="dataSource">
<ref bean="dataSource" /> <ref bean="dataSource" />
</property> </property>
@ -43,12 +43,12 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
</bean> </bean>
<bean id="saltSource" <bean id="saltSource"
class="org.acegisecurity.providers.dao.salt.SystemWideSaltSource"> class="org.springframework.security.providers.dao.salt.SystemWideSaltSource">
<property name="systemWideSalt"> <property name="systemWideSalt">
<value>12345</value> <value>12345</value>
</property> </property>
</bean> </bean>
<bean id="passwordEncoder" <bean id="passwordEncoder"
class="org.acegisecurity.providers.encoding.Md5PasswordEncoder" /> class="org.springframework.security.providers.encoding.Md5PasswordEncoder" />
</beans> </beans>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-defaults.xml
View File

@ -14,7 +14,7 @@
<security:authentication-repository id="authenticationRepository"/> <security:authentication-repository id="authenticationRepository"/>
<bean id="userDetailsService" <bean id="userDetailsService"
class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"> <property name="dataSource">
<ref bean="dataSource" /> <ref bean="dataSource" />
</property> </property>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-form-filter.xml
View File

@ -29,7 +29,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
id="rememberMeServices" key="someValue" /> id="rememberMeServices" key="someValue" />
<bean id="userDetailsService" <bean id="userDetailsService"
class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"> <property name="dataSource">
<ref bean="dataSource" /> <ref bean="dataSource" />
</property> </property>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-innerbeans.xml
View File

@ -24,7 +24,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
</security:authentication-repository> </security:authentication-repository>
<bean id="AnyBeanIdAsThisBeanWillBeAutoDetectedAndInjectedInauthenticationRepositoryUsingAutoWireByType" <bean id="AnyBeanIdAsThisBeanWillBeAutoDetectedAndInjectedInauthenticationRepositoryUsingAutoWireByType"
class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"> <property name="dataSource">
<ref bean="dataSource" /> <ref bean="dataSource" />
</property> </property>

8
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-http-config.xml
View File

@ -29,18 +29,18 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
<!--<bean id="filterInvocationInterceptor" <!--<bean id="filterInvocationInterceptor"
class="org.acegisecurity.intercept.web.FilterSecurityInterceptor"> class="org.springframework.security.intercept.web.FilterSecurityInterceptor">
<property name="authenticationManager" <property name="authenticationManager"
ref="authenticationManager" /> ref="authenticationManager" />
<property name="accessDecisionManager"> <property name="accessDecisionManager">
<bean class="org.acegisecurity.vote.AffirmativeBased"> <bean class="org.springframework.security.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" <property name="allowIfAllAbstainDecisions"
value="false" /> value="false" />
<property name="decisionVoters"> <property name="decisionVoters">
<list> <list>
<bean class="org.acegisecurity.vote.RoleVoter" /> <bean class="org.springframework.security.vote.RoleVoter" />
<bean <bean
class="org.acegisecurity.vote.AuthenticatedVoter" /> class="org.springframework.security.vote.AuthenticatedVoter" />
</list> </list>
</property> </property>
</bean> </bean>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-annotations.xml
View File

@ -30,7 +30,7 @@
springAop="true" > springAop="true" >
<security:url-mapping source="annotations"> <security:url-mapping source="annotations">
<security:method-pattern <security:method-pattern
type="org.acegisecurity.BankServiceImpl.listAccounts"> type="org.springframework.security.BankServiceImpl.listAccounts">
<security:configuration-attribute attribute="ROLE_A" /> <security:configuration-attribute attribute="ROLE_A" />
<security:configuration-attribute attribute="ROLE_B" /> <security:configuration-attribute attribute="ROLE_B" />
</security:method-pattern> </security:method-pattern>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-aspectj.xml
View File

@ -30,7 +30,7 @@
aspectj="true" > aspectj="true" >
<security:url-mapping source="annotations"> <security:url-mapping source="annotations">
<security:method-pattern <security:method-pattern
type="org.acegisecurity.BankServiceImpl.listAccounts"> type="org.springframework.security.BankServiceImpl.listAccounts">
<security:configuration-attribute attribute="ROLE_A" /> <security:configuration-attribute attribute="ROLE_A" />
<security:configuration-attribute attribute="ROLE_B" /> <security:configuration-attribute attribute="ROLE_B" />
</security:method-pattern> </security:method-pattern>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-attributes.xml
View File

@ -30,7 +30,7 @@
springAop="true" > springAop="true" >
<security:url-mapping source="attributes"> <security:url-mapping source="attributes">
<security:method-pattern <security:method-pattern
type="org.acegisecurity.BankServiceImpl.listAccounts"> type="org.springframework.security.BankServiceImpl.listAccounts">
<security:configuration-attribute attribute="ROLE_A" /> <security:configuration-attribute attribute="ROLE_A" />
<security:configuration-attribute attribute="ROLE_B" /> <security:configuration-attribute attribute="ROLE_B" />
</security:method-pattern> </security:method-pattern>

8
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method.xml
View File

@ -30,7 +30,7 @@
springAop="true" > springAop="true" >
<security:url-mapping source="xml"> <security:url-mapping source="xml">
<security:method-pattern <security:method-pattern
type="org.acegisecurity.BankServiceImpl.listAccounts"> type="org.springframework.security.BankServiceImpl.listAccounts">
<security:configuration-attribute attribute="ROLE_A" /> <security:configuration-attribute attribute="ROLE_A" />
</security:method-pattern> </security:method-pattern>
</security:url-mapping> </security:url-mapping>
@ -38,7 +38,7 @@
<!-- <!--
<bean id="methodSecurity" class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor"> <bean id="methodSecurity" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
<property name="validateConfigAttributes"><value>true</value></property> <property name="validateConfigAttributes"><value>true</value></property>
<property name="authenticationManager"><ref bean="authenticationManager"/></property> <property name="authenticationManager"><ref bean="authenticationManager"/></property>
<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property> <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@ -46,8 +46,8 @@
<property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property> <property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
<property name="objectDefinitionSource"> <property name="objectDefinitionSource">
<value> <value>
org.acegisecurity.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER org.springframework.security.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER
org.acegisecurity.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER org.springframework.security.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER
</value> </value>
</property> </property>
</bean> </bean>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/auto-config.xml
View File

@ -26,7 +26,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
resource="classpath:org/acegisecurity/config/user.properties" /> resource="classpath:org/acegisecurity/config/user.properties" />
</security:principal-repository> </security:principal-repository>
<bean id="bankService" class="org.acegisecurity.BankServiceImpl"/> <bean id="bankService" class="org.springframework.security.BankServiceImpl"/>
</beans> </beans>

6
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-autodetect-handler.xml
View File

@ -20,17 +20,17 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
</security:exception-translation> </security:exception-translation>
<bean id="theBeanToUse" <bean id="theBeanToUse"
class="org.acegisecurity.ui.AccessDeniedHandlerImpl"> class="org.springframework.security.ui.AccessDeniedHandlerImpl">
<property name="errorPage" value="/accessDenied.jsp" /> <property name="errorPage" value="/accessDenied.jsp" />
</bean> </bean>
<!--<bean id="anotherBeanToUse" <!--<bean id="anotherBeanToUse"
class="org.acegisecurity.ui.AccessDeniedHandlerImpl"> class="org.springframework.security.ui.AccessDeniedHandlerImpl">
<property name="errorPage" value="/accessDenied.jsp" /> <property name="errorPage" value="/accessDenied.jsp" />
</bean>--> </bean>-->
<bean id="authenticationProcessingFilterEntryPoint" <bean id="authenticationProcessingFilterEntryPoint"
class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint"> class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
<property name="loginFormUrl"> <property name="loginFormUrl">
<value>/acegilogin.jsp</value> <value>/acegilogin.jsp</value>
</property> </property>

4
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-beanref.xml
View File

@ -22,12 +22,12 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
</security:exception-translation> </security:exception-translation>
<bean id="theBeanToUse" <bean id="theBeanToUse"
class="org.acegisecurity.ui.AccessDeniedHandlerImpl"> class="org.springframework.security.ui.AccessDeniedHandlerImpl">
<property name="errorPage" value="/accessDenied.jsp" /> <property name="errorPage" value="/accessDenied.jsp" />
</bean> </bean>
<bean id="authenticationProcessingFilterEntryPoint" <bean id="authenticationProcessingFilterEntryPoint"
class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint"> class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
<property name="loginFormUrl"> <property name="loginFormUrl">
<value>/acegilogin.jsp</value> <value>/acegilogin.jsp</value>
</property> </property>

8
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/ldap-config.xml
View File

@ -27,7 +27,7 @@
<!--<bean id="initialDirContextFactory" <!--<bean id="initialDirContextFactory"
class="org.acegisecurity.ldap.DefaultInitialDirContextFactory"> class="org.springframework.security.ldap.DefaultInitialDirContextFactory">
<constructor-arg <constructor-arg
value="ldap://monkeymachine:389/dc=acegisecurity,dc=org" /> value="ldap://monkeymachine:389/dc=acegisecurity,dc=org" />
<property name="managerDn"> <property name="managerDn">
@ -39,10 +39,10 @@
</bean> </bean>
<bean id="ldapAuthProvider" <bean id="ldapAuthProvider"
class="org.acegisecurity.providers.ldap.LdapAuthenticationProvider"> class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
<constructor-arg> <constructor-arg>
<bean <bean
class="org.acegisecurity.providers.ldap.authenticator.BindAuthenticator"> class="org.springframework.security.providers.ldap.authenticator.BindAuthenticator">
<constructor-arg> <constructor-arg>
<ref local="initialDirContextFactory" /> <ref local="initialDirContextFactory" />
</constructor-arg> </constructor-arg>
@ -55,7 +55,7 @@
</constructor-arg> </constructor-arg>
<constructor-arg> <constructor-arg>
<bean <bean
class="org.acegisecurity.providers.ldap.populator.DefaultLdapAuthoritiesPopulator"> class="org.springframework.security.providers.ldap.populator.DefaultLdapAuthoritiesPopulator">
<constructor-arg> <constructor-arg>
<ref local="initialDirContextFactory" /> <ref local="initialDirContextFactory" />
</constructor-arg> </constructor-arg>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/logout-filter-with-handlers.xml
View File

@ -21,7 +21,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
id="rememberMeServices" key="someValue" /> id="rememberMeServices" key="someValue" />
<bean id="SecurityContextLogoutHandler" <bean id="SecurityContextLogoutHandler"
class="org.acegisecurity.ui.logout.SecurityContextLogoutHandler" /> class="org.springframework.security.ui.logout.SecurityContextLogoutHandler" />
<security:principal-repository id="userDetailsService"> <security:principal-repository id="userDetailsService">
<security:user-definition username="vishal" <security:user-definition username="vishal"

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml
View File

@ -37,7 +37,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
<security:authentication-repository id="authenticationRepository" /> <security:authentication-repository id="authenticationRepository" />
<bean id="userDetailsService" <bean id="userDetailsService"
class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"> <property name="dataSource">
<ref bean="dataSource" /> <ref bean="dataSource" />
</property> </property>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml
View File

@ -38,7 +38,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
<security:authentication-repository id="authenticationRepository" /> <security:authentication-repository id="authenticationRepository" />
<bean id="userDetailsService" <bean id="userDetailsService"
class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"> <property name="dataSource">
<ref bean="dataSource" /> <ref bean="dataSource" />
</property> </property>

2
sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/session-context-integration-defaults.xml
View File

@ -36,7 +36,7 @@
same story here, inner beans allowed same story here, inner beans allowed
</security:authentication-repository> </security:authentication-repository>
<bean id="userDetails" class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> <bean id="userDetails" class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource"><ref bean="dataSource"/></property> <property name="dataSource"><ref bean="dataSource"/></property>
</bean> </bean>

4
sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.webwork; package org.springframework.security.webwork;
import java.util.Map; import java.util.Map;
@ -21,7 +21,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.acegisecurity.ui.ExceptionTranslationFilter; import org.springframework.security.ui.ExceptionTranslationFilter;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

4
sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java
View File

@ -12,12 +12,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.webwork; package org.springframework.security.webwork;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import org.acegisecurity.ui.ExceptionTranslationFilter; import org.springframework.security.ui.ExceptionTranslationFilter;
import com.opensymphony.webwork.dispatcher.DispatcherUtils; import com.opensymphony.webwork.dispatcher.DispatcherUtils;