Skip to content

Commit 99f43de

Browse files
committed
[SHIRO-805] Spelling
* account * against * and * application * authentication * authorization * authorizer * automatically * axes * both * build * case * consistent * contains * control * controls * created * deauthenticating * defaults * defined * delimited * delimiter * deserialized * deserializes * e.g. * efficient * encapsulate * encryption * environment * et al. * etc. * evaluate * evaluator * exception * explicitly * false * filters * from * hash format * hashed * hierarchy * i.e. * identifier * identifying * immediately * implementation * implementers * inferring * injectable * iterator * join point * manner * modifier * nonexistent * obtained * overridden * password * performing * permission * permissions * preemptively * recognized * reget * remnant * request * required * resolvable * returned * safely * session * subsequent * successfully * type * undertow * usually * wield Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
1 parent 92a04d6 commit 99f43de

File tree

119 files changed

+199
-660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+199
-660
lines changed

.jenkins.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pipeline {
4040
'jdk_11_latest', 'adopt_hs_11_latest', 'adopt_j9_11_latest',
4141
'jdk_16_latest', 'adopt_hs_16_latest', 'adopt_j9_16_latest'
4242
}
43-
// Additional axess, like OS and maven version can be configured here.
43+
// Additional axes, like OS and maven version can be configured here.
4444
}
4545

4646
agent {
@@ -159,7 +159,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
159159
// Send an email, if the last build was not successful and this one is.
160160
success {
161161
// Cleanup the build directory if the build was successful
162-
// (in this cae we probably don't have to do any post-build analysis)
162+
// (in this case we probably don't have to do any post-build analysis)
163163
cleanWs()
164164
script {
165165
if (deployableBranch

RELEASE-NOTES

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Bug
5353

5454
Bug
5555

56-
[SHIRO-767] - org.apache.shiro.util.ClassUtil cannot load the array of Primitive DataType when use undertown as web container
56+
[SHIRO-767] - org.apache.shiro.util.ClassUtil cannot load the array of Primitive DataType when use undertow as web container
5757
[SHIRO-792] - ShiroWebFilterConfiguration seems to conflict with other FilterRegistrationBean
5858

5959
New Feature
@@ -191,7 +191,7 @@ Test
191191
Task
192192

193193
[SHIRO-690] - Validate JDK11 compatibility
194-
[SHIRO-692] - Upgrade and enforce min buid maven version to 3.5.0
194+
[SHIRO-692] - Upgrade and enforce min build maven version to 3.5.0
195195
[SHIRO-698] - Improve build with maven profile
196196
[SHIRO-734] - Remove Spring-client sample
197197
[SHIRO-735] - Shiro does not support servlet-3.1 void method(@Suspended AsyncResponse)
@@ -448,7 +448,7 @@ Bug:
448448

449449
[SHIRO-316] - Annotations in samples-aspectj Project Does not Work
450450
[SHIRO-351] - Shiro Native Session implementation cannot extract JSESSIONID From URL if JSESSIONID is URL parameter (not HTTP parameter)
451-
[SHIRO-379] - SimpleAccoutRealm concurrency access to roles and users
451+
[SHIRO-379] - SimpleAccountRealm concurrency access to roles and users
452452
[SHIRO-380] - runAs feature (still) doesn't work
453453
[SHIRO-387] - EnvironmentLoader destroys wrong environment
454454
[SHIRO-388] - Stackoverflow org.apache.shiro.session.SessionListener.onStop()

cache/src/main/java/org/apache/shiro/cache/Cache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* <p>Shiro doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
2828
* Security framework. Instead, this interface provides an abstraction (wrapper) API on top of an underlying
2929
* cache framework's cache instance (e.g. JCache, Ehcache, JCS, OSCache, JBossCache, TerraCotta, Coherence,
30-
* GigaSpaces, etc, etc), allowing a Shiro user to configure any cache mechanism they choose.
30+
* GigaSpaces, etc., etc.), allowing a Shiro user to configure any cache mechanism they choose.
3131
*
3232
* @since 0.2
3333
*/

cache/src/main/java/org/apache/shiro/cache/CacheManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* <p>Shiro doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
2525
* Security framework. Instead, this interface provides an abstraction (wrapper) API on top of an underlying
2626
* cache framework's main Manager component (e.g. JCache, Ehcache, JCS, OSCache, JBossCache, TerraCotta, Coherence,
27-
* GigaSpaces, etc, etc), allowing a Shiro user to configure any cache mechanism they choose.
27+
* GigaSpaces, etc., etc.), allowing a Shiro user to configure any cache mechanism they choose.
2828
*
2929
* @since 0.9
3030
*/

cache/src/main/java/org/apache/shiro/cache/MemoryConstrainedCacheManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* While the {@code Cache} instances created are thread-safe, they do not offer any enterprise-level features such as
3030
* cache coherency, optimistic locking, failover or other similar features. For more enterprise features, consider
3131
* using a different {@code CacheManager} implementation backed by an enterprise-grade caching product (Hazelcast,
32-
* EhCache, TerraCotta, Coherence, GigaSpaces, etc, etc).
32+
* EhCache, TerraCotta, Coherence, GigaSpaces, etc., etc.).
3333
*
3434
* @since 1.0
3535
*/

core/src/main/java/org/apache/shiro/aop/MethodInvocation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public interface MethodInvocation {
5151
Object[] getArguments();
5252

5353
/**
54-
* Returns the object that holds the current joinpoint's static part.
54+
* Returns the object that holds the current join point's static part.
5555
* For instance, the target object for an invocation.
5656
*
57-
* @return the object that holds the current joinpoint's static part.
57+
* @return the object that holds the current join point's static part.
5858
* @since 1.0
5959
*/
6060
Object getThis();

core/src/main/java/org/apache/shiro/aop/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
* <p/>
2222
* As this package is a root-level package under <tt>org.apache.shiro</tt>, it contains AOP support classes
2323
* useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
24-
* authentication, etc) will use these classes as their base in their respective packages.
24+
* authentication, etc.) will use these classes as their base in their respective packages.
2525
*/
2626
package org.apache.shiro.aop;

core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public final AuthenticationInfo authenticate(AuthenticationToken token) throws A
247247
* {@code AuthenticationException} if there is a problem during
248248
* authentication instead of returning {@code null}. A {@code null} return value indicates
249249
* a configuration or programming error, since {@code AuthenticationException}s should
250-
* indicate any expected problem (such as an unknown account or username, or invalid password, etc).
250+
* indicate any expected problem (such as an unknown account or username, or invalid password, etc.).
251251
*
252252
* @param token the authentication token encapsulating the user's login information.
253253
* @return an {@code AuthenticationInfo} object encapsulating the user's account information

core/src/main/java/org/apache/shiro/authc/Account.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* encapsulate both the authentication and authorization information used by both authc and authz operations.
3030
* <p/>
3131
* <b>Please Note</b>: Since Shiro sometimes logs account operations, please ensure your Account's <code>toString()</code>
32-
* implementation does <em>not</em> print out account credentials (password, etc), as these might be viewable to
32+
* implementation does <em>not</em> print out account credentials (password, etc.), as these might be viewable to
3333
* someone reading your logs. This is good practice anyway, and account principals should rarely (if ever) be printed
3434
* out for any reason. If you're using Shiro's default implementations of this interface, they only ever print the
3535
* account {@link #getPrincipals() principals}, so you do not need to do anything additional.

core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* preferences.
4747
* <p/>
4848
* <p><b>Please note:</b> Since Shiro sometimes logs authentication operations, please ensure your AuthenticationInfo's
49-
* <code>toString()</code> implementation does <em>not</em> print out account credentials (password, etc), as these might be viewable to
49+
* <code>toString()</code> implementation does <em>not</em> print out account credentials (password, etc.), as these might be viewable to
5050
* someone reading your logs. This is good practice anyway, and account credentials should rarely (if ever) be printed
5151
* out for any reason. If you're using Shiro's default implementations of this interface, they only ever print the
5252
* account {@link #getPrincipals() principals}, so you do not need to do anything additional.</p>
@@ -59,7 +59,7 @@ public interface AuthenticationInfo extends Serializable {
5959

6060
/**
6161
* Returns all principals associated with the corresponding Subject. Each principal is an identifying piece of
62-
* information useful to the application such as a username, or user id, a given name, etc - anything useful
62+
* information useful to the application such as a username, or user id, a given name, etc. - anything useful
6363
* to the application to identify the current <code>Subject</code>.
6464
* <p/>
6565
* The returned PrincipalCollection should <em>not</em> contain any credentials used to verify principals, such

0 commit comments

Comments
 (0)