SHIRO-296 - Typo fixes in javadoc and exceptions.
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/f9fb8b98 Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/f9fb8b98 Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/f9fb8b98 Branch: refs/heads/master Commit: f9fb8b981779704df9ee78e3714954974f4026d8 Parents: 68d1d93 Author: Bruce Mitchener <bruce.mitche...@gmail.com> Authored: Sat May 14 19:45:48 2011 +0700 Committer: Brian Demers <bdem...@apache.org> Committed: Tue Oct 18 12:07:13 2016 -0400 ---------------------------------------------------------------------- .../shiro/authc/AbstractAuthenticator.java | 2 +- .../apache/shiro/authc/AuthenticationInfo.java | 2 +- .../apache/shiro/authc/AuthenticationToken.java | 2 +- .../shiro/authc/UsernamePasswordToken.java | 32 ++++++++++---------- .../credential/HashedCredentialsMatcher.java | 2 +- .../org/apache/shiro/authc/package-info.java | 2 +- .../authc/pam/AtLeastOneSuccessfulStrategy.java | 2 +- .../shiro/authc/pam/AuthenticationStrategy.java | 2 +- .../authc/pam/ModularRealmAuthenticator.java | 4 +-- .../apache/shiro/authz/AuthorizationInfo.java | 2 +- .../java/org/apache/shiro/authz/Authorizer.java | 8 ++--- .../java/org/apache/shiro/authz/Permission.java | 4 +-- .../shiro/authz/SimpleAuthorizationInfo.java | 2 +- .../annotation/RequiresAuthentication.java | 2 +- .../shiro/authz/annotation/RequiresRoles.java | 2 +- .../shiro/authz/annotation/RequiresUser.java | 2 +- .../shiro/authz/annotation/package-info.java | 2 +- .../org/apache/shiro/authz/package-info.java | 2 +- .../main/java/org/apache/shiro/realm/Realm.java | 6 ++-- .../shiro/realm/text/PropertiesRealm.java | 4 +-- .../realm/text/TextConfigurationRealm.java | 2 +- .../java/org/apache/shiro/session/Session.java | 4 +-- .../shiro/session/SessionListenerAdapter.java | 6 ++-- .../session/mgt/AbstractSessionManager.java | 2 +- .../session/mgt/ValidatingSessionManager.java | 2 +- .../org/apache/shiro/session/package-info.java | 4 +-- .../shiro/subject/PrincipalCollection.java | 2 +- .../subject/SimplePrincipalCollection.java | 4 +-- .../java/org/apache/shiro/subject/Subject.java | 4 +-- .../org/apache/shiro/subject/package-info.java | 2 +- .../org/apache/shiro/util/ThreadContext.java | 4 +-- .../org/apache/shiro/util/package-info.java | 2 +- .../shiro/realm/AuthorizingRealmTest.java | 4 +-- .../java/org/apache/shiro/codec/Base64.java | 6 ++-- .../main/java/org/apache/shiro/codec/Hex.java | 16 +++++----- .../org/apache/shiro/io/DefaultSerializer.java | 2 +- .../java/org/apache/shiro/io/ResourceUtils.java | 2 +- .../java/org/apache/shiro/io/Serializer.java | 4 +-- .../quickstart/src/main/java/Quickstart.java | 2 +- .../shiro/cache/ehcache/EhCacheManager.java | 6 ++-- .../QuartzSessionValidationScheduler.java | 2 +- .../SecureRemoteInvocationExecutor.java | 2 +- 42 files changed, 85 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java b/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java index f55a7d8..4a1c081 100644 --- a/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java +++ b/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java @@ -172,7 +172,7 @@ public abstract class AbstractAuthenticator implements Authenticator, LogoutAwar * authentication behavior.</li> * <li>If an {@code AuthenticationException} is thrown during {@code doAuthenticate}, * {@link #notifyFailure(AuthenticationToken, AuthenticationException) notify} any registered - * {@link AuthenticationListener AuthenticationListener}s of the exception and then propogate the exception + * {@link AuthenticationListener AuthenticationListener}s of the exception and then propagate the exception * for the caller to handle.</li> * <li>If no exception is thrown (indicating a successful login), * {@link #notifySuccess(AuthenticationToken, AuthenticationInfo) notify} any registered http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java b/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java index 07fe3e6..f00920b 100644 --- a/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java +++ b/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java @@ -45,7 +45,7 @@ import java.io.Serializable; * <code>Account</code> interface for a given <code>Realm</code> is entirely based on your application's needs or your * preferences. * <p/> - * <p><b>Pleae note:</b> Since Shiro sometimes logs authentication operations, please ensure your AuthenticationInfo's + * <p><b>Please note:</b> Since Shiro sometimes logs authentication operations, please ensure your AuthenticationInfo's * <code>toString()</code> implementation does <em>not</em> print out account credentials (password, etc), as these might be viewable to * someone reading your logs. This is good practice anyway, and account credentials should rarely (if ever) be printed * out for any reason. If you're using Shiro's default implementations of this interface, they only ever print the http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java b/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java index 7da053f..5f5b682 100644 --- a/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java +++ b/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java @@ -43,7 +43,7 @@ import java.io.Serializable; * {@link UsernamePasswordToken UsernamePasswordToken} class, as it is probably sufficient for your needs. * <p/> * <p>RememberMe services are enabled for a token if they implement a sub-interface of this one, called - * {@link RememberMeAuthenticationToken RememberMeAuthenticationToken}. Implement that interfac if you need + * {@link RememberMeAuthenticationToken RememberMeAuthenticationToken}. Implement that interface if you need * RememberMe services (the <tt>UsernamePasswordToken</tt> already implements this interface). * <p/> * <p>If you are familiar with JAAS, an <tt>AuthenticationToken</tt> replaces the concept of a http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/UsernamePasswordToken.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/UsernamePasswordToken.java b/core/src/main/java/org/apache/shiro/authc/UsernamePasswordToken.java index 25cf4c4..23768f2 100644 --- a/core/src/main/java/org/apache/shiro/authc/UsernamePasswordToken.java +++ b/core/src/main/java/org/apache/shiro/authc/UsernamePasswordToken.java @@ -23,7 +23,7 @@ package org.apache.shiro.authc; * class also implements the {@link RememberMeAuthenticationToken RememberMeAuthenticationToken} interface to support * "Remember Me" services across user sessions as well as the * {@link org.apache.shiro.authc.HostAuthenticationToken HostAuthenticationToken} interface to retain the host name - * or IP address location from where the authentication attempt is occuring.</p> + * or IP address location from where the authentication attempt is occurring.</p> * <p/> * <p>"Remember Me" authentications are disabled by default, but if the application developer wishes to allow * it for a login attempt, all that is necessary is to call {@link #setRememberMe setRememberMe(true)}. If the underlying @@ -100,7 +100,7 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM * during an authentication attempt, with a <tt>null</tt> {@link #getHost() host} and * a <tt>rememberMe</tt> default of <tt>false</tt> * <p/> - * <p>This is a convience constructor and maintains the password internally via a character + * <p>This is a convenience constructor and maintains the password internally via a character * array, i.e. <tt>password.toCharArray();</tt>. Note that storing a password as a String * in your code could have possible security implications as noted in the class JavaDoc.</p> * @@ -117,7 +117,7 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM * * @param username the username submitted for authentication * @param password the password string submitted for authentication - * @param host the host name or IP string from where the attempt is occuring + * @param host the host name or IP string from where the attempt is occurring * @since 0.2 */ public UsernamePasswordToken(final String username, final char[] password, final String host) { @@ -128,13 +128,13 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM * Constructs a new UsernamePasswordToken encapsulating the username and password submitted, the * inetAddress from where the attempt is occurring, and a default <tt>rememberMe</tt> value of <tt>false</tt> * <p/> - * <p>This is a convience constructor and maintains the password internally via a character + * <p>This is a convenience constructor and maintains the password internally via a character * array, i.e. <tt>password.toCharArray();</tt>. Note that storing a password as a String * in your code could have possible security implications as noted in the class JavaDoc.</p> * * @param username the username submitted for authentication * @param password the password string submitted for authentication - * @param host the host name or IP string from where the attempt is occuring + * @param host the host name or IP string from where the attempt is occurring * @since 1.0 */ public UsernamePasswordToken(final String username, final String password, final String host) { @@ -158,7 +158,7 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM * Constructs a new UsernamePasswordToken encapsulating the username and password submitted, as well as if the user * wishes their identity to be remembered across sessions. * <p/> - * <p>This is a convience constructor and maintains the password internally via a character + * <p>This is a convenience constructor and maintains the password internally via a character * array, i.e. <tt>password.toCharArray();</tt>. Note that storing a password as a String * in your code could have possible security implications as noted in the class JavaDoc.</p> * @@ -173,12 +173,12 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM /** * Constructs a new UsernamePasswordToken encapsulating the username and password submitted, if the user - * wishes their identity to be remembered across sessions, and the inetAddress from where the attempt is ocurring. + * wishes their identity to be remembered across sessions, and the inetAddress from where the attempt is occurring. * * @param username the username submitted for authentication * @param password the password character array submitted for authentication * @param rememberMe if the user wishes their identity to be remembered across sessions - * @param host the host name or IP string from where the attempt is occuring + * @param host the host name or IP string from where the attempt is occurring * @since 1.0 */ public UsernamePasswordToken(final String username, final char[] password, @@ -193,16 +193,16 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM /** * Constructs a new UsernamePasswordToken encapsulating the username and password submitted, if the user - * wishes their identity to be remembered across sessions, and the inetAddress from where the attempt is ocurring. + * wishes their identity to be remembered across sessions, and the inetAddress from where the attempt is occurring. * <p/> - * <p>This is a convience constructor and maintains the password internally via a character + * <p>This is a convenience constructor and maintains the password internally via a character * array, i.e. <tt>password.toCharArray();</tt>. Note that storing a password as a String * in your code could have possible security implications as noted in the class JavaDoc.</p> * * @param username the username submitted for authentication * @param password the password string submitted for authentication * @param rememberMe if the user wishes their identity to be remembered across sessions - * @param host the host name or IP string from where the attempt is occuring + * @param host the host name or IP string from where the attempt is occurring * @since 1.0 */ public UsernamePasswordToken(final String username, final String password, @@ -245,7 +245,7 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM /** * Sets the password for submission during an authentication attempt. * - * @param password the password to be used for submission during an authentication attemp. + * @param password the password to be used for submission during an authentication attempt. */ public void setPassword(char[] password) { this.password = password; @@ -293,7 +293,7 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM * <p>(Shiro's default Authenticator * allows <tt>null</tt> hosts to allow localhost and proxy server environments).</p> * - * @param host the host name or IP string from where the attempt is occuring + * @param host the host name or IP string from where the attempt is occurring * @since 1.0 */ public void setHost(String host) { @@ -313,10 +313,10 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM } /** - * Sets if the submitting user wishes their identity (pricipal(s)) to be remembered across sessions. Unless + * Sets if the submitting user wishes their identity (principal(s)) to be remembered across sessions. Unless * overridden, the default value is <tt>false</tt>, indicating <em>not</em> to be remembered across sessions. * - * @param rememberMe value inidicating if the user wishes their identity (principal(s)) to be remembered across + * @param rememberMe value indicating if the user wishes their identity (principal(s)) to be remembered across * sessions. * @since 0.9 */ @@ -348,7 +348,7 @@ public class UsernamePasswordToken implements HostAuthenticationToken, RememberM /** * Returns the String representation. It does not include the password in the resulting - * string for security reasons to prevent accidentially printing out a password + * string for security reasons to prevent accidentally printing out a password * that might be widely viewable). * * @return the String representation of the <tt>UsernamePasswordToken</tt>, omitting http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/credential/HashedCredentialsMatcher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/credential/HashedCredentialsMatcher.java b/core/src/main/java/org/apache/shiro/authc/credential/HashedCredentialsMatcher.java index a08f6d8..274127d 100644 --- a/core/src/main/java/org/apache/shiro/authc/credential/HashedCredentialsMatcher.java +++ b/core/src/main/java/org/apache/shiro/authc/credential/HashedCredentialsMatcher.java @@ -128,7 +128,7 @@ public class HashedCredentialsMatcher extends SimpleCredentialsMatcher { private boolean storedCredentialsHexEncoded; /** - * JavaBeans-compatibile no-arg constructor intended for use in IoC/Dependency Injection environments. If you + * JavaBeans-compatible no-arg constructor intended for use in IoC/Dependency Injection environments. If you * use this constructor, you <em>MUST</em> also additionally set the * {@link #setHashAlgorithmName(String) hashAlgorithmName} property. */ http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/package-info.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/package-info.java b/core/src/main/java/org/apache/shiro/authc/package-info.java index 35b8b05..588a7f1 100644 --- a/core/src/main/java/org/apache/shiro/authc/package-info.java +++ b/core/src/main/java/org/apache/shiro/authc/package-info.java @@ -19,7 +19,7 @@ /** * Core interfaces and exceptions concerning Authentication (the act of logging-in). * <p/> - * Shiro abbreviates the word 'AuthentiCation' as <tt>authc</tt> to distinguish it seperately from + * Shiro abbreviates the word 'AuthentiCation' as <tt>authc</tt> to distinguish it separately from * 'AuthoriZation', abbreviated as <tt>authz</tt>. * <p/> * The primary item of interest in this package is the <tt>Authenticator</tt> interface, which acts as the http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/pam/AtLeastOneSuccessfulStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/pam/AtLeastOneSuccessfulStrategy.java b/core/src/main/java/org/apache/shiro/authc/pam/AtLeastOneSuccessfulStrategy.java index 44d024e..aa201d7 100644 --- a/core/src/main/java/org/apache/shiro/authc/pam/AtLeastOneSuccessfulStrategy.java +++ b/core/src/main/java/org/apache/shiro/authc/pam/AtLeastOneSuccessfulStrategy.java @@ -52,7 +52,7 @@ public class AtLeastOneSuccessfulStrategy extends AbstractAuthenticationStrategy * that none of the realms authenticated successfully. */ public AuthenticationInfo afterAllAttempts(AuthenticationToken token, AuthenticationInfo aggregate) throws AuthenticationException { - //we know if one or more were able to succesfully authenticate if the aggregated account object does not + //we know if one or more were able to successfully authenticate if the aggregated account object does not //contain null or empty data: if (aggregate == null || isEmpty(aggregate.getPrincipals())) { throw new AuthenticationException("Authentication token of type [" + token.getClass() + "] " + http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/pam/AuthenticationStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/pam/AuthenticationStrategy.java b/core/src/main/java/org/apache/shiro/authc/pam/AuthenticationStrategy.java index 0b2410e..e816e74 100644 --- a/core/src/main/java/org/apache/shiro/authc/pam/AuthenticationStrategy.java +++ b/core/src/main/java/org/apache/shiro/authc/pam/AuthenticationStrategy.java @@ -100,7 +100,7 @@ public interface AuthenticationStrategy { /** * Method invoked by the ModularAuthenticator signifying that all of its configured Realms have been consulted - * for account data, allowing post-proccessing after all realms have completed. + * for account data, allowing post-processing after all realms have completed. * * <p>Returns the final AuthenticationInfo object that will be returned from the Authenticator to the authenticate() caller. * This is most likely the aggregate AuthenticationInfo object that has been populated by many realms, but the actual return value is http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authc/pam/ModularRealmAuthenticator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authc/pam/ModularRealmAuthenticator.java b/core/src/main/java/org/apache/shiro/authc/pam/ModularRealmAuthenticator.java index 3632431..41ebe41 100644 --- a/core/src/main/java/org/apache/shiro/authc/pam/ModularRealmAuthenticator.java +++ b/core/src/main/java/org/apache/shiro/authc/pam/ModularRealmAuthenticator.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import java.util.Collection; /** - * A {@code ModularRealmAuthenticator} delgates account lookups to a pluggable (modular) collection of + * A {@code ModularRealmAuthenticator} delegates account lookups to a pluggable (modular) collection of * {@link Realm}s. This enables PAM (Pluggable Authentication Module) behavior in Shiro. * In addition to authorization duties, a Shiro Realm can also be thought of a PAM 'module'. * <p/> @@ -50,7 +50,7 @@ import java.util.Collection; * <p/> * The strategy object provides callback methods that allow you to * determine what constitutes a success or failure in a multi-realm (PAM) scenario. And because this only makes sense - * in a mult-realm scenario, the strategy object is only utilized when more than one Realm is configured. + * in a multi-realm scenario, the strategy object is only utilized when more than one Realm is configured. * <p/> * As most multi-realm applications require at least one Realm authenticates successfully, the default * implementation is the {@link AtLeastOneSuccessfulStrategy}. http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/AuthorizationInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/AuthorizationInfo.java b/core/src/main/java/org/apache/shiro/authz/AuthorizationInfo.java index 17b699c..cc35ef2 100644 --- a/core/src/main/java/org/apache/shiro/authz/AuthorizationInfo.java +++ b/core/src/main/java/org/apache/shiro/authz/AuthorizationInfo.java @@ -38,7 +38,7 @@ import java.util.Collection; * Both permission collections together represent the total aggregate collection of permissions. You may use one * or both depending on your preference and needs. * <p/> - * Because the act of authorization (access control) is orthoganal to authentication (log-in), this interface is + * Because the act of authorization (access control) is orthogonal to authentication (log-in), this interface is * intended to represent only the account data needed by Shiro during an access control check * (role, permission, etc). Shiro also has a parallel * {@link org.apache.shiro.authc.AuthenticationInfo AuthenticationInfo} interface for use during the authentication http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/Authorizer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/Authorizer.java b/core/src/main/java/org/apache/shiro/authz/Authorizer.java index f3f8b0e..9316af1 100644 --- a/core/src/main/java/org/apache/shiro/authz/Authorizer.java +++ b/core/src/main/java/org/apache/shiro/authz/Authorizer.java @@ -40,7 +40,7 @@ import java.util.List; * (Shiro's default implementations do String-to-Permission conversion for these methods using * {@link org.apache.shiro.authz.permission.PermissionResolver PermissionResolver}s.) * - * <p>These overloaded *Permission methods <em>do</em> forego type-saftey for the benefit of convenience and simplicity, + * <p>These overloaded *Permission methods <em>do</em> forego type-safety for the benefit of convenience and simplicity, * so you should choose which ones to use based on your preferences and needs. * * @since 0.1 @@ -159,7 +159,7 @@ public interface Authorizer { /** * Ensures a subject/user {@link Permission#implies(Permission)} implies} the specified <tt>Permission</tt>. - * If the subject's exisiting associated permissions do not {@link Permission#implies(Permission)} imply} + * If the subject's existing associated permissions do not {@link Permission#implies(Permission)} imply} * the given permission, an {@link AuthorizationException} will be thrown. * * @param subjectPrincipal the application-specific subject/user identifier. @@ -174,7 +174,7 @@ public interface Authorizer { * {@link Permission#implies(Permission) implies} all of the * specified permission strings. * - * If the subject's exisiting associated permissions do not + * If the subject's existing associated permissions do not * {@link Permission#implies(Permission) imply} all of the given permissions, * an {@link AuthorizationException} will be thrown. * @@ -193,7 +193,7 @@ public interface Authorizer { * {@link Permission#implies(Permission) implies} all of the * specified permission strings. * - * If the subject's exisiting associated permissions do not + * If the subject's existing associated permissions do not * {@link Permission#implies(Permission) imply} all of the given permissions, * an {@link AuthorizationException} will be thrown. * http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/Permission.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/Permission.java b/core/src/main/java/org/apache/shiro/authz/Permission.java index ea6d185..ab7082f 100644 --- a/core/src/main/java/org/apache/shiro/authz/Permission.java +++ b/core/src/main/java/org/apache/shiro/authz/Permission.java @@ -28,7 +28,7 @@ package org.apache.shiro.authz; * configuration, typically by assigning Permissions to users, roles and/or groups. * <p/> * Most typical systems are what the Shiro team calls <em>role-based</em> in nature, where a role represents - * common behavior for certain user types. For example, a system might have an <em>Aministrator</em> role, a + * common behavior for certain user types. For example, a system might have an <em>Administrator</em> role, a * <em>User</em> or <em>Guest</em> roles, etc. * <p/> * But if you have a dynamic security model, where roles can be created and deleted at runtime, you can't hard-code @@ -69,7 +69,7 @@ public interface Permission { * Returns {@code true} if this current instance <em>implies</em> all the functionality and/or resource access * described by the specified {@code Permission} argument, {@code false} otherwise. * <p/> - * <p>That is, this current instance must be exactly equal to or a <em>superset</em> of the functionalty + * <p>That is, this current instance must be exactly equal to or a <em>superset</em> of the functionality * and/or resource access described by the given {@code Permission} argument. Yet another way of saying this * would be: * <p/> http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizationInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizationInfo.java b/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizationInfo.java index cb09c46..70ebef9 100644 --- a/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizationInfo.java +++ b/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizationInfo.java @@ -42,7 +42,7 @@ public class SimpleAuthorizationInfo implements AuthorizationInfo { protected Set<String> stringPermissions; /** - * Collection of all object-based permissions associaed with the account. + * Collection of all object-based permissions associated with the account. */ protected Set<Permission> objectPermissions; http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/annotation/RequiresAuthentication.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/annotation/RequiresAuthentication.java b/core/src/main/java/org/apache/shiro/authz/annotation/RequiresAuthentication.java index b0a3bfb..c39edcf 100644 --- a/core/src/main/java/org/apache/shiro/authz/annotation/RequiresAuthentication.java +++ b/core/src/main/java/org/apache/shiro/authz/annotation/RequiresAuthentication.java @@ -33,7 +33,7 @@ import java.lang.annotation.Target; * <p/> * See the {@link RequiresUser RequiresUser} and * {@link org.apache.shiro.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} JavaDoc for an - * explaination of why these two states are considered different. + * explanation of why these two states are considered different. * * @see RequiresUser * @see RequiresGuest http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/annotation/RequiresRoles.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/annotation/RequiresRoles.java b/core/src/main/java/org/apache/shiro/authz/annotation/RequiresRoles.java index b18a73b..8479c2c 100644 --- a/core/src/main/java/org/apache/shiro/authz/annotation/RequiresRoles.java +++ b/core/src/main/java/org/apache/shiro/authz/annotation/RequiresRoles.java @@ -55,7 +55,7 @@ import java.lang.annotation.Target; public @interface RequiresRoles { /** - * A single String role name or multiple comma-delimitted role names required in order for the method + * A single String role name or multiple comma-delimited role names required in order for the method * invocation to be allowed. */ String[] value(); http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/annotation/RequiresUser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/annotation/RequiresUser.java b/core/src/main/java/org/apache/shiro/authz/annotation/RequiresUser.java index e773bc0..ca4f742 100644 --- a/core/src/main/java/org/apache/shiro/authz/annotation/RequiresUser.java +++ b/core/src/main/java/org/apache/shiro/authz/annotation/RequiresUser.java @@ -38,7 +38,7 @@ import java.lang.annotation.Target; * </ul> * <p/> * See the {@link org.apache.shiro.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} JavaDoc for an - * explaination of why these two states are considered different. + * explanation of why these two states are considered different. * * @see RequiresAuthentication * @see RequiresGuest http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/annotation/package-info.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/annotation/package-info.java b/core/src/main/java/org/apache/shiro/authz/annotation/package-info.java index 550f666..3fa8d23 100644 --- a/core/src/main/java/org/apache/shiro/authz/annotation/package-info.java +++ b/core/src/main/java/org/apache/shiro/authz/annotation/package-info.java @@ -20,7 +20,7 @@ * Annotations used to restrict which classes, instances, or methods may be accessed or invoked depending on the * caller's access abilities or authentication state. * - * Since 1.1, all core annotations were extends to accept Target ElementType.TYPE in additon to ElementType.METHOD + * Since 1.1, all core annotations were extends to accept Target ElementType.TYPE in addition to ElementType.METHOD */ package org.apache.shiro.authz.annotation; import java.lang.annotation.ElementType; http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/authz/package-info.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/package-info.java b/core/src/main/java/org/apache/shiro/authz/package-info.java index 3403023..cf2de7f 100644 --- a/core/src/main/java/org/apache/shiro/authz/package-info.java +++ b/core/src/main/java/org/apache/shiro/authz/package-info.java @@ -19,7 +19,7 @@ /** * Core interfaces and exceptions supporting Authorization (access control). * <p/> - * Shiro abbreviates the word 'AuthoriZation' as <tt>authz</tt> to distinguish it seperately from + * Shiro abbreviates the word 'AuthoriZation' as <tt>authz</tt> to distinguish it separately from * 'AuthentiCation', abbreviated as <tt>authc</tt>. * <p/> * This package's primary interface of interest, which is the core of Shiro authorization functionality, http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/realm/Realm.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/realm/Realm.java b/core/src/main/java/org/apache/shiro/realm/Realm.java index 13f15e1..2f534ed 100644 --- a/core/src/main/java/org/apache/shiro/realm/Realm.java +++ b/core/src/main/java/org/apache/shiro/realm/Realm.java @@ -26,8 +26,8 @@ import org.apache.shiro.authc.AuthenticationToken; * A <tt>Realm</tt> is a security component that can access application-specific security entities * such as users, roles, and permissions to determine authentication and authorization operations. * - * <p><tt>Realm</tt>s usually have a 1-to-1 correspondance with a datasource such as a relational database, - * file sysetem, or other similar resource. As such, implementations of this interface use datasource-specific APIs to + * <p><tt>Realm</tt>s usually have a 1-to-1 correspondence with a datasource such as a relational database, + * file system, or other similar resource. As such, implementations of this interface use datasource-specific APIs to * determine authorization data (roles, permissions, etc), such as JDBC, File IO, Hibernate or JPA, or any other * Data Access API. They are essentially security-specific * <a href="http://en.wikipedia.org/wiki/Data_Access_Object"; target="_blank">DAO</a>s. @@ -98,7 +98,7 @@ public interface Realm { * or <tt>null</tt> if no account could be found. * @throws org.apache.shiro.authc.AuthenticationException * if there is an error obtaining or constructing an AuthenticationInfo object based on the - * specified <tt>token</tt> or implementation-specifc login behavior fails. + * specified <tt>token</tt> or implementation-specific login behavior fails. */ AuthenticationInfo getAuthenticationInfo(AuthenticationToken token) throws AuthenticationException; http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java b/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java index cbdb31d..3e47193 100644 --- a/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java +++ b/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java @@ -124,7 +124,7 @@ public class PropertiesRealm extends TextConfigurationRealm implements Destroyab /** * Sets the path of the properties file to load user, role, and permission information from. The properties - * file will be loaded using {@link ResourceUtils#getInputStreamForPath(String)} so any convention recongized + * file will be loaded using {@link ResourceUtils#getInputStreamForPath(String)} so any convention recognized * by that method is accepted here. For example, to load a file from the classpath use * {@code classpath:myfile.properties}; to load a file from disk simply specify the full path; to load * a file from a URL use {@code url:www.mysite.com/myfile.properties}. @@ -138,7 +138,7 @@ public class PropertiesRealm extends TextConfigurationRealm implements Destroyab /** * Sets the interval in seconds at which the property file will be checked for changes and reloaded. If this is * set to zero or less, property file reloading will be disabled. If it is set to 1 or greater, then a - * separate thread will be created to monitor the propery file for changes and reload the file if it is updated. + * separate thread will be created to monitor the property file for changes and reload the file if it is updated. * * @param reloadIntervalSeconds the interval in seconds at which the property file should be examined for changes. * If set to zero or less, reloading is disabled. http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/realm/text/TextConfigurationRealm.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/realm/text/TextConfigurationRealm.java b/core/src/main/java/org/apache/shiro/realm/text/TextConfigurationRealm.java index b15f516..2b9344d 100644 --- a/core/src/main/java/org/apache/shiro/realm/text/TextConfigurationRealm.java +++ b/core/src/main/java/org/apache/shiro/realm/text/TextConfigurationRealm.java @@ -109,7 +109,7 @@ public class TextConfigurationRealm extends SimpleAccountRealm { * <p/> * <p>where <em>permissionDefinition</em> is an arbitrary String, but must people will want to use * Strings that conform to the {@link org.apache.shiro.authz.permission.WildcardPermission WildcardPermission} - * format for ease of use and flexibility. Note that if an individual <em>permissionDefnition</em> needs to + * format for ease of use and flexibility. Note that if an individual <em>permissionDefinition</em> needs to * be internally comma-delimited (e.g. <code>printer:5thFloor:print,info</code>), you will need to surround that * definition with double quotes (") to avoid parsing errors (e.g. * <code>"printer:5thFloor:print,info"</code>). http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/session/Session.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/session/Session.java b/core/src/main/java/org/apache/shiro/session/Session.java index 7abe2ed..4535051 100644 --- a/core/src/main/java/org/apache/shiro/session/Session.java +++ b/core/src/main/java/org/apache/shiro/session/Session.java @@ -116,7 +116,7 @@ public interface Session { * automatically as a result of an incoming web request or remote procedure call/method invocation. * <p/> * However, this method is particularly useful when supporting rich-client applications such as - * Java Web Start appp, Java or Flash applets, etc. Although rare, it is possible in a rich-client + * Java Web Start app, Java or Flash applets, etc. Although rare, it is possible in a rich-client * environment that a user continuously interacts with the client-side application without a * server-side method call ever being invoked. If this happens over a long enough period of * time, the user's server-side session could time-out. Again, such cases are rare since most @@ -183,7 +183,7 @@ public interface Session { Object getAttribute(Object key) throws InvalidSessionException; /** - * Binds the specified {@code value} to this session, uniquely identified by the specifed + * Binds the specified {@code value} to this session, uniquely identified by the specified * {@code key} name. If there is already an object bound under the {@code key} name, that * existing object will be replaced by the new {@code value}. * <p/> http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/session/SessionListenerAdapter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/session/SessionListenerAdapter.java b/core/src/main/java/org/apache/shiro/session/SessionListenerAdapter.java index 24d5860..5e46af7 100644 --- a/core/src/main/java/org/apache/shiro/session/SessionListenerAdapter.java +++ b/core/src/main/java/org/apache/shiro/session/SessionListenerAdapter.java @@ -27,7 +27,7 @@ package org.apache.shiro.session; public class SessionListenerAdapter implements SessionListener { /** - * Adapter no-op implemenation - does nothing and returns immediately. + * Adapter no-op implementation - does nothing and returns immediately. * * @param session the session that has started. */ @@ -36,7 +36,7 @@ public class SessionListenerAdapter implements SessionListener { } /** - * Adapter no-op implemenation - does nothing and returns immediately. + * Adapter no-op implementation - does nothing and returns immediately. * * @param session the session that has stopped. */ @@ -45,7 +45,7 @@ public class SessionListenerAdapter implements SessionListener { } /** - * Adapter no-op implemenation - does nothing and returns immediately. + * Adapter no-op implementation - does nothing and returns immediately. * * @param session the session that has expired. */ http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/session/mgt/AbstractSessionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/session/mgt/AbstractSessionManager.java b/core/src/main/java/org/apache/shiro/session/mgt/AbstractSessionManager.java index 5a296c1..f3815b5 100644 --- a/core/src/main/java/org/apache/shiro/session/mgt/AbstractSessionManager.java +++ b/core/src/main/java/org/apache/shiro/session/mgt/AbstractSessionManager.java @@ -79,7 +79,7 @@ public abstract class AbstractSessionManager implements SessionManager { * <p/> * Unless overridden by calling this method, the default value is {@link #DEFAULT_GLOBAL_SESSION_TIMEOUT}. * - * @param globalSessionTimeout the time in milliseconds that any session may remain idel before expiring. + * @param globalSessionTimeout the time in milliseconds that any session may remain idle before expiring. */ public void setGlobalSessionTimeout(long globalSessionTimeout) { this.globalSessionTimeout = globalSessionTimeout; http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/session/mgt/ValidatingSessionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/session/mgt/ValidatingSessionManager.java b/core/src/main/java/org/apache/shiro/session/mgt/ValidatingSessionManager.java index ba2c0b4..6430324 100644 --- a/core/src/main/java/org/apache/shiro/session/mgt/ValidatingSessionManager.java +++ b/core/src/main/java/org/apache/shiro/session/mgt/ValidatingSessionManager.java @@ -41,7 +41,7 @@ public interface ValidatingSessionManager extends SessionManager { * This is obvious in the case of web applications due to the HTTP protocol, but it is * equally true of remote client applications making remote method invocations. The server * essentially sits idle and only "works" when responding to client requests and/or - * method invocations. This type of model is particularly efficent since it means the + * method invocations. This type of model is particularly efficient since it means the * security system only has to validate a session during those cases. Such * "lazy" behavior enables the system to lie stateless and/or idle and only incur * overhead for session validation when necessary. http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/session/package-info.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/session/package-info.java b/core/src/main/java/org/apache/shiro/session/package-info.java index 4489231..35dfab8 100644 --- a/core/src/main/java/org/apache/shiro/session/package-info.java +++ b/core/src/main/java/org/apache/shiro/session/package-info.java @@ -21,12 +21,12 @@ * interacts with an application. * <p/> * Sessions in Shiro are completely POJO-based and do not <em>require</em> an application to use Web-based - * or EJB-based session management infrastructure - the client and/or server technoloy is irrelevent in + * or EJB-based session management infrastructure - the client and/or server technology is irrelevant in * Shiro's architecture, allowing session management to be employed in the smallest standalone application * to the largest enterprise deployments. * <p/> * This design decision opens up a new world to Java applications - most notably the ability to participate in - * a session regardless if the client is using HTTP, custom sockets, web services, or even non-Java progamming + * a session regardless if the client is using HTTP, custom sockets, web services, or even non-Java programming * languages. Aside from Shiro, there is currently no technology in Java today allows this heterogenous * client-session capability. * <p/> http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/subject/PrincipalCollection.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/subject/PrincipalCollection.java b/core/src/main/java/org/apache/shiro/subject/PrincipalCollection.java index adfd273..75da30c 100644 --- a/core/src/main/java/org/apache/shiro/subject/PrincipalCollection.java +++ b/core/src/main/java/org/apache/shiro/subject/PrincipalCollection.java @@ -62,7 +62,7 @@ public interface PrincipalCollection extends Iterable, Serializable { * Shiro's default implementations of this interface make this * assumption by usually simply returning {@link #iterator()}.{@link java.util.Iterator#next() next()}, which just * returns the first returned principal obtained from the first consulted/configured {@code Realm} during the - * authentication attempt. This means in a multi-{@code Realm} application, {@code Realm} configuraiton order + * authentication attempt. This means in a multi-{@code Realm} application, {@code Realm} configuration order * matters if you want to retain this default heuristic. * <p/> * If this heuristic is not sufficient, most Shiro end-users will need to implement a custom http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/subject/SimplePrincipalCollection.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/subject/SimplePrincipalCollection.java b/core/src/main/java/org/apache/shiro/subject/SimplePrincipalCollection.java index 9b17f2a..8332759 100644 --- a/core/src/main/java/org/apache/shiro/subject/SimplePrincipalCollection.java +++ b/core/src/main/java/org/apache/shiro/subject/SimplePrincipalCollection.java @@ -264,7 +264,7 @@ public class SimplePrincipalCollection implements MutablePrincipalCollection { * Serialization write support. * <p/> * NOTE: Don't forget to change the serialVersionUID constant at the top of this class - * if you make any backwards-incompatible serializatoin changes!!! + * if you make any backwards-incompatible serialization changes!!! * (use the JDK 'serialver' program for this) * * @param out output stream provided by Java serialization @@ -284,7 +284,7 @@ public class SimplePrincipalCollection implements MutablePrincipalCollection { * input stream. * <p/> * NOTE: Don't forget to change the serialVersionUID constant at the top of this class - * if you make any backwards-incompatible serializatoin changes!!! + * if you make any backwards-incompatible serialization changes!!! * (use the JDK 'serialver' program for this) * * @param in input stream provided by http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/subject/Subject.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/subject/Subject.java b/core/src/main/java/org/apache/shiro/subject/Subject.java index c531a15..56fd339 100644 --- a/core/src/main/java/org/apache/shiro/subject/Subject.java +++ b/core/src/main/java/org/apache/shiro/subject/Subject.java @@ -52,7 +52,7 @@ import java.util.concurrent.Callable; * type-safe method. (Shiro's default implementations do String-to-Permission conversion for these methods using * {@link org.apache.shiro.authz.permission.PermissionResolver PermissionResolver}s.) * <p/> - * These overloaded *Permission methods forgo type-saftey for the benefit of convenience and simplicity, + * These overloaded *Permission methods forgo type-safety for the benefit of convenience and simplicity, * so you should choose which ones to use based on your preferences and needs. * * @since 0.1 @@ -557,7 +557,7 @@ public interface Subject { * Releases the current 'run as' (assumed) identity and reverts back to the previous 'pre run as' * identity that existed before {@code #runAs runAs} was called. * <p/> - * This method returne 'run as' (assumed) identity being released or {@code null} if this {@code Subject} is not + * This method returns 'run as' (assumed) identity being released or {@code null} if this {@code Subject} is not * operating under an assumed identity. * * @return the 'run as' (assumed) identity being released or {@code null} if this {@code Subject} is not operating http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/subject/package-info.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/subject/package-info.java b/core/src/main/java/org/apache/shiro/subject/package-info.java index 6995f78..996431a 100644 --- a/core/src/main/java/org/apache/shiro/subject/package-info.java +++ b/core/src/main/java/org/apache/shiro/subject/package-info.java @@ -20,7 +20,7 @@ * Components supporting the {@link org.apache.shiro.subject.Subject Subject} interface, the most important concept in * Shiro's API. * <p/> - * A <code>Subject</code> is <em>the</em> primary component when using Shiro programatically for single-user + * A <code>Subject</code> is <em>the</em> primary component when using Shiro programmatically for single-user * security operations, and it is the handle to any accessible user security data. All single-user * authentication, authorization and session operations are performed via a <code>Subject</code> instance. */ http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/util/ThreadContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/util/ThreadContext.java b/core/src/main/java/org/apache/shiro/util/ThreadContext.java index e6237e1..53057d7 100644 --- a/core/src/main/java/org/apache/shiro/util/ThreadContext.java +++ b/core/src/main/java/org/apache/shiro/util/ThreadContext.java @@ -256,7 +256,7 @@ public abstract class ThreadContext { * Convenience method that simplifies removal of the application's SecurityManager instance from the thread. * <p/> * The implementation just helps reduce casting and remembering of the ThreadContext key name, i.e it is - * merely a conveient wrapper for the following: + * merely a convenient wrapper for the following: * <p/> * <code>return (SecurityManager)remove( SECURITY_MANAGER_KEY );</code> * <p/> @@ -315,7 +315,7 @@ public abstract class ThreadContext { * Convenience method that simplifies removal of a thread-local Subject from the thread. * <p/> * The implementation just helps reduce casting and remembering of the ThreadContext key name, i.e it is - * merely a conveient wrapper for the following: + * merely a convenient wrapper for the following: * <p/> * <code>return (Subject)remove( SUBJECT_KEY );</code> * <p/> http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/main/java/org/apache/shiro/util/package-info.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/util/package-info.java b/core/src/main/java/org/apache/shiro/util/package-info.java index 742d86d..620db7d 100644 --- a/core/src/main/java/org/apache/shiro/util/package-info.java +++ b/core/src/main/java/org/apache/shiro/util/package-info.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Your run-of-the-mill 'util' pacakge for components and logic widely used across the framework that can't + * Your run-of-the-mill 'util' package for components and logic widely used across the framework that can't * find their home into a proper OO hierarchy (or, most likely for things used across many hierarchies). */ package org.apache.shiro.util; http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java b/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java index 13f447d..32c50df 100644 --- a/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java +++ b/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java @@ -40,7 +40,7 @@ import java.util.*; /** * Simple test case for AuthorizingRealm. * <p/> - * TODO - this could/should be expaned to be more robust end to end test for the AuthorizingRealm + * TODO - this could/should be expanded to be more robust end to end test for the AuthorizingRealm */ public class AuthorizingRealmTest { @@ -252,4 +252,4 @@ public class AuthorizingRealmTest { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/lang/src/main/java/org/apache/shiro/codec/Base64.java ---------------------------------------------------------------------- diff --git a/lang/src/main/java/org/apache/shiro/codec/Base64.java b/lang/src/main/java/org/apache/shiro/codec/Base64.java index 2d6cb08..da31059 100644 --- a/lang/src/main/java/org/apache/shiro/codec/Base64.java +++ b/lang/src/main/java/org/apache/shiro/codec/Base64.java @@ -26,7 +26,7 @@ package org.apache.shiro.codec; * Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies</cite> by Freed and Borenstein. * <p/> * This class was borrowed from Apache Commons Codec SVN repository (rev. 618419) with modifications - * to enable Base64 conversion without a full dependecny on Commons Codec. We didn't want to reinvent the wheel of + * to enable Base64 conversion without a full dependency on Commons Codec. We didn't want to reinvent the wheel of * great work they've done, but also didn't want to force every Shiro user to depend on the commons-codec.jar * <p/> * As per the Apache 2.0 license, the original copyright notice and all author and copyright information have @@ -152,7 +152,7 @@ public class Base64 { } /** - * Returns whether or not the <code>octect</code> is in the base 64 alphabet. + * Returns whether or not the <code>octet</code> is in the base 64 alphabet. * * @param octect The value to test * @return <code>true</code> if the value is defined in the the base 64 alphabet, <code>false</code> otherwise. @@ -415,7 +415,7 @@ public class Base64 { } /** - * Decodes Base64 data into octects + * Decodes Base64 data into octets * * @param base64Data Byte array containing Base64 data * @return Array containing decoded data. http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/lang/src/main/java/org/apache/shiro/codec/Hex.java ---------------------------------------------------------------------- diff --git a/lang/src/main/java/org/apache/shiro/codec/Hex.java b/lang/src/main/java/org/apache/shiro/codec/Hex.java index eb41583..79e72ac 100644 --- a/lang/src/main/java/org/apache/shiro/codec/Hex.java +++ b/lang/src/main/java/org/apache/shiro/codec/Hex.java @@ -42,7 +42,7 @@ public class Hex { }; /** - * Encodes the specifed byte array to a character array and then returns that character array + * Encodes the specified byte array to a character array and then returns that character array * as a String. * * @param bytes the byte array to Hex-encode. @@ -54,12 +54,12 @@ public class Hex { } /** - * Converts an array of bytes into an array of characters representing the hexidecimal values of each byte in order. + * Converts an array of bytes into an array of characters representing the hexadecimal values of each byte in order. * The returned array will be double the length of the passed array, as it takes two characters to represent any * given byte. * * @param data byte[] to convert to Hex characters - * @return A char[] containing hexidecimal characters + * @return A char[] containing hexadecimal characters */ public static char[] encode(byte[] data) { @@ -77,13 +77,13 @@ public class Hex { } /** - * Converts an array of character bytes representing hexidecimal values into an + * Converts an array of character bytes representing hexadecimal values into an * array of bytes of those same values. The returned array will be half the * length of the passed array, as it takes two characters to represent any * given byte. An exception is thrown if the passed char array has an odd * number of elements. * - * @param array An array of character bytes containing hexidecimal digits + * @param array An array of character bytes containing hexadecimal digits * @return A byte array containing binary data decoded from * the supplied byte array (representing characters). * @throws IllegalArgumentException Thrown if an odd number of characters is supplied @@ -108,13 +108,13 @@ public class Hex { } /** - * Converts an array of characters representing hexidecimal values into an + * Converts an array of characters representing hexadecimal values into an * array of bytes of those same values. The returned array will be half the * length of the passed array, as it takes two characters to represent any * given byte. An exception is thrown if the passed char array has an odd * number of elements. * - * @param data An array of characters containing hexidecimal digits + * @param data An array of characters containing hexadecimal digits * @return A byte array containing binary data decoded from * the supplied char array. * @throws IllegalArgumentException if an odd number or illegal of characters @@ -153,7 +153,7 @@ public class Hex { protected static int toDigit(char ch, int index) throws IllegalArgumentException { int digit = Character.digit(ch, 16); if (digit == -1) { - throw new IllegalArgumentException("Illegal hexadecimal charcter " + ch + " at index " + index); + throw new IllegalArgumentException("Illegal hexadecimal character " + ch + " at index " + index); } return digit; } http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/lang/src/main/java/org/apache/shiro/io/DefaultSerializer.java ---------------------------------------------------------------------- diff --git a/lang/src/main/java/org/apache/shiro/io/DefaultSerializer.java b/lang/src/main/java/org/apache/shiro/io/DefaultSerializer.java index 6fa86b8..433a825 100644 --- a/lang/src/main/java/org/apache/shiro/io/DefaultSerializer.java +++ b/lang/src/main/java/org/apache/shiro/io/DefaultSerializer.java @@ -78,7 +78,7 @@ public class DefaultSerializer<T> implements Serializer<T> { ois.close(); return deserialized; } catch (Exception e) { - String msg = "Unable to deserialze argument byte array."; + String msg = "Unable to deserialize argument byte array."; throw new SerializationException(msg, e); } } http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/lang/src/main/java/org/apache/shiro/io/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/lang/src/main/java/org/apache/shiro/io/ResourceUtils.java b/lang/src/main/java/org/apache/shiro/io/ResourceUtils.java index ae44d70..703689d 100644 --- a/lang/src/main/java/org/apache/shiro/io/ResourceUtils.java +++ b/lang/src/main/java/org/apache/shiro/io/ResourceUtils.java @@ -116,7 +116,7 @@ public class ResourceUtils { * {@link FileInputStream FileInputStream}. * * @param resourcePath the String path representing the resource to obtain. - * @return the InputStraem for the specified resource. + * @return the InputStream for the specified resource. * @throws IOException if there is a problem acquiring the resource at the specified path. */ public static InputStream getInputStreamForPath(String resourcePath) throws IOException { http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/lang/src/main/java/org/apache/shiro/io/Serializer.java ---------------------------------------------------------------------- diff --git a/lang/src/main/java/org/apache/shiro/io/Serializer.java b/lang/src/main/java/org/apache/shiro/io/Serializer.java index 10a5cfa..daead98 100644 --- a/lang/src/main/java/org/apache/shiro/io/Serializer.java +++ b/lang/src/main/java/org/apache/shiro/io/Serializer.java @@ -37,7 +37,7 @@ public interface Serializer<T> { * * @param o the Object to convert into a byte[] array. * @return a byte[] array representing the Object's state that can be restored later. - * @throws SerializationException if an error occurrs converting the Object into a byte[] array. + * @throws SerializationException if an error occurs converting the Object into a byte[] array. */ byte[] serialize(T o) throws SerializationException; @@ -47,7 +47,7 @@ public interface Serializer<T> { * * @param serialized the raw data resulting from a previous {@link #serialize(Object) serialize} call. * @return the Object that was previously serialized into the raw byte[] array. - * @throws SerializationException if an error occurrs converting the raw byte[] array back into an Object. + * @throws SerializationException if an error occurs converting the raw byte[] array back into an Object. */ T deserialize(byte[] serialized) throws SerializationException; } http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/samples/quickstart/src/main/java/Quickstart.java ---------------------------------------------------------------------- diff --git a/samples/quickstart/src/main/java/Quickstart.java b/samples/quickstart/src/main/java/Quickstart.java index 95f60ea..463342b 100644 --- a/samples/quickstart/src/main/java/Quickstart.java +++ b/samples/quickstart/src/main/java/Quickstart.java @@ -103,7 +103,7 @@ public class Quickstart { } //test a typed permission (not instance-level) - if (currentUser.isPermitted("lightsaber:weild")) { + if (currentUser.isPermitted("lightsaber:wield")) { log.info("You may use a lightsaber ring. Use it wisely."); } else { log.info("Sorry, lightsaber rings are for schwartz masters only."); http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCacheManager.java ---------------------------------------------------------------------- diff --git a/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCacheManager.java b/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCacheManager.java index 453a16c..7a89e6e 100644 --- a/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCacheManager.java +++ b/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCacheManager.java @@ -36,7 +36,7 @@ import java.io.InputStream; * This class can {@link #setCacheManager(net.sf.ehcache.CacheManager) accept} a manually configured * {@link net.sf.ehcache.CacheManager net.sf.ehcache.CacheManager} instance, * or an {@code ehcache.xml} path location can be specified instead and one will be constructed. If neither are - * specified, Shiro's failsafe <code><a href="./ehcache.xml">ehcache.xml</a>} file will be used by default. + * specified, Shiro's failsafe <code><a href="./ehcache.xml">ehcache.xml</a></code> file will be used by default. * <p/> * This implementation requires EhCache 1.2 and above. Make sure EhCache 1.1 or earlier * is not in the classpath or it will not work. @@ -179,7 +179,7 @@ public class EhCacheManager implements CacheManager, Initializable, Destroyable * Initializes this instance. * <p/> * If a {@link #setCacheManager CacheManager} has been - * explicitly set (e.g. via Dependency Injection or programatically) prior to calling this + * explicitly set (e.g. via Dependency Injection or programmatically) prior to calling this * method, this method does nothing. * <p/> * However, if no {@code CacheManager} has been set, the default Ehcache singleton will be initialized, where @@ -228,7 +228,7 @@ public class EhCacheManager implements CacheManager, Initializable, Destroyable * Shuts-down the wrapped Ehcache CacheManager <b>only if implicitly created</b>. * <p/> * If another component injected - * a non-null CacheManager into this instace before calling {@link #init() init}, this instance expects that same + * a non-null CacheManager into this instance before calling {@link #init() init}, this instance expects that same * component to also destroy the CacheManager instance, and it will not attempt to do so. */ public void destroy() { http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java ---------------------------------------------------------------------- diff --git a/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java b/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java index 4ef3102..6445cc2 100644 --- a/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java +++ b/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java @@ -64,7 +64,7 @@ public class QuartzSessionValidationScheduler implements SessionValidationSchedu /** * The configured Quartz scheduler to use to schedule the Quartz job. If no scheduler is - * configured, the schedular will be retrieved by calling {@link StdSchedulerFactory#getDefaultScheduler()} + * configured, the scheduler will be retrieved by calling {@link StdSchedulerFactory#getDefaultScheduler()} */ private Scheduler scheduler; http://git-wip-us.apache.org/repos/asf/shiro/blob/f9fb8b98/support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationExecutor.java ---------------------------------------------------------------------- diff --git a/support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationExecutor.java b/support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationExecutor.java index 92d2321..4613d40 100644 --- a/support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationExecutor.java +++ b/support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationExecutor.java @@ -96,7 +96,7 @@ public class SecureRemoteInvocationExecutor extends DefaultRemoteInvocationExecu if (log.isTraceEnabled()) { log.trace("RemoteInvocation did not contain a Shiro Session id attribute under " + "key [" + SecureRemoteInvocationFactory.SESSION_ID_KEY + "]. A Subject based " + - "on an existing Session will not be available during the method invocatin."); + "on an existing Session will not be available during the method invocation."); } }
