From c3507b26c9be2860c3c03de9421368506baf9f54 Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Tue, 23 Mar 2004 04:44:48 +0000 Subject: [PATCH] Change to Apache License version 2.0. --- .../catalina/CatalinaAcegiUserRealm.java | 16 +- .../adapters/jboss/JbossAcegiLoginModule.java | 16 +- .../jboss/JbossIntegrationFilter.java | 21 +- .../adapters/jetty/JettyAcegiUserRealm.java | 16 +- .../adapters/jetty/JettyAcegiUserToken.java | 16 +- .../resin/ResinAcegiAuthenticator.java | 16 +- .../acegisecurity/AccessDecisionManager.java | 23 +- .../acegisecurity/AccessDeniedException.java | 16 +- .../acegisecurity/AcegiSecurityException.java | 18 +- .../org/acegisecurity/Authentication.java | 16 +- ...nticationCredentialsNotFoundException.java | 16 +- .../AuthenticationException.java | 16 +- .../acegisecurity/AuthenticationManager.java | 18 +- .../AuthenticationServiceException.java | 16 +- .../BadCredentialsException.java | 16 +- .../org/acegisecurity/ConfigAttribute.java | 16 +- .../ConfigAttributeDefinition.java | 16 +- .../acegisecurity/ConfigAttributeEditor.java | 19 +- .../org/acegisecurity/DisabledException.java | 16 +- .../org/acegisecurity/GrantedAuthority.java | 16 +- .../acegisecurity/GrantedAuthorityImpl.java | 16 +- .../org/acegisecurity/LockedException.java | 16 +- .../MethodDefinitionAttributes.java | 28 +- .../acegisecurity/MethodDefinitionMap.java | 59 ++-- .../acegisecurity/MethodDefinitionSource.java | 16 +- .../MethodDefinitionSourceEditor.java | 18 +- .../java/org/acegisecurity/RunAsManager.java | 19 +- .../org/acegisecurity/SecurityConfig.java | 16 +- .../acegisecurity/SecurityInterceptor.java | 16 +- .../AbstractAdapterAuthenticationToken.java | 18 +- .../adapters/AbstractIntegrationFilter.java | 34 ++- .../acegisecurity/adapters/AuthByAdapter.java | 16 +- .../adapters/AuthByAdapterProvider.java | 29 +- .../adapters/AutoIntegrationFilter.java | 16 +- .../HttpRequestIntegrationFilter.java | 16 +- .../adapters/PrincipalAcegiUserToken.java | 16 +- .../org/acegisecurity/context/Context.java | 20 +- .../context/ContextException.java | 18 +- .../acegisecurity/context/ContextHolder.java | 16 +- .../context/ContextHolderEmptyException.java | 16 +- .../acegisecurity/context/ContextImpl.java | 16 +- .../context/ContextInterceptor.java | 18 +- .../context/ContextInvalidException.java | 16 +- .../acegisecurity/context/SecureContext.java | 16 +- .../context/SecureContextImpl.java | 16 +- .../AbstractAuthenticationToken.java | 16 +- .../providers/AuthenticationProvider.java | 18 +- .../providers/ProviderManager.java | 32 ++- .../providers/ProviderNotFoundException.java | 16 +- .../TestingAuthenticationProvider.java | 18 +- .../providers/TestingAuthenticationToken.java | 18 +- .../UsernamePasswordAuthenticationToken.java | 21 +- .../dao/DaoAuthenticationProvider.java | 31 ++- .../dao/UsernameNotFoundException.java | 16 +- .../RunAsImplAuthenticationProvider.java | 29 +- .../acegisecurity/runas/RunAsManagerImpl.java | 36 ++- .../acegisecurity/runas/RunAsUserToken.java | 19 +- .../taglibs/authz/AuthorizeTag.java | 16 +- .../org/acegisecurity/userdetails/User.java | 18 +- .../userdetails/UserDetailsService.java | 19 +- .../userdetails/jdbc/JdbcDaoImpl.java | 37 ++- .../userdetails/memory/InMemoryDaoImpl.java | 22 +- .../memory/UserAttributeDefinition.java | 16 +- .../memory/UserAttributeEditor.java | 19 +- .../userdetails/memory/UserMap.java | 16 +- .../userdetails/memory/UserMapEditor.java | 20 +- .../vote/AbstractAccessDecisionManager.java | 27 +- .../vote/AccessDecisionVoter.java | 31 ++- .../acegisecurity/vote/AffirmativeBased.java | 21 +- .../acegisecurity/vote/ConsensusBased.java | 24 +- .../org/acegisecurity/vote/RoleVoter.java | 25 +- .../acegisecurity/vote/UnanimousBased.java | 21 +- .../org/acegisecurity/BankSecurityVoter.java | 16 +- .../acegisecurity/ExoticSecureContext.java | 16 +- .../java/org/acegisecurity/SecurityTests.java | 16 +- .../adapters/AuthByAdapterTests.java | 16 +- .../attribute/AttributesTests.java | 16 +- .../attribute/MockAttributes.java | 16 +- .../attribute/MockMethodInvocation.java | 16 +- .../attribute/TestAttributes.java | 16 +- .../acegisecurity/attribute/TestService.java | 16 +- .../attribute/TestServiceImpl.java | 16 +- .../org/acegisecurity/context/Account.java | 16 +- .../acegisecurity/context/BankManager.java | 16 +- .../context/BankManagerImpl.java | 16 +- .../acegisecurity/context/ContextTests.java | 16 +- .../acegisecurity/context/ExoticContext.java | 16 +- .../dao/memory/InMemoryDaoTests.java | 16 +- .../runas/BankManagerPublicFacade.java | 16 +- .../org/acegisecurity/runas/RunAsTests.java | 16 +- .../authz/AuthorizeTagAttributeTests.java | 22 +- .../taglibs/authz/AuthorizeTagTests.java | 20 +- .../acegisecurity/vote/VoterManagerTests.java | 16 +- .../java/org/acegisecurity/vote/XVoter.java | 16 +- .../java/org/acegisecurity/vote/YVoter.java | 16 +- .../web/ContactsWarTests.java | 16 +- jalopy.xml | 4 +- license.txt | 259 ++++++++++++++---- notice.txt | 26 ++ .../java/sample/attributes/BankService.java | 16 +- .../sample/attributes/BankServiceImpl.java | 16 +- .../java/sample/attributes/BankTests.java | 21 +- .../src/main/java/sample/attributes/Main.java | 27 +- .../src/main/java/sample/contact/Contact.java | 16 +- .../java/sample/contact/ContactManager.java | 16 +- .../sample/contact/ContactManagerBackend.java | 32 ++- .../sample/contact/ContactManagerFacade.java | 24 +- .../sample/contact/ContactSecurityVoter.java | 22 +- .../java/sample/contact/DeleteController.java | 22 +- .../sample/contact/PublicIndexController.java | 22 +- .../sample/contact/SecureIndexController.java | 24 +- .../main/java/sample/contact/WebContact.java | 16 +- .../contact/WebContactAddController.java | 20 +- .../sample/contact/WebContactValidator.java | 16 +- 114 files changed, 1745 insertions(+), 690 deletions(-) create mode 100644 notice.txt diff --git a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java b/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java index bda6830aa4..e7572d3e58 100644 --- a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java +++ b/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters.catalina; diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java index 5abe9a5774..77473fca6c 100644 --- a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java +++ b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters.jboss; diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java index 1a3aa74e7a..f85a67c4a9 100644 --- a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java +++ b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters.jboss; @@ -45,7 +53,7 @@ public class JbossIntegrationFilter extends AbstractIntegrationFilter { } catch (NamingException ne) { if (super.logger.isDebugEnabled()) { super.logger.warn("Lookup on Subject failed " - + ne.getLocalizedMessage()); + + ne.getLocalizedMessage()); } } @@ -57,8 +65,7 @@ public class JbossIntegrationFilter extends AbstractIntegrationFilter { if (super.logger.isDebugEnabled()) { super.logger.debug("Found Principal in container (" - + p.getClass().getName() + ") : " - + p.getName()); + + p.getClass().getName() + ") : " + p.getName()); } if (p instanceof Authentication) { diff --git a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java index 76b14aacaf..5bbe102adb 100644 --- a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java +++ b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters.jetty; diff --git a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java index ace27aa91e..6b43784ee4 100644 --- a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java +++ b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters.jetty; diff --git a/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java b/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java index b01863c3c8..2cbbe5654e 100644 --- a/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java +++ b/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters.resin; diff --git a/core/src/main/java/org/acegisecurity/AccessDecisionManager.java b/core/src/main/java/org/acegisecurity/AccessDecisionManager.java index 4903181f61..fba4d0c533 100644 --- a/core/src/main/java/org/acegisecurity/AccessDecisionManager.java +++ b/core/src/main/java/org/acegisecurity/AccessDecisionManager.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -30,15 +38,14 @@ public interface AccessDecisionManager { * @throws AccessDeniedException if access is denied */ public void decide(Authentication authentication, - MethodInvocation invocation, - ConfigAttributeDefinition config) - throws AccessDeniedException; + MethodInvocation invocation, ConfigAttributeDefinition config) + throws AccessDeniedException; /** * Indicates whether this AccessDecisionManager is able to * process authorization requests presented with the passed * ConfigAttribute. - * + * *

* This allows the SecurityInterceptor to check every * configuration attribute can be consumed by the configured diff --git a/core/src/main/java/org/acegisecurity/AccessDeniedException.java b/core/src/main/java/org/acegisecurity/AccessDeniedException.java index 55e44c9638..1ecfafdee1 100644 --- a/core/src/main/java/org/acegisecurity/AccessDeniedException.java +++ b/core/src/main/java/org/acegisecurity/AccessDeniedException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/AcegiSecurityException.java b/core/src/main/java/org/acegisecurity/AcegiSecurityException.java index e12c43a5e0..c17d5b691a 100644 --- a/core/src/main/java/org/acegisecurity/AcegiSecurityException.java +++ b/core/src/main/java/org/acegisecurity/AcegiSecurityException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -13,7 +21,7 @@ import org.springframework.core.NestedRuntimeException; /** * Abstract superclass for all exceptions thrown in the security package and * subpackages. - * + * *

* Note that this is a runtime (unchecked) exception. Security exceptions are * usually fatal; there is no reason for them to be checked. diff --git a/core/src/main/java/org/acegisecurity/Authentication.java b/core/src/main/java/org/acegisecurity/Authentication.java index a6cde31ee3..4120975acf 100644 --- a/core/src/main/java/org/acegisecurity/Authentication.java +++ b/core/src/main/java/org/acegisecurity/Authentication.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java b/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java index 46e44344d6..567ba55a71 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java +++ b/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/AuthenticationException.java b/core/src/main/java/org/acegisecurity/AuthenticationException.java index a03b83930b..2dae104b86 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationException.java +++ b/core/src/main/java/org/acegisecurity/AuthenticationException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/AuthenticationManager.java b/core/src/main/java/org/acegisecurity/AuthenticationManager.java index 1e8da4c828..86d149f607 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationManager.java +++ b/core/src/main/java/org/acegisecurity/AuthenticationManager.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -57,5 +65,5 @@ public interface AuthenticationManager { * @throws AuthenticationException if authentication fails */ public Authentication authenticate(Authentication authentication) - throws AuthenticationException; + throws AuthenticationException; } diff --git a/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java b/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java index 4535e8127f..808acdded5 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java +++ b/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/BadCredentialsException.java b/core/src/main/java/org/acegisecurity/BadCredentialsException.java index b5c332f831..22ff077fad 100644 --- a/core/src/main/java/org/acegisecurity/BadCredentialsException.java +++ b/core/src/main/java/org/acegisecurity/BadCredentialsException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/ConfigAttribute.java b/core/src/main/java/org/acegisecurity/ConfigAttribute.java index e96d99eb38..5ac77cf7b6 100644 --- a/core/src/main/java/org/acegisecurity/ConfigAttribute.java +++ b/core/src/main/java/org/acegisecurity/ConfigAttribute.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java b/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java index ad7ee1ff8d..56cd88d631 100644 --- a/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java +++ b/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java b/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java index 202b30a45e..9d47385f6a 100644 --- a/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java +++ b/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -30,7 +38,8 @@ public class ConfigAttributeEditor extends PropertyEditorSupport { ConfigAttributeDefinition configDefinition = new ConfigAttributeDefinition(); for (int i = 0; i < tokens.length; i++) { - configDefinition.addConfigAttribute(new SecurityConfig(tokens[i])); + configDefinition.addConfigAttribute(new SecurityConfig( + tokens[i])); } setValue(configDefinition); diff --git a/core/src/main/java/org/acegisecurity/DisabledException.java b/core/src/main/java/org/acegisecurity/DisabledException.java index 0ba20b612f..748472b5eb 100644 --- a/core/src/main/java/org/acegisecurity/DisabledException.java +++ b/core/src/main/java/org/acegisecurity/DisabledException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/GrantedAuthority.java b/core/src/main/java/org/acegisecurity/GrantedAuthority.java index 8fcfc8da83..9c487456ef 100644 --- a/core/src/main/java/org/acegisecurity/GrantedAuthority.java +++ b/core/src/main/java/org/acegisecurity/GrantedAuthority.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java b/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java index bbc3c85f14..a1d094dcb7 100644 --- a/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java +++ b/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/LockedException.java b/core/src/main/java/org/acegisecurity/LockedException.java index 868c3a0ce3..8bbb563bed 100644 --- a/core/src/main/java/org/acegisecurity/LockedException.java +++ b/core/src/main/java/org/acegisecurity/LockedException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/MethodDefinitionAttributes.java b/core/src/main/java/org/acegisecurity/MethodDefinitionAttributes.java index e5f52333b2..30c0a0138d 100644 --- a/core/src/main/java/org/acegisecurity/MethodDefinitionAttributes.java +++ b/core/src/main/java/org/acegisecurity/MethodDefinitionAttributes.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -71,12 +79,12 @@ public class MethodDefinitionAttributes implements MethodDefinitionSource { } private void addClassAttributes(ConfigAttributeDefinition definition, - Class clazz) { + Class clazz) { addClassAttributes(definition, new Class[] {clazz}); } private void addClassAttributes(ConfigAttributeDefinition definition, - Class[] clazz) { + Class[] clazz) { for (int i = 0; i < clazz.length; i++) { Collection classAttributes = attributes.getAttributes(clazz[i]); @@ -86,8 +94,8 @@ public class MethodDefinitionAttributes implements MethodDefinitionSource { } } - private void addInterfaceMethodAttributes(ConfigAttributeDefinition definition, - Method method) { + private void addInterfaceMethodAttributes( + ConfigAttributeDefinition definition, Method method) { Class[] interfaces = method.getDeclaringClass().getInterfaces(); for (int i = 0; i < interfaces.length; i++) { @@ -95,7 +103,7 @@ public class MethodDefinitionAttributes implements MethodDefinitionSource { try { Method m = clazz.getDeclaredMethod(method.getName(), - method.getParameterTypes()); + method.getParameterTypes()); addMethodAttributes(definition, m); } catch (Exception e) { // this won't happen since we are getting a method from an interface that @@ -105,7 +113,7 @@ public class MethodDefinitionAttributes implements MethodDefinitionSource { } private void addMethodAttributes(ConfigAttributeDefinition definition, - Method method) { + Method method) { // add the method level attributes Collection methodAttributes = attributes.getAttributes(method); diff --git a/core/src/main/java/org/acegisecurity/MethodDefinitionMap.java b/core/src/main/java/org/acegisecurity/MethodDefinitionMap.java index 8471b907bf..5425fa40e5 100644 --- a/core/src/main/java/org/acegisecurity/MethodDefinitionMap.java +++ b/core/src/main/java/org/acegisecurity/MethodDefinitionMap.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -45,7 +53,7 @@ public class MethodDefinitionMap implements MethodDefinitionSource { public ConfigAttributeDefinition getAttributes(MethodInvocation invocation) { return (ConfigAttributeDefinition) this.methodMap.get(invocation - .getMethod()); + .getMethod()); } public Iterator getConfigAttributeDefinitions() { @@ -61,7 +69,7 @@ public class MethodDefinitionMap implements MethodDefinitionSource { */ public void addSecureMethod(Method method, ConfigAttributeDefinition attr) { logger.info("Adding secure method [" + method + "] with attributes [" - + attr + "]"); + + attr + "]"); this.methodMap.put(method, attr); } @@ -79,7 +87,7 @@ public class MethodDefinitionMap implements MethodDefinitionSource { if (lastDotIndex == -1) { throw new IllegalArgumentException("'" + name - + "' is not a valid method name: format is FQN.methodName"); + + "' is not a valid method name: format is FQN.methodName"); } String className = name.substring(0, lastDotIndex); @@ -87,12 +95,11 @@ public class MethodDefinitionMap implements MethodDefinitionSource { try { Class clazz = Class.forName(className, true, - Thread.currentThread() - .getContextClassLoader()); + Thread.currentThread().getContextClassLoader()); addSecureMethod(clazz, methodName, attr); } catch (ClassNotFoundException ex) { throw new IllegalArgumentException("Class '" + className - + "' not found"); + + "' not found"); } } @@ -107,12 +114,12 @@ public class MethodDefinitionMap implements MethodDefinitionSource { * @throws IllegalArgumentException DOCUMENT ME! */ public void addSecureMethod(Class clazz, String mappedName, - ConfigAttributeDefinition attr) { + ConfigAttributeDefinition attr) { String name = clazz.getName() + '.' + mappedName; if (logger.isDebugEnabled()) { logger.debug("Adding secure method [" + name - + "] with attributes [" + attr + "]"); + + "] with attributes [" + attr + "]"); } Method[] methods = clazz.getDeclaredMethods(); @@ -120,14 +127,14 @@ public class MethodDefinitionMap implements MethodDefinitionSource { for (int i = 0; i < methods.length; i++) { if (methods[i].getName().equals(mappedName) - || isMatch(methods[i].getName(), mappedName)) { + || isMatch(methods[i].getName(), mappedName)) { matchingMethods.add(methods[i]); } } if (matchingMethods.isEmpty()) { throw new IllegalArgumentException("Couldn't find method '" - + mappedName + "' on " + clazz); + + mappedName + "' on " + clazz); } // register all matching methods @@ -136,15 +143,14 @@ public class MethodDefinitionMap implements MethodDefinitionSource { String regMethodName = (String) this.nameMap.get(method); if ((regMethodName == null) - || (!regMethodName.equals(name) - && (regMethodName.length() <= name.length()))) { + || (!regMethodName.equals(name) + && (regMethodName.length() <= name.length()))) { // no already registered method name, or more specific // method name specification now -> (re-)register method if (logger.isDebugEnabled() && (regMethodName != null)) { logger.debug("Replacing attributes for secure method [" - + method + "]: current name [" + name - + "] is more specific than [" + regMethodName - + "]"); + + method + "]: current name [" + name + + "] is more specific than [" + regMethodName + "]"); } this.nameMap.put(method, name); @@ -152,9 +158,8 @@ public class MethodDefinitionMap implements MethodDefinitionSource { } else { if (logger.isDebugEnabled() && (regMethodName != null)) { logger.debug("Keeping attributes for secure method [" - + method + "]: current name [" + name - + "] is not more specific than [" - + regMethodName + "]"); + + method + "]: current name [" + name + + "] is not more specific than [" + regMethodName + "]"); } } } @@ -171,11 +176,9 @@ public class MethodDefinitionMap implements MethodDefinitionSource { */ private boolean isMatch(String methodName, String mappedName) { return (mappedName.endsWith("*") - && methodName.startsWith(mappedName.substring(0, - mappedName.length() - - 1))) - || (mappedName.startsWith("*") - && methodName.endsWith(mappedName.substring(1, - mappedName.length()))); + && methodName.startsWith(mappedName.substring(0, mappedName.length() + - 1))) + || (mappedName.startsWith("*") + && methodName.endsWith(mappedName.substring(1, mappedName.length()))); } } diff --git a/core/src/main/java/org/acegisecurity/MethodDefinitionSource.java b/core/src/main/java/org/acegisecurity/MethodDefinitionSource.java index 1cd6a8d180..63b4b50974 100644 --- a/core/src/main/java/org/acegisecurity/MethodDefinitionSource.java +++ b/core/src/main/java/org/acegisecurity/MethodDefinitionSource.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/MethodDefinitionSourceEditor.java b/core/src/main/java/org/acegisecurity/MethodDefinitionSourceEditor.java index 3fc22251cb..88dbf33851 100644 --- a/core/src/main/java/org/acegisecurity/MethodDefinitionSourceEditor.java +++ b/core/src/main/java/org/acegisecurity/MethodDefinitionSourceEditor.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -58,7 +66,7 @@ public class MethodDefinitionSourceEditor extends PropertyEditorSupport { configAttribEd.setAsText(value); ConfigAttributeDefinition attr = (ConfigAttributeDefinition) configAttribEd - .getValue(); + .getValue(); // Register name and attribute source.addSecureMethod(name, attr); diff --git a/core/src/main/java/org/acegisecurity/RunAsManager.java b/core/src/main/java/org/acegisecurity/RunAsManager.java index 5d9201d639..4e53186e9e 100644 --- a/core/src/main/java/org/acegisecurity/RunAsManager.java +++ b/core/src/main/java/org/acegisecurity/RunAsManager.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; @@ -67,8 +75,7 @@ public interface RunAsManager { * invocation */ public Authentication buildRunAs(Authentication authentication, - MethodInvocation invocation, - ConfigAttributeDefinition config); + MethodInvocation invocation, ConfigAttributeDefinition config); /** * Indicates whether this RunAsManager is able to process the diff --git a/core/src/main/java/org/acegisecurity/SecurityConfig.java b/core/src/main/java/org/acegisecurity/SecurityConfig.java index a499b22d63..a43290dd62 100644 --- a/core/src/main/java/org/acegisecurity/SecurityConfig.java +++ b/core/src/main/java/org/acegisecurity/SecurityConfig.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/SecurityInterceptor.java b/core/src/main/java/org/acegisecurity/SecurityInterceptor.java index 4afd500ea2..c6563faeae 100644 --- a/core/src/main/java/org/acegisecurity/SecurityInterceptor.java +++ b/core/src/main/java/org/acegisecurity/SecurityInterceptor.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java b/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java index a7350997cc..9de1341dd9 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java +++ b/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; @@ -39,7 +47,7 @@ public abstract class AbstractAdapterAuthenticationToken * @param authorities the authorities granted to this principal */ protected AbstractAdapterAuthenticationToken(String key, - GrantedAuthority[] authorities) { + GrantedAuthority[] authorities) { super(); this.keyHash = key.hashCode(); this.authorities = authorities; diff --git a/core/src/main/java/org/acegisecurity/adapters/AbstractIntegrationFilter.java b/core/src/main/java/org/acegisecurity/adapters/AbstractIntegrationFilter.java index 03fd56f753..b59c251459 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AbstractIntegrationFilter.java +++ b/core/src/main/java/org/acegisecurity/adapters/AbstractIntegrationFilter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; @@ -60,14 +68,14 @@ public abstract class AbstractIntegrationFilter implements Filter { public void destroy() {} public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) - throws IOException, ServletException { + FilterChain chain) throws IOException, ServletException { // Populate authentication information Object extracted = this.extractFromContainer(request); if (extracted instanceof Authentication) { if (logger.isDebugEnabled()) { - logger.debug("Authentication added to ContextHolder from container"); + logger.debug( + "Authentication added to ContextHolder from container"); } Authentication auth = (Authentication) extracted; @@ -76,7 +84,7 @@ public abstract class AbstractIntegrationFilter implements Filter { SecureContext secureContext = null; if ((ContextHolder.getContext() == null) - || !(ContextHolder.getContext() instanceof SecureContext)) { + || !(ContextHolder.getContext() instanceof SecureContext)) { secureContext = new SecureContextImpl(); } else { secureContext = (SecureContext) ContextHolder.getContext(); @@ -87,7 +95,8 @@ public abstract class AbstractIntegrationFilter implements Filter { ContextHolder.setContext((Context) secureContext); } else { if (logger.isDebugEnabled()) { - logger.debug("Authentication not added to ContextHolder (could not extract an authentication object from the container which is an instance of Authentication)"); + logger.debug( + "Authentication not added to ContextHolder (could not extract an authentication object from the container which is an instance of Authentication)"); } } @@ -96,19 +105,20 @@ public abstract class AbstractIntegrationFilter implements Filter { // Remove authentication information if ((ContextHolder.getContext() != null) - && ContextHolder.getContext() instanceof SecureContext) { + && ContextHolder.getContext() instanceof SecureContext) { if (logger.isDebugEnabled()) { logger.debug("Removing Authentication from ContextHolder"); } // Get context holder and remove authentication information SecureContext secureContext = (SecureContext) ContextHolder - .getContext(); + .getContext(); secureContext.setAuthentication(null); ContextHolder.setContext((Context) secureContext); } else { if (logger.isDebugEnabled()) { - logger.debug("ContextHolder does not contain any authentication information"); + logger.debug( + "ContextHolder does not contain any authentication information"); } } } diff --git a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java index c8b9f53d86..c277dae473 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java +++ b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; diff --git a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java index 5cc1fa2d69..23a8e57ac6 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java +++ b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; @@ -27,15 +35,14 @@ import org.springframework.beans.factory.InitializingBean; *

* *

- * If the key does not match, a BadCredentialsException is - * thrown. + * If the key does not match, a BadCredentialsException is thrown. *

* * @author Ben Alex * @version $Id$ */ public class AuthByAdapterProvider implements InitializingBean, - AuthenticationProvider { + AuthenticationProvider { //~ Instance fields ======================================================== private String key; @@ -52,18 +59,20 @@ public class AuthByAdapterProvider implements InitializingBean, public void afterPropertiesSet() throws Exception { if (key == null) { - throw new IllegalArgumentException("A Key is required and should match that configured for the adapters"); + throw new IllegalArgumentException( + "A Key is required and should match that configured for the adapters"); } } public Authentication authenticate(Authentication authentication) - throws AuthenticationException { + throws AuthenticationException { AuthByAdapter token = (AuthByAdapter) authentication; if (token.getKeyHash() == key.hashCode()) { return authentication; } else { - throw new BadCredentialsException("The presented AuthByAdapter implementation does not contain the expected key"); + throw new BadCredentialsException( + "The presented AuthByAdapter implementation does not contain the expected key"); } } diff --git a/core/src/main/java/org/acegisecurity/adapters/AutoIntegrationFilter.java b/core/src/main/java/org/acegisecurity/adapters/AutoIntegrationFilter.java index b91fc4bbe0..e003a553a5 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AutoIntegrationFilter.java +++ b/core/src/main/java/org/acegisecurity/adapters/AutoIntegrationFilter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; diff --git a/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java b/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java index 7e5bcef832..ded996aa4d 100644 --- a/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java +++ b/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; diff --git a/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java b/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java index 290470344d..d8f60f0161 100644 --- a/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java +++ b/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; diff --git a/core/src/main/java/org/acegisecurity/context/Context.java b/core/src/main/java/org/acegisecurity/context/Context.java index 4c07a97f23..941c14fa6f 100644 --- a/core/src/main/java/org/acegisecurity/context/Context.java +++ b/core/src/main/java/org/acegisecurity/context/Context.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; @@ -28,8 +36,8 @@ public interface Context extends Serializable { * Check the Context is properly configured. * *

- * This allows implementations to confirm they are valid, as this method - * is automatically called by the {@link ContextInterceptor}. + * This allows implementations to confirm they are valid, as this method is + * automatically called by the {@link ContextInterceptor}. *

* * @throws ContextInvalidException if the Context is invalid. diff --git a/core/src/main/java/org/acegisecurity/context/ContextException.java b/core/src/main/java/org/acegisecurity/context/ContextException.java index 3930208b1b..fb26e5c32b 100644 --- a/core/src/main/java/org/acegisecurity/context/ContextException.java +++ b/core/src/main/java/org/acegisecurity/context/ContextException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; @@ -13,7 +21,7 @@ import org.springframework.core.NestedRuntimeException; /** * Abstract superclass for all exceptions thrown in the context package and * subpackages. - * + * *

* Note that this is a runtime (unchecked) exception. *

diff --git a/core/src/main/java/org/acegisecurity/context/ContextHolder.java b/core/src/main/java/org/acegisecurity/context/ContextHolder.java index bafa29db49..e50045fa2c 100644 --- a/core/src/main/java/org/acegisecurity/context/ContextHolder.java +++ b/core/src/main/java/org/acegisecurity/context/ContextHolder.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/main/java/org/acegisecurity/context/ContextHolderEmptyException.java b/core/src/main/java/org/acegisecurity/context/ContextHolderEmptyException.java index 84c4fee9b2..e4ec30fea6 100644 --- a/core/src/main/java/org/acegisecurity/context/ContextHolderEmptyException.java +++ b/core/src/main/java/org/acegisecurity/context/ContextHolderEmptyException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/main/java/org/acegisecurity/context/ContextImpl.java b/core/src/main/java/org/acegisecurity/context/ContextImpl.java index f950c8df60..00161ba4c7 100644 --- a/core/src/main/java/org/acegisecurity/context/ContextImpl.java +++ b/core/src/main/java/org/acegisecurity/context/ContextImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/main/java/org/acegisecurity/context/ContextInterceptor.java b/core/src/main/java/org/acegisecurity/context/ContextInterceptor.java index f357bc7996..d673fc31e1 100644 --- a/core/src/main/java/org/acegisecurity/context/ContextInterceptor.java +++ b/core/src/main/java/org/acegisecurity/context/ContextInterceptor.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; @@ -38,7 +46,7 @@ public class ContextInterceptor implements MethodInterceptor { public Object invoke(MethodInvocation mi) throws Throwable { if (ContextHolder.getContext() == null) { throw new ContextHolderEmptyException("ContextHolder does not contain a Context", - null); + null); } ContextHolder.getContext().validate(); diff --git a/core/src/main/java/org/acegisecurity/context/ContextInvalidException.java b/core/src/main/java/org/acegisecurity/context/ContextInvalidException.java index 119ea69c8a..9c63325bc5 100644 --- a/core/src/main/java/org/acegisecurity/context/ContextInvalidException.java +++ b/core/src/main/java/org/acegisecurity/context/ContextInvalidException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/main/java/org/acegisecurity/context/SecureContext.java b/core/src/main/java/org/acegisecurity/context/SecureContext.java index 376f4d4772..ff8ccba740 100644 --- a/core/src/main/java/org/acegisecurity/context/SecureContext.java +++ b/core/src/main/java/org/acegisecurity/context/SecureContext.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/main/java/org/acegisecurity/context/SecureContextImpl.java b/core/src/main/java/org/acegisecurity/context/SecureContextImpl.java index 274e258963..e1d0d1ba07 100644 --- a/core/src/main/java/org/acegisecurity/context/SecureContextImpl.java +++ b/core/src/main/java/org/acegisecurity/context/SecureContextImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java index 0bab47daf7..6712d06c91 100644 --- a/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java +++ b/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers; diff --git a/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java index b5b1012caa..4b5684bdf6 100644 --- a/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java +++ b/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers; @@ -32,7 +40,7 @@ public interface AuthenticationProvider { * @throws AuthenticationException if authentication fails. */ public Authentication authenticate(Authentication authentication) - throws AuthenticationException; + throws AuthenticationException; /** * Returns true if this AuthenticationProvider supports the diff --git a/core/src/main/java/org/acegisecurity/providers/ProviderManager.java b/core/src/main/java/org/acegisecurity/providers/ProviderManager.java index eaa7e2c232..290fb80b33 100644 --- a/core/src/main/java/org/acegisecurity/providers/ProviderManager.java +++ b/core/src/main/java/org/acegisecurity/providers/ProviderManager.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers; @@ -60,9 +68,8 @@ public class ProviderManager implements InitializingBean, AuthenticationManager AuthenticationProvider attemptToCast = (AuthenticationProvider) currentObject; } catch (ClassCastException cce) { throw new IllegalArgumentException("AuthenticationProvider " - + currentObject.getClass() - .getName() - + " must implement AuthenticationProvider"); + + currentObject.getClass().getName() + + " must implement AuthenticationProvider"); } } @@ -103,30 +110,31 @@ public class ProviderManager implements InitializingBean, AuthenticationManager * @throws ProviderNotFoundException DOCUMENT ME! */ public Authentication authenticate(Authentication authentication) - throws AuthenticationException { + throws AuthenticationException { Iterator iter = providers.iterator(); Class toTest = authentication.getClass(); while (iter.hasNext()) { AuthenticationProvider provider = (AuthenticationProvider) iter - .next(); + .next(); if (provider.supports(toTest)) { logger.debug("Authentication attempt using " - + provider.getClass().getName()); + + provider.getClass().getName()); return provider.authenticate(authentication); } } throw new ProviderNotFoundException("No authentication provider for " - + toTest.getName()); + + toTest.getName()); } private void checkIfValidList(List listToCheck) { if ((listToCheck == null) || (listToCheck.size() == 0)) { - throw new IllegalArgumentException("A list of AuthenticationManagers is required"); + throw new IllegalArgumentException( + "A list of AuthenticationManagers is required"); } } } diff --git a/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java b/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java index 3688566daa..ba82fd0924 100644 --- a/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java +++ b/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers; diff --git a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java index 6d766af2ac..2cb5ea7255 100644 --- a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java +++ b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers; @@ -32,7 +40,7 @@ public class TestingAuthenticationProvider implements AuthenticationProvider { //~ Methods ================================================================ public Authentication authenticate(Authentication authentication) - throws AuthenticationException { + throws AuthenticationException { return authentication; } diff --git a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java index c3da60eaef..fbcafc2702 100644 --- a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java +++ b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers; @@ -33,7 +41,7 @@ public class TestingAuthenticationToken extends AbstractAuthenticationToken { //~ Constructors =========================================================== public TestingAuthenticationToken(Object principal, Object credentials, - GrantedAuthority[] authorities) { + GrantedAuthority[] authorities) { this.principal = principal; this.credentials = credentials; this.authorities = authorities; diff --git a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java index 4632a1b3df..48d035a247 100644 --- a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java +++ b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers; @@ -36,14 +44,13 @@ public class UsernamePasswordAuthenticationToken //~ Constructors =========================================================== public UsernamePasswordAuthenticationToken(Object principal, - Object credentials) { + Object credentials) { this.principal = principal; this.credentials = credentials; } public UsernamePasswordAuthenticationToken(Object principal, - Object credentials, - GrantedAuthority[] authorities) { + Object credentials, GrantedAuthority[] authorities) { this.principal = principal; this.credentials = credentials; this.authorities = authorities; diff --git a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java index eb14fc3065..a2dd8414e9 100644 --- a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java +++ b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao; @@ -34,7 +42,7 @@ import org.springframework.dao.DataAccessException; * @version $Id$ */ public class DaoAuthenticationProvider implements AuthenticationProvider, - InitializingBean { + InitializingBean { //~ Instance fields ======================================================== private AuthenticationDao authenticationDao; @@ -83,12 +91,13 @@ public class DaoAuthenticationProvider implements AuthenticationProvider, public void afterPropertiesSet() throws Exception { if (this.authenticationDao == null) { - throw new IllegalArgumentException("An Authentication DAO must be set"); + throw new IllegalArgumentException( + "An Authentication DAO must be set"); } } public Authentication authenticate(Authentication authentication) - throws AuthenticationException { + throws AuthenticationException { User user = null; try { @@ -98,7 +107,7 @@ public class DaoAuthenticationProvider implements AuthenticationProvider, throw new BadCredentialsException("Bad credentials presented"); } catch (DataAccessException repositoryProblem) { throw new AuthenticationServiceException(repositoryProblem - .getMessage()); + .getMessage()); } if (!user.isEnabled()) { @@ -110,12 +119,12 @@ public class DaoAuthenticationProvider implements AuthenticationProvider, } return new UsernamePasswordAuthenticationToken(user.getUsername(), - user.getPassword(), - user.getAuthorities()); + user.getPassword(), user.getAuthorities()); } public boolean supports(Class authentication) { - if (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication)) { + if (UsernamePasswordAuthenticationToken.class.isAssignableFrom( + authentication)) { return true; } else { return false; diff --git a/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java b/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java index 9cb841f5d8..31f441508f 100644 --- a/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java +++ b/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao; diff --git a/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java index 0faf832b2c..e57c47b0bd 100644 --- a/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java +++ b/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.runas; @@ -27,15 +35,14 @@ import org.springframework.beans.factory.InitializingBean; *

* *

- * If the key does not match, a BadCredentialsException is - * thrown. + * If the key does not match, a BadCredentialsException is thrown. *

* * @author Ben Alex * @version $Id$ */ public class RunAsImplAuthenticationProvider implements InitializingBean, - AuthenticationProvider { + AuthenticationProvider { //~ Instance fields ======================================================== private String key; @@ -52,18 +59,20 @@ public class RunAsImplAuthenticationProvider implements InitializingBean, public void afterPropertiesSet() throws Exception { if (key == null) { - throw new IllegalArgumentException("A Key is required and should match that configured for the RunAsManagerImpl"); + throw new IllegalArgumentException( + "A Key is required and should match that configured for the RunAsManagerImpl"); } } public Authentication authenticate(Authentication authentication) - throws AuthenticationException { + throws AuthenticationException { RunAsUserToken token = (RunAsUserToken) authentication; if (token.getKeyHash() == key.hashCode()) { return authentication; } else { - throw new BadCredentialsException("The presented RunAsUserToken does not contain the expected key"); + throw new BadCredentialsException( + "The presented RunAsUserToken does not contain the expected key"); } } diff --git a/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java b/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java index 5d7fffb2b5..4c2c62fd4f 100644 --- a/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java +++ b/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.runas; @@ -58,13 +66,13 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean { public void afterPropertiesSet() throws Exception { if (key == null) { - throw new IllegalArgumentException("A Key is required and should match that configured for the RunAsImplAuthenticationProvider"); + throw new IllegalArgumentException( + "A Key is required and should match that configured for the RunAsImplAuthenticationProvider"); } } public Authentication buildRunAs(Authentication authentication, - MethodInvocation invocation, - ConfigAttributeDefinition config) { + MethodInvocation invocation, ConfigAttributeDefinition config) { Set newAuthorities = new HashSet(); Iterator iter = config.getConfigAttributes(); @@ -72,9 +80,8 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean { ConfigAttribute attribute = (ConfigAttribute) iter.next(); if (this.supports(attribute)) { - GrantedAuthorityImpl extraAuthority = new GrantedAuthorityImpl("ROLE_" - + attribute - .getAttribute()); + GrantedAuthorityImpl extraAuthority = new GrantedAuthorityImpl( + "ROLE_" + attribute.getAttribute()); newAuthorities.add(extraAuthority); } } @@ -88,18 +95,17 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean { GrantedAuthority[] resultType = {new GrantedAuthorityImpl("holder")}; GrantedAuthority[] newAuthoritiesAsArray = (GrantedAuthority[]) newAuthorities - .toArray(resultType); + .toArray(resultType); return new RunAsUserToken(this.key, authentication.getPrincipal(), - authentication.getCredentials(), - newAuthoritiesAsArray, - authentication.getClass()); + authentication.getCredentials(), newAuthoritiesAsArray, + authentication.getClass()); } } public boolean supports(ConfigAttribute attribute) { if ((attribute.getAttribute() != null) - && attribute.getAttribute().startsWith("RUN_AS_")) { + && attribute.getAttribute().startsWith("RUN_AS_")) { return true; } else { return false; diff --git a/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java b/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java index fd447ffda9..cc42a93d5f 100644 --- a/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java +++ b/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.runas; @@ -30,8 +38,7 @@ public class RunAsUserToken extends AbstractAuthenticationToken { //~ Constructors =========================================================== public RunAsUserToken(String key, Object principal, Object credentials, - GrantedAuthority[] authorities, - Class originalAuthentication) { + GrantedAuthority[] authorities, Class originalAuthentication) { super(); this.keyHash = key.hashCode(); this.authorities = authorities; diff --git a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java index a8fd200f17..198fc972e8 100644 --- a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java +++ b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.taglibs.authz; diff --git a/core/src/main/java/org/acegisecurity/userdetails/User.java b/core/src/main/java/org/acegisecurity/userdetails/User.java index ad9b1b8e32..67841758ab 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/User.java +++ b/core/src/main/java/org/acegisecurity/userdetails/User.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao; @@ -40,7 +48,7 @@ public class User { * is enabled */ public User(String username, String password, boolean enabled, - GrantedAuthority[] authorities) { + GrantedAuthority[] authorities) { this.username = username; this.password = password; this.enabled = enabled; diff --git a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java b/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java index eef5694c42..0c7f9597f2 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java +++ b/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao; @@ -41,6 +49,5 @@ public interface AuthenticationDao { * repository-specific reason */ public User loadUserByUsername(String username) - throws UsernameNotFoundException, - DataAccessException; + throws UsernameNotFoundException, DataAccessException; } diff --git a/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java index b3d2a28b7c..9b1bab1480 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java +++ b/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao.jdbc; @@ -52,8 +60,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements AuthenticationDao { //~ Methods ================================================================ public User loadUserByUsername(String username) - throws UsernameNotFoundException, - DataAccessException { + throws UsernameNotFoundException, DataAccessException { List users = usersByUsernameQuery.execute(username); if (users.size() == 0) { @@ -72,14 +79,16 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements AuthenticationDao { arrayAuths = (GrantedAuthority[]) dbAuths.toArray(arrayAuths); return new User(user.getUsername(), user.getPassword(), - user.isEnabled(), arrayAuths); + user.isEnabled(), arrayAuths); } - protected void setAuthoritiesByUsernameQuery(AuthoritiesByUsernameQuery authoritiesByUsernameQuery) { + protected void setAuthoritiesByUsernameQuery( + AuthoritiesByUsernameQuery authoritiesByUsernameQuery) { this.authoritiesByUsernameQuery = authoritiesByUsernameQuery; } - protected void setUsersByUsernameQuery(UsersByUsernameQuery usersByUsernameQuery) { + protected void setUsersByUsernameQuery( + UsersByUsernameQuery usersByUsernameQuery) { this.usersByUsernameQuery = usersByUsernameQuery; } @@ -101,15 +110,15 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements AuthenticationDao { protected static class AuthoritiesByUsernameQuery extends MappingSqlQuery { protected AuthoritiesByUsernameQuery(DataSource ds) { super(ds, - "SELECT username,authority FROM authorities WHERE username = ?"); + "SELECT username,authority FROM authorities WHERE username = ?"); declareParameter(new SqlParameter(Types.VARCHAR)); compile(); } protected Object mapRow(ResultSet rs, int rownum) - throws SQLException { + throws SQLException { GrantedAuthorityImpl authority = new GrantedAuthorityImpl(rs - .getString("authority")); + .getString("authority")); return authority; } @@ -121,13 +130,13 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements AuthenticationDao { protected static class UsersByUsernameQuery extends MappingSqlQuery { protected UsersByUsernameQuery(DataSource ds) { super(ds, - "SELECT username,password,enabled FROM users WHERE username = ?"); + "SELECT username,password,enabled FROM users WHERE username = ?"); declareParameter(new SqlParameter(Types.VARCHAR)); compile(); } protected Object mapRow(ResultSet rs, int rownum) - throws SQLException { + throws SQLException { String username = rs.getString("username"); String password = rs.getString("password"); boolean enabled = rs.getBoolean("enabled"); diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java b/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java index da44f26337..29796a5a4d 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java +++ b/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao.memory; @@ -39,13 +47,13 @@ public class InMemoryDaoImpl implements AuthenticationDao, InitializingBean { public void afterPropertiesSet() throws Exception { if (this.userMap == null) { - throw new IllegalArgumentException("A list of users, passwords, enabled/disabled status and their granted authorities must be set"); + throw new IllegalArgumentException( + "A list of users, passwords, enabled/disabled status and their granted authorities must be set"); } } public User loadUserByUsername(String username) - throws UsernameNotFoundException, - DataAccessException { + throws UsernameNotFoundException, DataAccessException { User result = userMap.getUser(username); if (result == null) { diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeDefinition.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeDefinition.java index a3da5b1a2c..db2594afa5 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeDefinition.java +++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeDefinition.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao.memory; diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java index 7e67f9d634..19fa96d0b0 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java +++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao.memory; @@ -42,7 +50,8 @@ public class UserAttributeEditor extends PropertyEditorSupport { } else if (currentToken.toLowerCase().equals("disabled")) { userAttrib.setEnabled(false); } else { - userAttrib.addAuthority(new GrantedAuthorityImpl(currentToken)); + userAttrib.addAuthority(new GrantedAuthorityImpl( + currentToken)); } } } diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java index ff5765822d..6e1bb13992 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java +++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao.memory; diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java index 4489794db8..65160ccb29 100644 --- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java +++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao.memory; @@ -77,12 +85,12 @@ public class UserMapEditor extends PropertyEditorSupport { configAttribEd.setAsText(value); UserAttributeDefinition attr = (UserAttributeDefinition) configAttribEd - .getValue(); + .getValue(); // Make a user object, assuming the properties were properly provided if (attr != null) { User user = new User(username, attr.getPassword(), - attr.isEnabled(), attr.getAuthorities()); + attr.isEnabled(), attr.getAuthorities()); userMap.addUser(user); } } diff --git a/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java index b8e69011ba..935338cc8f 100644 --- a/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java +++ b/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; @@ -37,7 +45,8 @@ public abstract class AbstractAccessDecisionManager //~ Methods ================================================================ - public void setAllowIfAllAbstainDecisions(boolean allowIfAllAbstainDecisions) { + public void setAllowIfAllAbstainDecisions( + boolean allowIfAllAbstainDecisions) { this.allowIfAllAbstainDecisions = allowIfAllAbstainDecisions; } @@ -59,9 +68,8 @@ public abstract class AbstractAccessDecisionManager AccessDecisionVoter attemptToCast = (AccessDecisionVoter) currentObject; } catch (ClassCastException cce) { throw new IllegalArgumentException("AccessDecisionVoter " - + currentObject.getClass() - .getName() - + " must implement AccessDecisionVoter"); + + currentObject.getClass().getName() + + " must implement AccessDecisionVoter"); } } @@ -92,7 +100,8 @@ public abstract class AbstractAccessDecisionManager private void checkIfValidList(List listToCheck) { if ((listToCheck == null) || (listToCheck.size() == 0)) { - throw new IllegalArgumentException("A list of AccessDecisionVoters is required"); + throw new IllegalArgumentException( + "A list of AccessDecisionVoters is required"); } } } diff --git a/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java b/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java index 6292ca0998..e5a3dfe31a 100644 --- a/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java +++ b/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; @@ -57,13 +65,12 @@ public interface AccessDecisionVoter { * Indicates whether or not access is granted. * *

- * The decision must be affirmative (ACCESS_GRANTED), - * negative (ACCESS_DENIED) or the - * AccessDecisionVoter can abstain - * (ACCESS_ABSTAIN) from voting. Under no circumstances - * should implementing classes return any other value. If a weighting of - * results is desired, this should be handled in a custom {@link - * net.sf.acegisecurity.AccessDecisionManager} instead. + * The decision must be affirmative (ACCESS_GRANTED), negative + * (ACCESS_DENIED) or the AccessDecisionVoter + * can abstain (ACCESS_ABSTAIN) from voting. Under no + * circumstances should implementing classes return any other value. If a + * weighting of results is desired, this should be handled in a custom + * {@link net.sf.acegisecurity.AccessDecisionManager} instead. *

* *

@@ -92,5 +99,5 @@ public interface AccessDecisionVoter { * {@link #ACCESS_DENIED} */ public int vote(Authentication authentication, MethodInvocation invocation, - ConfigAttributeDefinition config); + ConfigAttributeDefinition config); } diff --git a/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java b/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java index 923c232521..f9e9fd0c49 100644 --- a/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java +++ b/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; @@ -54,9 +62,8 @@ public class AffirmativeBased extends AbstractAccessDecisionManager { * @throws AccessDeniedException if access is denied */ public void decide(Authentication authentication, - MethodInvocation invocation, - ConfigAttributeDefinition config) - throws AccessDeniedException { + MethodInvocation invocation, ConfigAttributeDefinition config) + throws AccessDeniedException { Iterator iter = this.getDecisionVoters().iterator(); int deny = 0; diff --git a/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java b/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java index edcc3fab17..826cfbd1f4 100644 --- a/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java +++ b/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; @@ -38,7 +46,8 @@ public class ConsensusBased extends AbstractAccessDecisionManager { //~ Methods ================================================================ - public void setAllowIfEqualGrantedDeniedDecisions(boolean allowIfEqualGrantedDeniedDecisions) { + public void setAllowIfEqualGrantedDeniedDecisions( + boolean allowIfEqualGrantedDeniedDecisions) { this.allowIfEqualGrantedDeniedDecisions = allowIfEqualGrantedDeniedDecisions; } @@ -71,9 +80,8 @@ public class ConsensusBased extends AbstractAccessDecisionManager { * @throws AccessDeniedException if access is denied */ public void decide(Authentication authentication, - MethodInvocation invocation, - ConfigAttributeDefinition config) - throws AccessDeniedException { + MethodInvocation invocation, ConfigAttributeDefinition config) + throws AccessDeniedException { Iterator iter = this.getDecisionVoters().iterator(); int grant = 0; int deny = 0; diff --git a/core/src/main/java/org/acegisecurity/vote/RoleVoter.java b/core/src/main/java/org/acegisecurity/vote/RoleVoter.java index 3132bc0988..f9f2188233 100644 --- a/core/src/main/java/org/acegisecurity/vote/RoleVoter.java +++ b/core/src/main/java/org/acegisecurity/vote/RoleVoter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; @@ -41,7 +49,7 @@ public class RoleVoter implements AccessDecisionVoter { public boolean supports(ConfigAttribute attribute) { if ((attribute.getAttribute() != null) - && attribute.getAttribute().startsWith("ROLE_")) { + && attribute.getAttribute().startsWith("ROLE_")) { return true; } else { return false; @@ -49,7 +57,7 @@ public class RoleVoter implements AccessDecisionVoter { } public int vote(Authentication authentication, MethodInvocation invocation, - ConfigAttributeDefinition config) { + ConfigAttributeDefinition config) { int result = ACCESS_ABSTAIN; Iterator iter = config.getConfigAttributes(); @@ -61,10 +69,9 @@ public class RoleVoter implements AccessDecisionVoter { // Attempt to find a matching granted authority for (int i = 0; i < authentication.getAuthorities().length; - i++) { + i++) { if (attribute.getAttribute().equals(authentication - .getAuthorities()[i] - .getAuthority())) { + .getAuthorities()[i].getAuthority())) { return ACCESS_GRANTED; } } diff --git a/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java b/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java index 6a4e8d97c9..d835b7affd 100644 --- a/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java +++ b/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; @@ -62,9 +70,8 @@ public class UnanimousBased extends AbstractAccessDecisionManager { * @throws AccessDeniedException if access is denied */ public void decide(Authentication authentication, - MethodInvocation invocation, - ConfigAttributeDefinition config) - throws AccessDeniedException { + MethodInvocation invocation, ConfigAttributeDefinition config) + throws AccessDeniedException { int grant = 0; int deny = 0; int abstain = 0; diff --git a/core/src/test/java/org/acegisecurity/BankSecurityVoter.java b/core/src/test/java/org/acegisecurity/BankSecurityVoter.java index 5e899e879f..2b5434f1c4 100644 --- a/core/src/test/java/org/acegisecurity/BankSecurityVoter.java +++ b/core/src/test/java/org/acegisecurity/BankSecurityVoter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/test/java/org/acegisecurity/ExoticSecureContext.java b/core/src/test/java/org/acegisecurity/ExoticSecureContext.java index 35676644be..0cb1aa51b1 100644 --- a/core/src/test/java/org/acegisecurity/ExoticSecureContext.java +++ b/core/src/test/java/org/acegisecurity/ExoticSecureContext.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/test/java/org/acegisecurity/SecurityTests.java b/core/src/test/java/org/acegisecurity/SecurityTests.java index b276d55cc7..4ee1242e70 100644 --- a/core/src/test/java/org/acegisecurity/SecurityTests.java +++ b/core/src/test/java/org/acegisecurity/SecurityTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity; diff --git a/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java b/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java index 2e86dc7ab9..9e8dc4f0f1 100644 --- a/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java +++ b/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.adapters; diff --git a/core/src/test/java/org/acegisecurity/attribute/AttributesTests.java b/core/src/test/java/org/acegisecurity/attribute/AttributesTests.java index cefc74ff71..4e46cfc469 100644 --- a/core/src/test/java/org/acegisecurity/attribute/AttributesTests.java +++ b/core/src/test/java/org/acegisecurity/attribute/AttributesTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.attribute; diff --git a/core/src/test/java/org/acegisecurity/attribute/MockAttributes.java b/core/src/test/java/org/acegisecurity/attribute/MockAttributes.java index bf4b9576c1..133db50f2e 100644 --- a/core/src/test/java/org/acegisecurity/attribute/MockAttributes.java +++ b/core/src/test/java/org/acegisecurity/attribute/MockAttributes.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.attribute; diff --git a/core/src/test/java/org/acegisecurity/attribute/MockMethodInvocation.java b/core/src/test/java/org/acegisecurity/attribute/MockMethodInvocation.java index 578c9534e3..ee181021ae 100644 --- a/core/src/test/java/org/acegisecurity/attribute/MockMethodInvocation.java +++ b/core/src/test/java/org/acegisecurity/attribute/MockMethodInvocation.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.attribute; diff --git a/core/src/test/java/org/acegisecurity/attribute/TestAttributes.java b/core/src/test/java/org/acegisecurity/attribute/TestAttributes.java index e4326ec03b..a668e58dd0 100644 --- a/core/src/test/java/org/acegisecurity/attribute/TestAttributes.java +++ b/core/src/test/java/org/acegisecurity/attribute/TestAttributes.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.attribute; diff --git a/core/src/test/java/org/acegisecurity/attribute/TestService.java b/core/src/test/java/org/acegisecurity/attribute/TestService.java index b9558b3305..ef858c1fea 100644 --- a/core/src/test/java/org/acegisecurity/attribute/TestService.java +++ b/core/src/test/java/org/acegisecurity/attribute/TestService.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.attribute; diff --git a/core/src/test/java/org/acegisecurity/attribute/TestServiceImpl.java b/core/src/test/java/org/acegisecurity/attribute/TestServiceImpl.java index eafcd50282..7ba5424038 100644 --- a/core/src/test/java/org/acegisecurity/attribute/TestServiceImpl.java +++ b/core/src/test/java/org/acegisecurity/attribute/TestServiceImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.attribute; diff --git a/core/src/test/java/org/acegisecurity/context/Account.java b/core/src/test/java/org/acegisecurity/context/Account.java index d397fb0412..740add1c83 100644 --- a/core/src/test/java/org/acegisecurity/context/Account.java +++ b/core/src/test/java/org/acegisecurity/context/Account.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/test/java/org/acegisecurity/context/BankManager.java b/core/src/test/java/org/acegisecurity/context/BankManager.java index 5fbfa37297..0ce1b19d12 100644 --- a/core/src/test/java/org/acegisecurity/context/BankManager.java +++ b/core/src/test/java/org/acegisecurity/context/BankManager.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/test/java/org/acegisecurity/context/BankManagerImpl.java b/core/src/test/java/org/acegisecurity/context/BankManagerImpl.java index 38c8576fcd..f12e55aaeb 100644 --- a/core/src/test/java/org/acegisecurity/context/BankManagerImpl.java +++ b/core/src/test/java/org/acegisecurity/context/BankManagerImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/test/java/org/acegisecurity/context/ContextTests.java b/core/src/test/java/org/acegisecurity/context/ContextTests.java index 6dac6e12c7..db570205e2 100644 --- a/core/src/test/java/org/acegisecurity/context/ContextTests.java +++ b/core/src/test/java/org/acegisecurity/context/ContextTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/test/java/org/acegisecurity/context/ExoticContext.java b/core/src/test/java/org/acegisecurity/context/ExoticContext.java index cd58e72750..56e7a2a050 100644 --- a/core/src/test/java/org/acegisecurity/context/ExoticContext.java +++ b/core/src/test/java/org/acegisecurity/context/ExoticContext.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.context; diff --git a/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java b/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java index ace9ae98f1..deaa913536 100644 --- a/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java +++ b/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.providers.dao.memory; diff --git a/core/src/test/java/org/acegisecurity/runas/BankManagerPublicFacade.java b/core/src/test/java/org/acegisecurity/runas/BankManagerPublicFacade.java index fc8e7135e9..fe55e7a1ae 100644 --- a/core/src/test/java/org/acegisecurity/runas/BankManagerPublicFacade.java +++ b/core/src/test/java/org/acegisecurity/runas/BankManagerPublicFacade.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.runas; diff --git a/core/src/test/java/org/acegisecurity/runas/RunAsTests.java b/core/src/test/java/org/acegisecurity/runas/RunAsTests.java index c1becd7c68..1dae6d76bc 100644 --- a/core/src/test/java/org/acegisecurity/runas/RunAsTests.java +++ b/core/src/test/java/org/acegisecurity/runas/RunAsTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.runas; diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java index 8ef1dab27a..2356aa171b 100644 --- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java +++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.taglibs.authz; @@ -68,8 +76,8 @@ public class AuthorizeTagAttributeTests extends TestCase { ContextHolder.setContext(context); } - + protected void tearDown() throws Exception { - ContextHolder.setContext(null); - } + ContextHolder.setContext(null); + } } diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java index 2e53784dd6..49b1ed4736 100644 --- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java +++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.taglibs.authz; @@ -111,6 +119,6 @@ public class AuthorizeTagTests extends TestCase { } protected void tearDown() throws Exception { - ContextHolder.setContext(null); - } + ContextHolder.setContext(null); + } } diff --git a/core/src/test/java/org/acegisecurity/vote/VoterManagerTests.java b/core/src/test/java/org/acegisecurity/vote/VoterManagerTests.java index 1f774a508d..a79f6585f2 100644 --- a/core/src/test/java/org/acegisecurity/vote/VoterManagerTests.java +++ b/core/src/test/java/org/acegisecurity/vote/VoterManagerTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; diff --git a/core/src/test/java/org/acegisecurity/vote/XVoter.java b/core/src/test/java/org/acegisecurity/vote/XVoter.java index 00f604f7dd..0e1c2bbfa7 100644 --- a/core/src/test/java/org/acegisecurity/vote/XVoter.java +++ b/core/src/test/java/org/acegisecurity/vote/XVoter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; diff --git a/core/src/test/java/org/acegisecurity/vote/YVoter.java b/core/src/test/java/org/acegisecurity/vote/YVoter.java index c4895515d1..1884ed9a5c 100644 --- a/core/src/test/java/org/acegisecurity/vote/YVoter.java +++ b/core/src/test/java/org/acegisecurity/vote/YVoter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.vote; diff --git a/integration-test/src/net/sf/acegisecurity/integrationtests/web/ContactsWarTests.java b/integration-test/src/net/sf/acegisecurity/integrationtests/web/ContactsWarTests.java index 95eaa4c7ad..1b13c7edf5 100644 --- a/integration-test/src/net/sf/acegisecurity/integrationtests/web/ContactsWarTests.java +++ b/integration-test/src/net/sf/acegisecurity/integrationtests/web/ContactsWarTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.sf.acegisecurity.integrationtests.web; diff --git a/jalopy.xml b/jalopy.xml index 6255338800..9be4532d41 100644 --- a/jalopy.xml +++ b/jalopy.xml @@ -219,9 +219,9 @@ false

- Created on|To change the template for this generated|Apache Software License + Acegi Technology Pty Limited|Created on|To change the template for this generated|Apache Software License 0 - /*| * The Acegi Security System for Spring is published under the terms| * of the Apache Software License.| *| * Visit http://acegisecurity.sourceforge.net for further details.| */ + /* Copyright 2004 Acegi Technology Pty Limited| *| * Licensed under the Apache License, Version 2.0 (the "License");| * you may not use this file except in compliance with the License.| * You may obtain a copy of the License at| *| * http://www.apache.org/licenses/LICENSE-2.0| *| * Unless required by applicable law or agreed to in writing, software| * distributed under the License is distributed on an "AS IS" BASIS,| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.| * See the License for the specific language governing permissions and| * limitations under the License.| */ true
diff --git a/license.txt b/license.txt index 82aac31ef3..261eeb9e9f 100644 --- a/license.txt +++ b/license.txt @@ -1,58 +1,201 @@ -/* - * All source code, binaries, documentation and other files distributed - * with the Acegi Security System for Spring (except the third-party libraries - * in the "lib" directories, included in the "-with-dependencies" download) - * are subject to the following license terms, and are held under the - * following copyright notice. - * - * ============================================================================ - * The Apache Software License, Version 1.1 - * ============================================================================ - * - * Copyright (C) 2004 The Acegi Security System for Spring Project. - * All rights reserved. The Acegi Security System for Spring Project is - * represented by Ben Alex . - * - * Redistribution and use in source and binary forms, with or without modifica- - * tion, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by the Acegi Security System for Spring Project - * (http://acegisecurity.sourceforge.net)." Alternately, this acknowledgment - * may appear in the software itself, if and wherever such third-party - * acknowledgments normally appear. - * - * 4. The names "Acegi" and "Acegi Security System for Spring" must not be used - * to endorse or promote products derived from this software without prior - * written permission. For written permission, please contact - * . - * - * 5. Products derived from this software may not be called "Acegi", nor may - * "Acegi" appear in their name, without prior written permission of - * Acegi Technology Pty Limited (www.acegi.com.au). - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * ACEGI SECURITY SYSTEM FOR SPRING PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * This software consists of voluntary contributions made by many individuals - * on behalf of the Acegi Security System for Spring Project. For more - * information on the Acegi Security System for Spring Project, please see - * . - */ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/notice.txt b/notice.txt new file mode 100644 index 0000000000..d5b9838b8c --- /dev/null +++ b/notice.txt @@ -0,0 +1,26 @@ + ====================================================================== + == NOTICE file corresponding to section 4(d) of the Apache License, == + == Version 2.0, in this case for the Acegi Security System for == + == Spring distribution. == + ====================================================================== + + This product includes software developed by the Spring Framework + Project (http://www.springframework.org). + + This product includes software developed by + the Apache Software Foundation (http://www.apache.org). + + The end-user documentation included with a redistribution, if any, + must include the following acknowledgement: + + "This product includes software developed by the Acegi Security + System for Spring Project (http://acegisecurity.sourceforge.net)." + + Alternately, this acknowledgement may appear in the software itself, + if and wherever such third-party acknowledgements normally appear. + + The names "Acegi", "Acegi Security System" and "Acegi Security System + for Spring" must not be used to endorse or promote products derived + from this software without prior written permission. For written + permission, please contact ben.alex@acegi.com.au. + \ No newline at end of file diff --git a/samples/attributes/src/main/java/sample/attributes/BankService.java b/samples/attributes/src/main/java/sample/attributes/BankService.java index 13d6dfbfe1..3890602916 100644 --- a/samples/attributes/src/main/java/sample/attributes/BankService.java +++ b/samples/attributes/src/main/java/sample/attributes/BankService.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.attributes; diff --git a/samples/attributes/src/main/java/sample/attributes/BankServiceImpl.java b/samples/attributes/src/main/java/sample/attributes/BankServiceImpl.java index 393ec85416..8cfbb8164c 100644 --- a/samples/attributes/src/main/java/sample/attributes/BankServiceImpl.java +++ b/samples/attributes/src/main/java/sample/attributes/BankServiceImpl.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.attributes; diff --git a/samples/attributes/src/main/java/sample/attributes/BankTests.java b/samples/attributes/src/main/java/sample/attributes/BankTests.java index 8a3e90aa86..08b7022b25 100644 --- a/samples/attributes/src/main/java/sample/attributes/BankTests.java +++ b/samples/attributes/src/main/java/sample/attributes/BankTests.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.attributes; @@ -74,8 +82,9 @@ public class BankTests extends TestCase { private static void createSecureContext() { TestingAuthenticationToken auth = new TestingAuthenticationToken("test", - "test", - new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_TELLER"), new GrantedAuthorityImpl("ROLE_PERMISSION_LIST")}); + "test", + new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_TELLER"), new GrantedAuthorityImpl( + "ROLE_PERMISSION_LIST")}); SecureContextImpl secureContext = new SecureContextImpl(); secureContext.setAuthentication(auth); diff --git a/samples/attributes/src/main/java/sample/attributes/Main.java b/samples/attributes/src/main/java/sample/attributes/Main.java index 797980ce78..744aa2fa01 100644 --- a/samples/attributes/src/main/java/sample/attributes/Main.java +++ b/samples/attributes/src/main/java/sample/attributes/Main.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.attributes; @@ -30,7 +38,8 @@ public class Main { public static void main(String[] args) throws Exception { createSecureContext(); - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml"); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "applicationContext.xml"); BankService service = (BankService) context.getBean("bankService"); // will succeed @@ -38,7 +47,8 @@ public class Main { // will fail try { - System.out.println("We expect an AccessDeniedException now, as we do not hold the ROLE_PERMISSION_BALANCE granted authority, and we're using a unanimous access decision manager... "); + System.out.println( + "We expect an AccessDeniedException now, as we do not hold the ROLE_PERMISSION_BALANCE granted authority, and we're using a unanimous access decision manager... "); service.balance("1"); } catch (AccessDeniedException e) { e.printStackTrace(); @@ -53,8 +63,9 @@ public class Main { */ private static void createSecureContext() { TestingAuthenticationToken auth = new TestingAuthenticationToken("test", - "test", - new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_TELLER"), new GrantedAuthorityImpl("ROLE_PERMISSION_LIST")}); + "test", + new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_TELLER"), new GrantedAuthorityImpl( + "ROLE_PERMISSION_LIST")}); SecureContextImpl secureContext = new SecureContextImpl(); secureContext.setAuthentication(auth); diff --git a/samples/contacts/src/main/java/sample/contact/Contact.java b/samples/contacts/src/main/java/sample/contact/Contact.java index 4c53b375d6..5b92b732ba 100644 --- a/samples/contacts/src/main/java/sample/contact/Contact.java +++ b/samples/contacts/src/main/java/sample/contact/Contact.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; diff --git a/samples/contacts/src/main/java/sample/contact/ContactManager.java b/samples/contacts/src/main/java/sample/contact/ContactManager.java index 3ecce67edb..8615d41a38 100644 --- a/samples/contacts/src/main/java/sample/contact/ContactManager.java +++ b/samples/contacts/src/main/java/sample/contact/ContactManager.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; diff --git a/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java b/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java index 348aaed3de..49e55c43b3 100644 --- a/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java +++ b/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; @@ -42,19 +50,19 @@ public class ContactManagerBackend implements ContactManager { public ContactManagerBackend() { this.contacts = new HashMap(); save(new Contact(this.getNextId(), "John Smith", "john@somewhere.com", - "marissa")); + "marissa")); save(new Contact(this.getNextId(), "Michael Citizen", - "michael@xyz.com", "marissa")); + "michael@xyz.com", "marissa")); save(new Contact(this.getNextId(), "Joe Bloggs", "joe@demo.com", - "marissa")); + "marissa")); save(new Contact(this.getNextId(), "Karen Sutherland", - "karen@sutherland.com", "dianne")); + "karen@sutherland.com", "dianne")); save(new Contact(this.getNextId(), "Mitchell Howard", - "mitchell@abcdef.com", "dianne")); + "mitchell@abcdef.com", "dianne")); save(new Contact(this.getNextId(), "Rose Costas", "rose@xyz.com", - "scott")); + "scott")); save(new Contact(this.getNextId(), "Amanda Smith", "amanda@abcdef.com", - "scott")); + "scott")); } //~ Methods ================================================================ @@ -80,7 +88,7 @@ public class ContactManagerBackend implements ContactManager { } Contact[] resultType = {new Contact(new Integer(1), "holder", "holder", - "holder")}; + "holder")}; if (list.size() == 0) { return null; diff --git a/samples/contacts/src/main/java/sample/contact/ContactManagerFacade.java b/samples/contacts/src/main/java/sample/contact/ContactManagerFacade.java index 3ef3d9a486..38fcf9e046 100644 --- a/samples/contacts/src/main/java/sample/contact/ContactManagerFacade.java +++ b/samples/contacts/src/main/java/sample/contact/ContactManagerFacade.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; @@ -78,12 +86,13 @@ public class ContactManagerFacade implements ContactManager, InitializingBean { public Contact getById(Integer id) { Contact result = backend.getById(id); Authentication auth = ((SecureContext) ContextHolder.getContext()) - .getAuthentication(); + .getAuthentication(); if (auth.getPrincipal().toString().equals(result.getOwner())) { return result; } else { - throw new AccessDeniedException("The requested id is not owned by the currently logged in user"); + throw new AccessDeniedException( + "The requested id is not owned by the currently logged in user"); } } @@ -107,7 +116,8 @@ public class ContactManagerFacade implements ContactManager, InitializingBean { public void afterPropertiesSet() throws Exception { if (backend == null) { - throw new IllegalArgumentException("A backend ContactManager implementation is required"); + throw new IllegalArgumentException( + "A backend ContactManager implementation is required"); } } diff --git a/samples/contacts/src/main/java/sample/contact/ContactSecurityVoter.java b/samples/contacts/src/main/java/sample/contact/ContactSecurityVoter.java index 652bbcbb63..adeade6c24 100644 --- a/samples/contacts/src/main/java/sample/contact/ContactSecurityVoter.java +++ b/samples/contacts/src/main/java/sample/contact/ContactSecurityVoter.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; @@ -48,7 +56,7 @@ public class ContactSecurityVoter implements AccessDecisionVoter { } public int vote(Authentication authentication, MethodInvocation invocation, - ConfigAttributeDefinition config) { + ConfigAttributeDefinition config) { int result = ACCESS_ABSTAIN; Iterator iter = config.getConfigAttributes(); @@ -68,14 +76,14 @@ public class ContactSecurityVoter implements AccessDecisionVoter { passedOwner = (String) invocation.getArgument(i); } else if (Contact.class.isAssignableFrom(argClass)) { passedOwner = ((Contact) invocation.getArgument(i)) - .getOwner(); + .getOwner(); } } if (passedOwner != null) { // Check the authentication principal matches the passed owner if (passedOwner.equals(authentication.getPrincipal() - .toString())) { + .toString())) { return ACCESS_GRANTED; } } diff --git a/samples/contacts/src/main/java/sample/contact/DeleteController.java b/samples/contacts/src/main/java/sample/contact/DeleteController.java index baf453a3fb..d1bcdecbfd 100644 --- a/samples/contacts/src/main/java/sample/contact/DeleteController.java +++ b/samples/contacts/src/main/java/sample/contact/DeleteController.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; @@ -42,13 +50,13 @@ public class DeleteController implements Controller, InitializingBean { public void afterPropertiesSet() throws Exception { if (contactManager == null) { - throw new IllegalArgumentException("A ContactManager implementation is required"); + throw new IllegalArgumentException( + "A ContactManager implementation is required"); } } public ModelAndView handleRequest(HttpServletRequest request, - HttpServletResponse response) - throws ServletException, IOException { + HttpServletResponse response) throws ServletException, IOException { Integer id = new Integer(request.getParameter("id")); Contact contact = contactManager.getById(id); contactManager.delete(contact); diff --git a/samples/contacts/src/main/java/sample/contact/PublicIndexController.java b/samples/contacts/src/main/java/sample/contact/PublicIndexController.java index 7b4492589a..2e51f6e9b4 100644 --- a/samples/contacts/src/main/java/sample/contact/PublicIndexController.java +++ b/samples/contacts/src/main/java/sample/contact/PublicIndexController.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; @@ -42,13 +50,13 @@ public class PublicIndexController implements Controller, InitializingBean { public void afterPropertiesSet() throws Exception { if (contactManager == null) { - throw new IllegalArgumentException("A ContactManager implementation is required"); + throw new IllegalArgumentException( + "A ContactManager implementation is required"); } } public ModelAndView handleRequest(HttpServletRequest request, - HttpServletResponse response) - throws ServletException, IOException { + HttpServletResponse response) throws ServletException, IOException { Contact rnd = contactManager.getRandomContact(); return new ModelAndView("hello", "contact", rnd); diff --git a/samples/contacts/src/main/java/sample/contact/SecureIndexController.java b/samples/contacts/src/main/java/sample/contact/SecureIndexController.java index 3abb2323ed..96275d09ad 100644 --- a/samples/contacts/src/main/java/sample/contact/SecureIndexController.java +++ b/samples/contacts/src/main/java/sample/contact/SecureIndexController.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; @@ -50,15 +58,15 @@ public class SecureIndexController implements Controller, InitializingBean { public void afterPropertiesSet() throws Exception { if (contactManager == null) { - throw new IllegalArgumentException("A ContactManager implementation is required"); + throw new IllegalArgumentException( + "A ContactManager implementation is required"); } } public ModelAndView handleRequest(HttpServletRequest request, - HttpServletResponse response) - throws ServletException, IOException { + HttpServletResponse response) throws ServletException, IOException { Authentication currentUser = ((SecureContext) ContextHolder.getContext()) - .getAuthentication(); + .getAuthentication(); boolean supervisor = false; GrantedAuthority[] granted = currentUser.getAuthorities(); diff --git a/samples/contacts/src/main/java/sample/contact/WebContact.java b/samples/contacts/src/main/java/sample/contact/WebContact.java index 8117c154a7..f0c16ac21c 100644 --- a/samples/contacts/src/main/java/sample/contact/WebContact.java +++ b/samples/contacts/src/main/java/sample/contact/WebContact.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; diff --git a/samples/contacts/src/main/java/sample/contact/WebContactAddController.java b/samples/contacts/src/main/java/sample/contact/WebContactAddController.java index b5512381f7..3a3cbb89e8 100644 --- a/samples/contacts/src/main/java/sample/contact/WebContactAddController.java +++ b/samples/contacts/src/main/java/sample/contact/WebContactAddController.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact; @@ -50,7 +58,7 @@ public class WebContactAddController extends SimpleFormController { .getPrincipal().toString(); Contact contact = new Contact(contactManager.getNextId(), name, email, - owner); + owner); contactManager.save(contact); Map myModel = new HashMap(); @@ -60,7 +68,7 @@ public class WebContactAddController extends SimpleFormController { } protected Object formBackingObject(HttpServletRequest request) - throws ServletException { + throws ServletException { WebContact wc = new WebContact(); return wc; diff --git a/samples/contacts/src/main/java/sample/contact/WebContactValidator.java b/samples/contacts/src/main/java/sample/contact/WebContactValidator.java index 790c6be5f9..29b7745871 100644 --- a/samples/contacts/src/main/java/sample/contact/WebContactValidator.java +++ b/samples/contacts/src/main/java/sample/contact/WebContactValidator.java @@ -1,8 +1,16 @@ -/* - * The Acegi Security System for Spring is published under the terms - * of the Apache Software License. +/* Copyright 2004 Acegi Technology Pty Limited * - * Visit http://acegisecurity.sourceforge.net for further details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sample.contact;