Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix annoying typos. #192

Merged
merged 1 commit into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jspwiki-api/src/main/java/org/apache/wiki/api/core/Acl.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one
* This interface is a highly stripped-down derivation of the java.security.acl.Acl interface. In particular, the notion of an Acl "owner"
* has been eliminated, since JSPWiki pages do not have owners. An additional simplification compared to the standard Java package is that
* negative permissions have been eliminated. Instead, JSPWiki assumes a "default-deny" security stance: principals are granted no
* permissions by default, and posesses only those that have been explicitly granted to them. And finally, the getPermissions() and
* permissions by default, and possesses only those that have been explicitly granted to them. And finally, the getPermissions() and
* checkPermission() methods have been eliminated due to the complexities associated with resolving Role principal membership.
* </p>
* @since 2.3
Expand Down Expand Up @@ -73,12 +73,12 @@ public interface Acl {
boolean isEmpty();

/**
* Returns all Principal objects assigned a given Permission in the access control list. The Princiapls returned are those that
* Returns all Principal objects assigned a given Permission in the access control list. The Principals returned are those that
* have been granted either the supplied permission, or a permission implied by the supplied permission. Principals are not
* "expanded" if they are a role or group.
*
* @param permission the permission to search for
* @return an array of Principals posessing the permission
* @return an array of Principals possessing the permission
*/
Principal[] findPrincipals( Permission permission );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public interface Command {
String getRequestContext();

/**
* Returns the Permission required to successfully execute this Command. If no Permission is requred, this method returns
* Returns the Permission required to successfully execute this Command. If no Permission is required, this method returns
* <code>null</code>. For example, the static command {@code org.apache.wiki.ui.PageCommand#VIEW} doesn't require a permission because
* it isn't referring to a particular WikiPage. However, if this command targets a WikiPage called <code>Main</code>(via
* {@code org.apache.wiki.ui.PageCommand#targetedCommand(Object)}, the resulting Command would require the permission
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one


/**
* <p>Represents a long-running wiki session, with an associated user Principal, user Subject, and authentication status. The sesion
* <p>Represents a long-running wiki session, with an associated user Principal, user Subject, and authentication status. The session
* is initialized with minimal, default-deny values: authentication is set to <code>false</code>, and the user principal is set to
* <code>null</code>.</p>
* <p>The Session allows callers to:</p>
Expand All @@ -42,7 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one
* {@link #addMessage(String)}, {@link #getMessages(String)}
* and {@link #clearMessages(String)}</li>
* </ul>
* <p>To keep track of the Principals each user posseses, each Session stores a JAAS Subject. Various login processes add or
* <p>To keep track of the Principals each user possesses, each Session stores a JAAS Subject. Various login processes add or
* remove Principals when users authenticate or log out.</p>
* <p>Session extends the {@link org.apache.wiki.event.WikiEventListener} interface and listens for group add/change/delete
* events fired by event sources the Session is registered with: {@link org.apache.wiki.auth.AuthenticationManager},
Expand Down Expand Up @@ -233,7 +233,7 @@ public interface Session extends WikiEventListener {

/**
* Wrapper for {@link Subject#doAsPrivileged(Subject, PrivilegedAction, java.security.AccessControlContext)}
* that executes an action with the privileges posssessed by a Session's Subject. The action executes with a <code>null</code>
* that executes an action with the privileges possessed by a Session's Subject. The action executes with a <code>null</code>
* AccessControlContext, which has the effect of running it "cleanly" without the AccessControlContexts of the caller.
*
* @param session the wiki session
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one


/**
* Marks an erroneus jspwiki.properties file. Certain properties have been marked as "required", and if you
* Marks an erroneous jspwiki.properties file. Certain properties have been marked as "required", and if you
* do not provide a good value for a property, you'll see this exception.
* <P>
* Check <TT>jspwiki.properties</TT> for the required properties.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public WikiSecurityEvent( final Object src, final int type, final Object target
}

/**
* Returns the principal to whom the opeation applied, if supplied. This method may return <code>null</code>
* Returns the principal to whom the operation applied, if supplied. This method may return <code>null</code>
* <em>&#8212; and calling methods should check for this condition</em>.
*
* @return the changed object
Expand Down Expand Up @@ -196,7 +196,7 @@ public String toString() {
final Object obj = getSrc(); // cfr. https://forums.oracle.com/forums/thread.jspa?threadID=1184115
msg.append( " [source=" ).append( obj.toString() );
if( m_principal != null ) {
msg.append( ", princpal=" ).append( m_principal.getClass().getName() );
msg.append( ", principal=" ).append( m_principal.getClass().getName() );
msg.append( " " ).append( m_principal.getName() );
}
msg.append( ", target=" ).append( m_target );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one
* </p>
* {@inheritDoc}
* @since 2.3
* @deprecated use {@link org.apache.wiki.api.core.Acl} insteaad
* @deprecated use {@link org.apache.wiki.api.core.Acl} instead
* @see org.apache.wiki.api.core.Acl
*/
@Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one
*
* @see Acl
* @since 2.3
* @deprecated use {@link org.apache.wiki.api.core.AclEntry} insteaad
* @deprecated use {@link org.apache.wiki.api.core.AclEntry} instead
* @see org.apache.wiki.api.core.AclEntry
*/
@Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one
* manager, and built-in role definitions.
* Creating a principal marked "unresolved" allows
* delayed resolution, which enables principals to be resolved
* lazily during a later access control check. Conceptuallly,
* lazily during a later access control check. Conceptually,
* UnresolvedPrincipal performs a function similar to
* {@link java.security.UnresolvedPermission}.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public String getWiki() {
* Returns <code>true</code> if a Principal is a member of the group. Specifically, the Principal's <code>getName()</code> method must
* return the same value as one of the Principals in the group member list. The Principal's type does <em>not</em> need to match.
*
* @param principal the principal about whom membeship status is sought
* @param principal the principal about whom membership status is sought
* @return the result of the operation
*/
public boolean isMember( final Principal principal ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one


/**
* Extends the {@link org.apache.wiki.auth.Authorizer} interface by including a delgate method for
* Extends the {@link org.apache.wiki.auth.Authorizer} interface by including a delegate method for
* {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}.
*/
public interface WebAuthorizer extends Authorizer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one


/**
* Ususal permission checks
* Usual permission checks
*/
class PermissionChecks {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public interface UserDatabase {
* a user with the supplied identifier, throws a {@link NoSuchPrincipalException}.
* </p>
* <p>
* Note that if an implememtation wishes to mark one of the returned Principals as representing the user's common name, it should
* Note that if an implementation wishes to mark one of the returned Principals as representing the user's common name, it should
* instantiate this Principal using {@link org.apache.wiki.auth.WikiPrincipal#WikiPrincipal(String, String)} with the <code>type</code>
* parameter set to {@link org.apache.wiki.auth.WikiPrincipal#WIKI_NAME}. The method
* {@link org.apache.wiki.api.core.Session#getUserPrincipal()} will return this principal as the "primary" principal. Note that this method
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void setMonth( String month )
* Sets the page format. If a page corresponding to the format is found when
* the calendar is being rendered, a link to that page is created. E.g. if the
* format is set to <tt>'Main_blogentry_'ddMMyy</tt>, it works nicely in
* conjuction to the WeblogPlugin.
* conjunction to the WeblogPlugin.
*
* @param format The format in the SimpleDateFormat fashion.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ Licensed to the Apache Software Foundation (ASF) under one
/**
* Returns or clears the current messages associated with the user's wiki
* session. This tag accepts four attributes: <ul> <li><code>action</code> -
* if "clear", the messsages will be cleared. Otherwise, this tag will always
* if "clear", the messages will be cleared. Otherwise, this tag will always
* print the set of current messages as either a single &lt;p&gt; tag (if there
* is only one message) or a bulleted list (if there is more than one).</li>
* <li><code>prefix</code> - the string to prepend to the list of errors, if
* there are any; default is empty string</li> <li><code>topic</code> - a
* collection for messages, for example those associated with a particular web
* form. If not suppled, defaults to a generic (non-specific) collection</li>
* form. If not supplied, defaults to a generic (non-specific) collection</li>
* <li><code>div</code> - the <code>div</code> class to wrap the
* messages in; if not supplied, <code>information</code> is assumed</li></ul>
* @since 2.3.54
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public interface Step extends Serializable {
void start() throws WikiException;

/**
* Sets the current Outcome for the step. If the Outcome is a "completion" Outcome, it should also sets the completon time and mark the
* Sets the current Outcome for the step. If the Outcome is a "completion" Outcome, it should also sets the completion time and mark the
* Step as complete. Once a Step has been marked complete, this method cannot be called again. If the supplied Outcome is not in the
* set returned by {@link #getAvailableOutcomes()}, or is not {@link Outcome#STEP_CONTINUE} or {@link Outcome#STEP_ABORT}, this method
* returns an IllegalArgumentException. If the caller attempts to set an Outcome and the Step has already completed, this method throws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one


/**
* System users asociated with workflow Task steps.
* System users associated with workflow Task steps.
*/
public final class SystemPrincipal implements Principal {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Licensed to the Apache Software Foundation (ASF) under one
* <code>jspwiki.properties</code>.</p>
* <p>To enable e-mail functions within JSPWiki, administrators must do three things:
* ensure that the required JavaMail JARs are on the runtime classpath, configure
* JavaMail appropriately, and (recommdended) configure the JNDI JavaMail session factory.</p>
* JavaMail appropriately, and (recommended) configure the JNDI JavaMail session factory.</p>
* <strong>JavaMail runtime JARs</strong>
* <p>The first step is easy: JSPWiki bundles
* recent versions of the required JavaMail <code>mail.jar</code> and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one

/**
* A comparator that sorts Strings using "human" ordering, including decimal
* ordering. Only works for languages where every character is lexigraphically
* ordering. Only works for languages where every character is lexicographically
* distinct and correctly unicode ordered (e.g. English). Other languages should use
* <code>CollatedHumanComparator</code>. Pretty efficient but still slower than
* String.compareTo().
Expand Down
2 changes: 1 addition & 1 deletion jspwiki-war/src/main/styles/jspwiki_print.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

/*
* CSS intended specificaly for print media
* CSS intended specifically for print media
*
*/
.applicationlogo, .companylogo, .titlebox, .userbox,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface SyntaxDecorator {
* @param preStack stack containing the amount of nested {@code pre}s.
* @param outTrimmer writer capable of trimming whitespaces and of checking if it's currently writing a line start.
* @param config xhtml to wiki configuration object.
* @param chain chain (in the chain of responsabilities pattern) that is expected to be called by the different xhtml decorations.
* @param chain chain (in the chain of responsibilities patterns) that is expected to be called by the different xhtml decorations.
*/
void init( PrintWriter out, Deque< String > liStack, Deque< String > preStack, WhitespaceTrimWriter outTrimmer, XHtmlToWikiConfig config, XHtmlElementToWikiTranslator chain );

Expand Down