You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2010/05/26 20:34:49 UTC
svn commit: r948527 [2/38] - in /incubator/shiro: branches/shiro-root-1.0.x/
branches/shiro-root-1.0.x/all/
branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/
branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/
branches/shiro...
Modified: incubator/shiro/branches/shiro-root-1.0.x/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/LICENSE.txt?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/LICENSE.txt (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/LICENSE.txt Wed May 26 18:34:28 2010
@@ -1,201 +1,201 @@
- 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
+ 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.
\ No newline at end of file
Propchange: incubator/shiro/branches/shiro-root-1.0.x/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/NOTICE.txt?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/NOTICE.txt (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/NOTICE.txt Wed May 26 18:34:28 2010
@@ -1,27 +1,27 @@
-Apache Shiro
-Copyright 2008-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-=======================================================================
-== NOTICE accounting for Apache Shiro's use of initial ideas from ==
-== Dr. Heinz Kabutz's SoftHashMap implementation. ==
-=======================================================================
-This product includes an org.apache.shiro.util.SoftHashMap
-implementation based on initial ideas from Dr. Heinz Kabutz's publicly
-posted version found here:
- http://www.javaspecialists.eu/archive/Issue015.html
-with continued modifications. Per Heinz Kabutz: "you have my express
-permission to publish it in Apache Shiro - please leave a link in the
-source code pointing to my website":
-
- http://www.javaspecialists.eu
-
-=======================================================================
-== NOTICE from the Spring Framework's 2.5.6 distribution accounting ==
-== for Shiro's use of certain parts of their source code for ==
-== simplicity/re-use (e.g. StringUtils, et. al.) ==
-=======================================================================
-This product includes software developed by the Spring Framework
-Project (http://www.springframework.org).
+Apache Shiro
+Copyright 2008-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+=======================================================================
+== NOTICE accounting for Apache Shiro's use of initial ideas from ==
+== Dr. Heinz Kabutz's SoftHashMap implementation. ==
+=======================================================================
+This product includes an org.apache.shiro.util.SoftHashMap
+implementation based on initial ideas from Dr. Heinz Kabutz's publicly
+posted version found here:
+ http://www.javaspecialists.eu/archive/Issue015.html
+with continued modifications. Per Heinz Kabutz: "you have my express
+permission to publish it in Apache Shiro - please leave a link in the
+source code pointing to my website":
+
+ http://www.javaspecialists.eu
+
+=======================================================================
+== NOTICE from the Spring Framework's 2.5.6 distribution accounting ==
+== for Shiro's use of certain parts of their source code for ==
+== simplicity/re-use (e.g. StringUtils, et. al.) ==
+=======================================================================
+This product includes software developed by the Spring Framework
+Project (http://www.springframework.org).
Propchange: incubator/shiro/branches/shiro-root-1.0.x/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/README.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/README.txt?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/README.txt (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/README.txt Wed May 26 18:34:28 2010
@@ -1,18 +1,18 @@
-This distribution includes cryptographic software. The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software. BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted. See http://www.wassenaar.org for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms. The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
+This distribution includes cryptographic software. The country in
+which you currently reside may have restrictions on the import,
+possession, use, and/or re-export to another country, of
+encryption software. BEFORE using any encryption software, please
+check your country's laws, regulations and policies concerning the
+import, possession, or use, and re-export of encryption software, to
+see if this is permitted. See http://www.wassenaar.org for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms. The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
Propchange: incubator/shiro/branches/shiro-root-1.0.x/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/all/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/all/pom.xml?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/all/pom.xml (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/all/pom.xml Wed May 26 18:34:28 2010
@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you 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.
- -->
-<!--suppress osmorcNonOsgiMavenDependency -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shiro-all</artifactId>
- <name>Apache Shiro :: Jar Bundle</name>
- <description>Creates a bundled Shiro .jar from the module jars</description>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-ehcache</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-spring</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.3.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${project.groupId}:shiro-core</include>
- <include>${project.groupId}:shiro-web</include>
- <include>${project.groupId}:shiro-ehcache</include>
- <include>${project.groupId}:shiro-quartz</include>
- <include>${project.groupId}:shiro-spring</include>
- </includes>
- </artifactSet>
- <!-- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <projectName>Apache ActiveMQ</projectName>
- </transformer>
- </transformers> -->
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
-
- <executions>
- <execution>
- <id>verify-legal-files</id>
- <phase>verify</phase>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <strict>false</strict>
- </configuration>
- </execution>
- </executions>
- </plugin> -->
-
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ -->
+<!--suppress osmorcNonOsgiMavenDependency -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-root</artifactId>
+ <version>1.0.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>shiro-all</artifactId>
+ <name>Apache Shiro :: Jar Bundle</name>
+ <description>Creates a bundled Shiro .jar from the module jars</description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-ehcache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${project.groupId}:shiro-core</include>
+ <include>${project.groupId}:shiro-web</include>
+ <include>${project.groupId}:shiro-ehcache</include>
+ <include>${project.groupId}:shiro-quartz</include>
+ <include>${project.groupId}:shiro-spring</include>
+ </includes>
+ </artifactSet>
+ <!-- <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+ <projectName>Apache ActiveMQ</projectName>
+ </transformer>
+ </transformers> -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin> -->
+
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Propchange: incubator/shiro/branches/shiro-root-1.0.x/all/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/SecurityUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java Wed May 26 18:34:28 2010
@@ -1,36 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.shiro;
-
-/**
- * Exception thrown when attempting to acquire the application's {@code SecurityManager} instance, but Shiro's
- * lookup heuristics cannot find one. This typically indicates an invalid application configuration.
- *
- * @since 1.0
- */
-public class UnavailableSecurityManagerException extends ShiroException {
-
- public UnavailableSecurityManagerException(String message) {
- super(message);
- }
-
- public UnavailableSecurityManagerException(String message, Throwable cause) {
- super(message, cause);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.shiro;
+
+/**
+ * Exception thrown when attempting to acquire the application's {@code SecurityManager} instance, but Shiro's
+ * lookup heuristics cannot find one. This typically indicates an invalid application configuration.
+ *
+ * @since 1.0
+ */
+public class UnavailableSecurityManagerException extends ShiroException {
+
+ public UnavailableSecurityManagerException(String message) {
+ super(message);
+ }
+
+ public UnavailableSecurityManagerException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/AnnotationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/AnnotationMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/MethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/MethodInterceptorSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/MethodInvocation.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/package-info.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/package-info.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/package-info.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/package-info.java Wed May 26 18:34:28 2010
@@ -1,26 +1,26 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-/**
- * Components used to support the framework's AOP/interception support classes.
- * <p/>
- * As this package is a root-level package under <tt>org.apache.shiro</tt>, it contains AOP support classes
- * useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
- * authentication, etc) will use these classes as their base in their respective packages.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+/**
+ * Components used to support the framework's AOP/interception support classes.
+ * <p/>
+ * As this package is a root-level package under <tt>org.apache.shiro</tt>, it contains AOP support classes
+ * useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
+ * authentication, etc) will use these classes as their base in their respective packages.
+ */
package org.apache.shiro.aop;
\ No newline at end of file
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java Wed May 26 18:34:28 2010
@@ -1,56 +1,56 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.shiro.authc;
-
-import org.apache.shiro.subject.PrincipalCollection;
-
-/**
- * An {@code AuthenticationListener} listens for notifications while {@code Subject}s authenticate with the system.
- *
- * @author Les Hazlewood
- * @since 0.9
- */
-public interface AuthenticationListener {
-
- /**
- * Callback triggered when an authentication attempt for a {@code Subject} has succeeded.
- *
- * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
- * @param info the authentication-related account data acquired after authentication for the corresponding {@code Subject}.
- */
- void onSuccess(AuthenticationToken token, AuthenticationInfo info);
-
- /**
- * Callback triggered when an authentication attempt for a {@code Subject} has failed.
- *
- * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
- * @param ae the {@code AuthenticationException} that occurred as a result of the attempt.
- */
- void onFailure(AuthenticationToken token, AuthenticationException ae);
-
- /**
- * Callback triggered when a {@code Subject} logs-out of the system.
- * <p/>
- * This method will only be triggered when a Subject explicitly logs-out of the session. It will not
- * be triggered if their Session times out.
- *
- * @param principals the identifying principals of the Subject logging out.
- */
- void onLogout(PrincipalCollection principals);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.shiro.authc;
+
+import org.apache.shiro.subject.PrincipalCollection;
+
+/**
+ * An {@code AuthenticationListener} listens for notifications while {@code Subject}s authenticate with the system.
+ *
+ * @author Les Hazlewood
+ * @since 0.9
+ */
+public interface AuthenticationListener {
+
+ /**
+ * Callback triggered when an authentication attempt for a {@code Subject} has succeeded.
+ *
+ * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
+ * @param info the authentication-related account data acquired after authentication for the corresponding {@code Subject}.
+ */
+ void onSuccess(AuthenticationToken token, AuthenticationInfo info);
+
+ /**
+ * Callback triggered when an authentication attempt for a {@code Subject} has failed.
+ *
+ * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
+ * @param ae the {@code AuthenticationException} that occurred as a result of the attempt.
+ */
+ void onFailure(AuthenticationToken token, AuthenticationException ae);
+
+ /**
+ * Callback triggered when a {@code Subject} logs-out of the system.
+ * <p/>
+ * This method will only be triggered when a Subject explicitly logs-out of the session. It will not
+ * be triggered if their Session times out.
+ *
+ * @param principals the identifying principals of the Subject logging out.
+ */
+ void onLogout(PrincipalCollection principals);
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/HostAuthenticationToken.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/HostAuthenticationToken.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/HostAuthenticationToken.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/HostAuthenticationToken.java Wed May 26 18:34:28 2010
@@ -1,45 +1,45 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.shiro.authc;
-
-/**
- * A {@code HostAuthenticationToken} retains the host information from where
- * an authentication attempt originates.
- *
- * @author The Apache Shiro Project (shiro-dev@incubator.apache.org)
- * @since 1.0
- */
-public interface HostAuthenticationToken {
-
- /**
- * Returns the host name of the client from where the
- * authentication attempt originates or if the Shiro environment cannot or
- * chooses not to resolve the hostname to improve performance, this method
- * returns the String representation of the client's IP address.
- * <p/>
- * When used in web environments, this value is usually the same as the
- * {@code ServletRequest.getRemoteHost()} value.
- *
- * @return the fully qualified name of the client from where the
- * authentication attempt originates or the String representation
- * of the client's IP address is hostname resolution is not
- * available or disabled.
- */
- String getHost();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.shiro.authc;
+
+/**
+ * A {@code HostAuthenticationToken} retains the host information from where
+ * an authentication attempt originates.
+ *
+ * @author The Apache Shiro Project (shiro-dev@incubator.apache.org)
+ * @since 1.0
+ */
+public interface HostAuthenticationToken {
+
+ /**
+ * Returns the host name of the client from where the
+ * authentication attempt originates or if the Shiro environment cannot or
+ * chooses not to resolve the hostname to improve performance, this method
+ * returns the String representation of the client's IP address.
+ * <p/>
+ * When used in web environments, this value is usually the same as the
+ * {@code ServletRequest.getRemoteHost()} value.
+ *
+ * @return the fully qualified name of the client from where the
+ * authentication attempt originates or the String representation
+ * of the client's IP address is hostname resolution is not
+ * available or disabled.
+ */
+ String getHost();
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/HostAuthenticationToken.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/LogoutAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/MergableAuthenticationInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/RememberMeAuthenticationToken.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/SimpleAuthenticationInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/AllowAllCredentialsMatcher.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/AllowAllCredentialsMatcher.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/AllowAllCredentialsMatcher.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/AllowAllCredentialsMatcher.java Wed May 26 18:34:28 2010
@@ -1,45 +1,45 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.shiro.authc.credential;
-
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-
-/**
- * A credentials matcher that always returns <tt>true</tt> when matching credentials no matter what arguments
- * are passed in. This can be used for testing or when credentials are implicitly trusted for a particular
- * {@link org.apache.shiro.realm.Realm Realm}.
- *
- * @author Jeremy Haile
- * @author Les Hazlewood
- * @since 0.2
- */
-public class AllowAllCredentialsMatcher implements CredentialsMatcher {
-
- /**
- * Returns <code>true</code> <em>always</em> no matter what the method arguments are.
- *
- * @param token the token submitted for authentication.
- * @param info the account being verified for access
- * @return <code>true</code> <em>always</em>.
- */
- public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) {
- return true;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.shiro.authc.credential;
+
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+
+/**
+ * A credentials matcher that always returns <tt>true</tt> when matching credentials no matter what arguments
+ * are passed in. This can be used for testing or when credentials are implicitly trusted for a particular
+ * {@link org.apache.shiro.realm.Realm Realm}.
+ *
+ * @author Jeremy Haile
+ * @author Les Hazlewood
+ * @since 0.2
+ */
+public class AllowAllCredentialsMatcher implements CredentialsMatcher {
+
+ /**
+ * Returns <code>true</code> <em>always</em> no matter what the method arguments are.
+ *
+ * @param token the token submitted for authentication.
+ * @param info the account being verified for access
+ * @return <code>true</code> <em>always</em>.
+ */
+ public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) {
+ return true;
+ }
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/AllowAllCredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/HashedCredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/Md2CredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/Md5CredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/Sha1CredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/Sha256CredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/Sha384CredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/Sha512CredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/SimpleCredentialsMatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/credential/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AbstractAuthenticationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AbstractAuthenticationStrategy.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AbstractAuthenticationStrategy.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AbstractAuthenticationStrategy.java Wed May 26 18:34:28 2010
@@ -1,98 +1,98 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.shiro.authc.pam;
-
-import org.apache.shiro.authc.*;
-import org.apache.shiro.realm.Realm;
-
-import java.util.Collection;
-
-
-/**
- * Abstract base implementation for Shiro's concrete <code>AuthenticationStrategy</code>
- * implementations.
- *
- * @author Jeremy Haile
- * @author Les Hazlewood
- * @since 0.9
- */
-public abstract class AbstractAuthenticationStrategy implements AuthenticationStrategy {
-
- /**
- * Simply returns <code>new {@link org.apache.shiro.authc.SimpleAuthenticationInfo SimpleAuthenticationInfo}();</code>, which supports
- * aggregating account data across realms.
- */
- public AuthenticationInfo beforeAllAttempts(Collection<? extends Realm> realms, AuthenticationToken token) throws AuthenticationException {
- return new SimpleAuthenticationInfo();
- }
-
- /**
- * Simply returns the <code>aggregate</code> method argument, without modification.
- */
- public AuthenticationInfo beforeAttempt(Realm realm, AuthenticationToken token, AuthenticationInfo aggregate) throws AuthenticationException {
- return aggregate;
- }
-
- /**
- * Base implementation that will aggregate the specified <code>singleRealmInfo</code> into the
- * <code>aggregateInfo</code> and then returns the aggregate. Can be overridden by subclasses for custom behavior.
- */
- public AuthenticationInfo afterAttempt(Realm realm, AuthenticationToken token, AuthenticationInfo singleRealmInfo, AuthenticationInfo aggregateInfo, Throwable t) throws AuthenticationException {
- AuthenticationInfo info;
- if (singleRealmInfo == null) {
- info = aggregateInfo;
- } else {
- if (aggregateInfo == null) {
- info = singleRealmInfo;
- } else {
- info = merge(singleRealmInfo, aggregateInfo);
- }
- }
-
- return info;
- }
-
- /**
- * Merges the specified <code>info</code> argument into the <code>aggregate</code> argument and then returns an
- * aggregate for continued use throughout the login process.
- * <p/>
- * This implementation merely checks to see if the specified <code>aggregate</code> argument is an instance of
- * {@link org.apache.shiro.authc.MergableAuthenticationInfo MergableAuthenticationInfo}, and if so, calls
- * <code>aggregate.merge(info)</code> If it is <em>not</em> an instance of
- * <code>MergableAuthenticationInfo</code>, an {@link IllegalArgumentException IllegalArgumentException} is thrown.
- * Can be overridden by subclasses for custom merging behavior if implementing the
- * {@link org.apache.shiro.authc.MergableAuthenticationInfo MergableAuthenticationInfo} is not desired for some reason.
- */
- protected AuthenticationInfo merge(AuthenticationInfo info, AuthenticationInfo aggregate) {
- if( aggregate instanceof MergableAuthenticationInfo ) {
- ((MergableAuthenticationInfo)aggregate).merge(info);
- return aggregate;
- } else {
- throw new IllegalArgumentException( "Attempt to merge authentication info from multiple realms, but aggregate " +
- "AuthenticationInfo is not of type MergableAuthenticationInfo." );
- }
- }
-
- /**
- * Simply returns the <code>aggregate</code> argument without modification. Can be overridden for custom behavior.
- */
- public AuthenticationInfo afterAllAttempts(AuthenticationToken token, AuthenticationInfo aggregate) throws AuthenticationException {
- return aggregate;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.shiro.authc.pam;
+
+import org.apache.shiro.authc.*;
+import org.apache.shiro.realm.Realm;
+
+import java.util.Collection;
+
+
+/**
+ * Abstract base implementation for Shiro's concrete <code>AuthenticationStrategy</code>
+ * implementations.
+ *
+ * @author Jeremy Haile
+ * @author Les Hazlewood
+ * @since 0.9
+ */
+public abstract class AbstractAuthenticationStrategy implements AuthenticationStrategy {
+
+ /**
+ * Simply returns <code>new {@link org.apache.shiro.authc.SimpleAuthenticationInfo SimpleAuthenticationInfo}();</code>, which supports
+ * aggregating account data across realms.
+ */
+ public AuthenticationInfo beforeAllAttempts(Collection<? extends Realm> realms, AuthenticationToken token) throws AuthenticationException {
+ return new SimpleAuthenticationInfo();
+ }
+
+ /**
+ * Simply returns the <code>aggregate</code> method argument, without modification.
+ */
+ public AuthenticationInfo beforeAttempt(Realm realm, AuthenticationToken token, AuthenticationInfo aggregate) throws AuthenticationException {
+ return aggregate;
+ }
+
+ /**
+ * Base implementation that will aggregate the specified <code>singleRealmInfo</code> into the
+ * <code>aggregateInfo</code> and then returns the aggregate. Can be overridden by subclasses for custom behavior.
+ */
+ public AuthenticationInfo afterAttempt(Realm realm, AuthenticationToken token, AuthenticationInfo singleRealmInfo, AuthenticationInfo aggregateInfo, Throwable t) throws AuthenticationException {
+ AuthenticationInfo info;
+ if (singleRealmInfo == null) {
+ info = aggregateInfo;
+ } else {
+ if (aggregateInfo == null) {
+ info = singleRealmInfo;
+ } else {
+ info = merge(singleRealmInfo, aggregateInfo);
+ }
+ }
+
+ return info;
+ }
+
+ /**
+ * Merges the specified <code>info</code> argument into the <code>aggregate</code> argument and then returns an
+ * aggregate for continued use throughout the login process.
+ * <p/>
+ * This implementation merely checks to see if the specified <code>aggregate</code> argument is an instance of
+ * {@link org.apache.shiro.authc.MergableAuthenticationInfo MergableAuthenticationInfo}, and if so, calls
+ * <code>aggregate.merge(info)</code> If it is <em>not</em> an instance of
+ * <code>MergableAuthenticationInfo</code>, an {@link IllegalArgumentException IllegalArgumentException} is thrown.
+ * Can be overridden by subclasses for custom merging behavior if implementing the
+ * {@link org.apache.shiro.authc.MergableAuthenticationInfo MergableAuthenticationInfo} is not desired for some reason.
+ */
+ protected AuthenticationInfo merge(AuthenticationInfo info, AuthenticationInfo aggregate) {
+ if( aggregate instanceof MergableAuthenticationInfo ) {
+ ((MergableAuthenticationInfo)aggregate).merge(info);
+ return aggregate;
+ } else {
+ throw new IllegalArgumentException( "Attempt to merge authentication info from multiple realms, but aggregate " +
+ "AuthenticationInfo is not of type MergableAuthenticationInfo." );
+ }
+ }
+
+ /**
+ * Simply returns the <code>aggregate</code> argument without modification. Can be overridden for custom behavior.
+ */
+ public AuthenticationInfo afterAllAttempts(AuthenticationToken token, AuthenticationInfo aggregate) throws AuthenticationException {
+ return aggregate;
+ }
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AbstractAuthenticationStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AllSuccessfulStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AtLeastOneSuccessfulStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/AuthenticationStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/FirstSuccessfulStrategy.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/FirstSuccessfulStrategy.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/FirstSuccessfulStrategy.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/FirstSuccessfulStrategy.java Wed May 26 18:34:28 2010
@@ -1,62 +1,62 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.shiro.authc.pam;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.util.CollectionUtils;
-
-import java.util.Collection;
-
-/**
- * {@link AuthenticationStrategy} implementation that only accepts the account data from
- * the first successfully consulted Realm and ignores all subsequent realms. This is slightly
- * different behavior than {@link AtLeastOneSuccessfulStrategy}, so please review both to see
- * which one meets your needs better.
- *
- * @author Les Hazlewood
- * @see AtLeastOneSuccessfulStrategy AtLeastOneSuccessfulAuthenticationStrategy
- * @since 0.9
- */
-public class FirstSuccessfulStrategy extends AbstractAuthenticationStrategy {
-
- /**
- * Returns {@code null} immediately, relying on this class's {@link #merge merge} implementation to return
- * only the first {@code info} object it encounters, ignoring all subsequent ones.
- */
- public AuthenticationInfo beforeAllAttempts(Collection<? extends Realm> realms, AuthenticationToken token) throws AuthenticationException {
- return null;
- }
-
- /**
- * Returns the specified {@code aggregate} instance if is non null and valid (that is, has principals and they are
- * not empty) immediately, or, if it is null or not valid, the {@code info} argument is returned instead.
- * <p/>
- * This logic ensures that the first valid info encountered is the one retained and all subsequent ones are ignored,
- * since this strategy mandates that only the info from the first successfully authenticated realm be used.
- */
- protected AuthenticationInfo merge(AuthenticationInfo info, AuthenticationInfo aggregate) {
- if (aggregate != null && !CollectionUtils.isEmpty(aggregate.getPrincipals())) {
- return aggregate;
- }
- return info != null ? info : aggregate;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.shiro.authc.pam;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.util.CollectionUtils;
+
+import java.util.Collection;
+
+/**
+ * {@link AuthenticationStrategy} implementation that only accepts the account data from
+ * the first successfully consulted Realm and ignores all subsequent realms. This is slightly
+ * different behavior than {@link AtLeastOneSuccessfulStrategy}, so please review both to see
+ * which one meets your needs better.
+ *
+ * @author Les Hazlewood
+ * @see AtLeastOneSuccessfulStrategy AtLeastOneSuccessfulAuthenticationStrategy
+ * @since 0.9
+ */
+public class FirstSuccessfulStrategy extends AbstractAuthenticationStrategy {
+
+ /**
+ * Returns {@code null} immediately, relying on this class's {@link #merge merge} implementation to return
+ * only the first {@code info} object it encounters, ignoring all subsequent ones.
+ */
+ public AuthenticationInfo beforeAllAttempts(Collection<? extends Realm> realms, AuthenticationToken token) throws AuthenticationException {
+ return null;
+ }
+
+ /**
+ * Returns the specified {@code aggregate} instance if is non null and valid (that is, has principals and they are
+ * not empty) immediately, or, if it is null or not valid, the {@code info} argument is returned instead.
+ * <p/>
+ * This logic ensures that the first valid info encountered is the one retained and all subsequent ones are ignored,
+ * since this strategy mandates that only the info from the first successfully authenticated realm be used.
+ */
+ protected AuthenticationInfo merge(AuthenticationInfo info, AuthenticationInfo aggregate) {
+ if (aggregate != null && !CollectionUtils.isEmpty(aggregate.getPrincipals())) {
+ return aggregate;
+ }
+ return info != null ? info : aggregate;
+ }
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/FirstSuccessfulStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/UnsupportedTokenException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authc/pam/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/AuthorizationInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/Permission.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizationInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/SimpleRole.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/annotation/RequiresAuthentication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/annotation/RequiresGuest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/annotation/RequiresUser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/annotation/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/AnnotationsAuthorizingMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/AuthenticatedAnnotationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/AuthenticatedAnnotationMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/GuestAnnotationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/GuestAnnotationMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/authz/aop/PermissionAnnotationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native