You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2011/11/07 16:14:53 UTC

svn commit: r1198772 - in /sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid: OpenIDConstants.java OpenIDFailure.java impl/OpenIDAuthenticationHandler.java

Author: fmeschbe
Date: Mon Nov  7 15:14:53 2011
New Revision: 1198772

URL: http://svn.apache.org/viewvc?rev=1198772&view=rev
Log:
SLING-2080 Apply patch by Angela Schreiber (thank you very much)

Modified:
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java
    sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java

Modified: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java?rev=1198772&r1=1198771&r2=1198772&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDConstants.java Mon Nov  7 15:14:53 2011
@@ -65,7 +65,7 @@ public final class OpenIDConstants {
      * <code>requestCredentials</code> method providing to authenticated OpenID
      * identity. This parameter is only set if the
      * {@link #OPENID_FAILURE_REASON} is {@link OpenIDFailure#REPOSITORY} and
-     * can be used to offer the user assistence with associating an existing JCR
+     * can be used to offer the user assistance with associating an existing JCR
      * user with the OpenID identity.
      */
     public static final String OPENID_IDENTITY = "j_openid_identity";

Modified: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java?rev=1198772&r1=1198771&r2=1198772&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/OpenIDFailure.java Mon Nov  7 15:14:53 2011
@@ -61,7 +61,7 @@ public enum OpenIDFailure {
      * Indicates failure of the verification of the supplied authentication
      * information with the OpenID Provider.
      */
-    VERIFICATION("Authentication verfication failed"),
+    VERIFICATION("Authentication verification failed"),
 
     /**
      * Indicates failure to find a matching Repository user for the supplied

Modified: sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java?rev=1198772&r1=1198771&r2=1198772&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java (original)
+++ sling/trunk/bundles/auth/openid/src/main/java/org/apache/sling/auth/openid/impl/OpenIDAuthenticationHandler.java Mon Nov  7 15:14:53 2011
@@ -343,7 +343,7 @@ public class OpenIDAuthenticationHandler
                 // prepare the url for the return_to parameter
                 final String url = getBaseUrl(request);
 
-                // set the ream/trustroot from configuraiton or the root url
+                // set the realm/trustroot from configuration or the root url
                 final String trustRoot = (realm == null) ? url : realm;
 
                 // append the resource URL to the returnTo address
@@ -384,7 +384,7 @@ public class OpenIDAuthenticationHandler
      * @param request The request object
      * @param response The response object to which to send the request
      * @return <code>true</code> is always returned by this handler
-     * @throws IOException if an error occurrs sending back the response.
+     * @throws IOException if an error occurs sending back the response.
      */
     public boolean requestCredentials(HttpServletRequest request,
             HttpServletResponse response) throws IOException {
@@ -442,6 +442,7 @@ public class OpenIDAuthenticationHandler
         }
     }
 
+    @Override
     public void authenticationFailed(HttpServletRequest request,
             HttpServletResponse response, AuthenticationInfo authInfo) {
 
@@ -470,6 +471,7 @@ public class OpenIDAuthenticationHandler
         }
     }
 
+    @Override
     public boolean authenticationSucceeded(HttpServletRequest request,
             HttpServletResponse response, AuthenticationInfo authInfo) {
 
@@ -491,7 +493,7 @@ public class OpenIDAuthenticationHandler
      * <li>No user is available from the request at all</li>
      * </ul>
      * <p>
-     * If no user is available or any error occurrs while trying to discover the
+     * If no user is available or any error occurs while trying to discover the
      * user from the request, <code>null</code> is returned.
      *
      * @param relyingParty The <code>RelyingParty</code> object used to discover