Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Change to Apache License version 2.0.

  • Loading branch information...
commit c3507b26c9be2860c3c03de9421368506baf9f54 1 parent 3a72fc6
Ben Alex authored
Showing with 1,745 additions and 690 deletions.
  1. +12 −4 adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java
  2. +12 −4 adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java
  3. +14 −7 adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java
  4. +12 −4 adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java
  5. +12 −4 adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java
  6. +12 −4 adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java
  7. +15 −8 core/src/main/java/org/acegisecurity/AccessDecisionManager.java
  8. +12 −4 core/src/main/java/org/acegisecurity/AccessDeniedException.java
  9. +13 −5 core/src/main/java/org/acegisecurity/AcegiSecurityException.java
  10. +12 −4 core/src/main/java/org/acegisecurity/Authentication.java
  11. +12 −4 core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java
  12. +12 −4 core/src/main/java/org/acegisecurity/AuthenticationException.java
  13. +13 −5 core/src/main/java/org/acegisecurity/AuthenticationManager.java
  14. +12 −4 core/src/main/java/org/acegisecurity/AuthenticationServiceException.java
  15. +12 −4 core/src/main/java/org/acegisecurity/BadCredentialsException.java
  16. +12 −4 core/src/main/java/org/acegisecurity/ConfigAttribute.java
  17. +12 −4 core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java
  18. +14 −5 core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java
  19. +12 −4 core/src/main/java/org/acegisecurity/DisabledException.java
  20. +12 −4 core/src/main/java/org/acegisecurity/GrantedAuthority.java
  21. +12 −4 core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java
  22. +12 −4 core/src/main/java/org/acegisecurity/LockedException.java
  23. +18 −10 core/src/main/java/org/acegisecurity/MethodDefinitionAttributes.java
  24. +31 −28 core/src/main/java/org/acegisecurity/MethodDefinitionMap.java
  25. +12 −4 core/src/main/java/org/acegisecurity/MethodDefinitionSource.java
  26. +13 −5 core/src/main/java/org/acegisecurity/MethodDefinitionSourceEditor.java
  27. +13 −6 core/src/main/java/org/acegisecurity/RunAsManager.java
  28. +12 −4 core/src/main/java/org/acegisecurity/SecurityConfig.java
  29. +12 −4 core/src/main/java/org/acegisecurity/SecurityInterceptor.java
  30. +13 −5 core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java
  31. +22 −12 core/src/main/java/org/acegisecurity/adapters/AbstractIntegrationFilter.java
  32. +12 −4 core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java
  33. +19 −10 core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java
  34. +12 −4 core/src/main/java/org/acegisecurity/adapters/AutoIntegrationFilter.java
  35. +12 −4 core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java
  36. +12 −4 core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java
  37. +14 −6 core/src/main/java/org/acegisecurity/context/Context.java
  38. +13 −5 core/src/main/java/org/acegisecurity/context/ContextException.java
  39. +12 −4 core/src/main/java/org/acegisecurity/context/ContextHolder.java
  40. +12 −4 core/src/main/java/org/acegisecurity/context/ContextHolderEmptyException.java
  41. +12 −4 core/src/main/java/org/acegisecurity/context/ContextImpl.java
  42. +13 −5 core/src/main/java/org/acegisecurity/context/ContextInterceptor.java
  43. +12 −4 core/src/main/java/org/acegisecurity/context/ContextInvalidException.java
  44. +12 −4 core/src/main/java/org/acegisecurity/context/SecureContext.java
  45. +12 −4 core/src/main/java/org/acegisecurity/context/SecureContextImpl.java
  46. +12 −4 core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java
  47. +13 −5 core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java
  48. +20 −12 core/src/main/java/org/acegisecurity/providers/ProviderManager.java
  49. +12 −4 core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java
  50. +13 −5 core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java
  51. +13 −5 core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java
  52. +14 −7 core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java
  53. +20 −11 core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
  54. +12 −4 core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java
  55. +19 −10 core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java
  56. +21 −15 core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java
  57. +13 −6 core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java
  58. +12 −4 core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java
  59. +13 −5 core/src/main/java/org/acegisecurity/userdetails/User.java
  60. +13 −6 core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java
  61. +23 −14 core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java
  62. +15 −7 core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java
  63. +12 −4 core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeDefinition.java
  64. +14 −5 core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java
  65. +12 −4 core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java
  66. +14 −6 core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java
  67. +18 −9 core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java
  68. +19 −12 core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java
  69. +14 −7 core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java
  70. +16 −8 core/src/main/java/org/acegisecurity/vote/ConsensusBased.java
  71. +16 −9 core/src/main/java/org/acegisecurity/vote/RoleVoter.java
  72. +14 −7 core/src/main/java/org/acegisecurity/vote/UnanimousBased.java
  73. +12 −4 core/src/test/java/org/acegisecurity/BankSecurityVoter.java
  74. +12 −4 core/src/test/java/org/acegisecurity/ExoticSecureContext.java
  75. +12 −4 core/src/test/java/org/acegisecurity/SecurityTests.java
  76. +12 −4 core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java
  77. +12 −4 core/src/test/java/org/acegisecurity/attribute/AttributesTests.java
  78. +12 −4 core/src/test/java/org/acegisecurity/attribute/MockAttributes.java
  79. +12 −4 core/src/test/java/org/acegisecurity/attribute/MockMethodInvocation.java
  80. +12 −4 core/src/test/java/org/acegisecurity/attribute/TestAttributes.java
  81. +12 −4 core/src/test/java/org/acegisecurity/attribute/TestService.java
  82. +12 −4 core/src/test/java/org/acegisecurity/attribute/TestServiceImpl.java
  83. +12 −4 core/src/test/java/org/acegisecurity/context/Account.java
  84. +12 −4 core/src/test/java/org/acegisecurity/context/BankManager.java
  85. +12 −4 core/src/test/java/org/acegisecurity/context/BankManagerImpl.java
  86. +12 −4 core/src/test/java/org/acegisecurity/context/ContextTests.java
  87. +12 −4 core/src/test/java/org/acegisecurity/context/ExoticContext.java
  88. +12 −4 core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java
  89. +12 −4 core/src/test/java/org/acegisecurity/runas/BankManagerPublicFacade.java
  90. +12 −4 core/src/test/java/org/acegisecurity/runas/RunAsTests.java
  91. +15 −7 core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
  92. +14 −6 core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
  93. +12 −4 core/src/test/java/org/acegisecurity/vote/VoterManagerTests.java
  94. +12 −4 core/src/test/java/org/acegisecurity/vote/XVoter.java
  95. +12 −4 core/src/test/java/org/acegisecurity/vote/YVoter.java
  96. +12 −4 integration-test/src/net/sf/acegisecurity/integrationtests/web/ContactsWarTests.java
  97. +2 −2 jalopy.xml
  98. +201 −58 license.txt
  99. +26 −0 notice.txt
  100. +12 −4 samples/attributes/src/main/java/sample/attributes/BankService.java
  101. +12 −4 samples/attributes/src/main/java/sample/attributes/BankServiceImpl.java
  102. +15 −6 samples/attributes/src/main/java/sample/attributes/BankTests.java
  103. +19 −8 samples/attributes/src/main/java/sample/attributes/Main.java
  104. +12 −4 samples/contacts/src/main/java/sample/contact/Contact.java
  105. +12 −4 samples/contacts/src/main/java/sample/contact/ContactManager.java
  106. +20 −12 samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java
  107. +17 −7 samples/contacts/src/main/java/sample/contact/ContactManagerFacade.java
  108. +15 −7 samples/contacts/src/main/java/sample/contact/ContactSecurityVoter.java
  109. +15 −7 samples/contacts/src/main/java/sample/contact/DeleteController.java
  110. +15 −7 samples/contacts/src/main/java/sample/contact/PublicIndexController.java
  111. +16 −8 samples/contacts/src/main/java/sample/contact/SecureIndexController.java
  112. +12 −4 samples/contacts/src/main/java/sample/contact/WebContact.java
  113. +14 −6 samples/contacts/src/main/java/sample/contact/WebContactAddController.java
  114. +12 −4 samples/contacts/src/main/java/sample/contact/WebContactValidator.java
View
16 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;
View
16 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;
View
21 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 Object extractFromContainer(ServletRequest request) {
} catch (NamingException ne) {
if (super.logger.isDebugEnabled()) {
super.logger.warn("Lookup on Subject failed "
- + ne.getLocalizedMessage());
+ + ne.getLocalizedMessage());
}
}
@@ -57,8 +65,7 @@ public Object extractFromContainer(ServletRequest request) {
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) {
View
16 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;
View
16 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;
View
16 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;
View
23 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 @@
* @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 <code>AccessDecisionManager</code> is able to
* process authorization requests presented with the passed
* <code>ConfigAttribute</code>.
- *
+ *
* <p>
* This allows the <code>SecurityInterceptor</code> to check every
* configuration attribute can be consumed by the configured
View
16 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;
View
18 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 @@
/**
* Abstract superclass for all exceptions thrown in the security package and
* subpackages.
- *
+ *
* <p>
* Note that this is a runtime (unchecked) exception. Security exceptions are
* usually fatal; there is no reason for them to be checked.
View
16 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;
View
16 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;
View
16 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;
View
18 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 @@
* @throws AuthenticationException if authentication fails
*/
public Authentication authenticate(Authentication authentication)
- throws AuthenticationException;
+ throws AuthenticationException;
}
View
16 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;
View
16 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;
View
16 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;
View
16 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;
View
19 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 void setAsText(String s) throws IllegalArgumentException {
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);
View
16 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;
View
16 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;
View
16 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;
View
16 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;
View
28 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 @@ private void add(ConfigAttributeDefinition definition, Collection attribs) {
}
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 @@ private void addClassAttributes(ConfigAttributeDefinition definition,
}
}
- 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 @@ private void addInterfaceMethodAttributes(ConfigAttributeDefinition definition,
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 @@ private void addInterfaceMethodAttributes(ConfigAttributeDefinition definition,
}
private void addMethodAttributes(ConfigAttributeDefinition definition,
- Method method) {
+ Method method) {
// add the method level attributes
Collection methodAttributes = attributes.getAttributes(method);
View
59 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 ConfigAttributeDefinition getAttributes(MethodInvocation invocation) {
return (ConfigAttributeDefinition) this.methodMap.get(invocation
- .getMethod());
+ .getMethod());
}
public Iterator getConfigAttributeDefinitions() {
@@ -61,7 +69,7 @@ public Iterator getConfigAttributeDefinitions() {
*/
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 void addSecureMethod(String name, ConfigAttributeDefinition attr) {
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 void addSecureMethod(String name, ConfigAttributeDefinition attr) {
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 void addSecureMethod(String name, ConfigAttributeDefinition attr) {
* @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 void addSecureMethod(Class clazz, String mappedName,
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 void addSecureMethod(Class clazz, String mappedName,
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 void addSecureMethod(Class clazz, String mappedName,
} 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 void addSecureMethod(Class clazz, String mappedName,
*/
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())));
}
}
View
16 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;
View
18 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 void setAsText(String s) throws IllegalArgumentException {
configAttribEd.setAsText(value);
ConfigAttributeDefinition attr = (ConfigAttributeDefinition) configAttribEd
- .getValue();
+ .getValue();
// Register name and attribute
source.addSecureMethod(name, attr);
View
19 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 @@
* invocation
*/
public Authentication buildRunAs(Authentication authentication,
- MethodInvocation invocation,
- ConfigAttributeDefinition config);
+ MethodInvocation invocation, ConfigAttributeDefinition config);
/**
* Indicates whether this <code>RunAsManager</code> is able to process the
View
16 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;
View
16 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;
View
18 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 @@ protected 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;
View
34 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 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 void doFilter(ServletRequest request, ServletResponse response,
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 void doFilter(ServletRequest request, ServletResponse response,
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 void doFilter(ServletRequest request, ServletResponse response,
// 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");
}
}
}
View
16 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;
View
29 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 @@
* </p>
*
* <P>
- * If the key does not match, a <code>BadCredentialsException</code> is
- * thrown.
+ * If the key does not match, a <code>BadCredentialsException</code> is thrown.
* </p>
*
* @author Ben Alex
* @version $Id$
*/
public class AuthByAdapterProvider implements InitializingBean,
- AuthenticationProvider {
+ AuthenticationProvider {
//~ Instance fields ========================================================
private String key;
@@ -52,18 +59,20 @@ public String getKey() {
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");
}
}
View
16 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;
View
16 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;
View
16 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;
View
20 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 @@
* Check the <code>Context</code> is properly configured.
*
* <P>
- * 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}.
* </p>
*
* @throws ContextInvalidException if the <code>Context</code> is invalid.
View
18 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 @@
/**
* Abstract superclass for all exceptions thrown in the context package and
* subpackages.
- *
+ *
* <p>
* Note that this is a runtime (unchecked) exception.
* </p>
View
16 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;
View
16 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;
View
16 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;
View
18 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 Object invoke(MethodInvocation mi) throws Throwable {
if (ContextHolder.getContext() == null) {
throw new ContextHolderEmptyException("ContextHolder does not contain a Context",
- null);
+ null);
}
ContextHolder.getContext().validate();
View
16 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;
View
16 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;
View
16 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;
View
16 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;
View
18 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 @@
* @throws AuthenticationException if authentication fails.
*/
public Authentication authenticate(Authentication authentication)
- throws AuthenticationException;
+ throws AuthenticationException;
/**
* Returns true if this <Code>AuthenticationProvider</code> supports the
View
32 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 void setProviders(List newList) {
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 void afterPropertiesSet() throws Exception {
* @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");
}
}
}
View
16 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;
View
18 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 @@
//~ Methods ================================================================
public Authentication authenticate(Authentication authentication)
- throws AuthenticationException {
+ throws AuthenticationException {
return authentication;
}
View
18 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 @@
//~ Constructors ===========================================================
public TestingAuthenticationToken(Object principal, Object credentials,
- GrantedAuthority[] authorities) {
+ GrantedAuthority[] authorities) {
this.principal = principal;
this.credentials = credentials;
this.authorities = authorities;
View
21 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 @@
//~ 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;
View
31 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 @@
* @version $Id$
*/
public class DaoAuthenticationProvider implements AuthenticationProvider,
- InitializingBean {
+ InitializingBean {
//~ Instance fields ========================================================
private AuthenticationDao authenticationDao;
@@ -83,12 +91,13 @@ public boolean isIgnoreUsernameCase() {
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 Authentication authenticate(Authentication authentication)
throw new BadCredentialsException("Bad credentials presented");
} catch (DataAccessException repositoryProblem) {
throw new AuthenticationServiceException(repositoryProblem
- .getMessage());
+ .getMessage());
}
if (!user.isEnabled()) {
@@ -110,12 +119,12 @@ public Authentication authenticate(Authentication authentication)
}
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;
View
16 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;
View
29 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 @@
* </p>
*
* <P>
- * If the key does not match, a <code>BadCredentialsException</code> is
- * thrown.
+ * If the key does not match, a <code>BadCredentialsException</code> is thrown.
* </p>
*
* @author Ben Alex
* @version $Id$
*/
public class RunAsImplAuthenticationProvider implements InitializingBean,
- AuthenticationProvider {
+ AuthenticationProvider {
//~ Instance fields ========================================================
private String key;
@@ -52,18 +59,20 @@ public String getKey() {
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");
}
}
View
36 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 String getKey() {
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 Authentication buildRunAs(Authentication authentication,
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 Authentication buildRunAs(Authentication authentication,
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;
View
19 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