You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/01/02 14:15:06 UTC

svn commit: r730713 - in /incubator/jspwiki/trunk: ChangeLog src/com/ecyrd/jspwiki/Release.java src/com/ecyrd/jspwiki/action/LoginActionBean.java

Author: metskem
Date: Fri Jan  2 05:15:06 2009
New Revision: 730713

URL: http://svn.apache.org/viewvc?rev=730713&view=rev
Log:
 3.0.0-svn-42 JSPWIKI-464 The LoginException thrown by the AuthenticationManager is now properly handled by the LoginActionBean (instead of showing the default localized login.error message).

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=730713&r1=730712&r2=730713&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Jan  2 05:15:06 2009
@@ -1,3 +1,11 @@
+2009-01-02  Harry Metske <me...@apache.org>
+
+        * 3.0.0-svn-42
+
+        * [JSPWIKI-464] The LoginException thrown by the AuthenticationManager
+        is now properly handled by the LoginActionBean (instead of showing the 
+        default localized login.error message).
+
 2008-12-31  Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 3.0.0-svn-41
@@ -194,7 +202,7 @@
         * 3.0.0-svn-22
         
         * Moved WikiException, FilterException & PluginException to the 
-        org.apache.jspwiki.api package.  This is a part of the overall 
+        org.apache.jzpwiki.api package.  This is a part of the overall 
         transition to have a stable API.
 
         * [JSPWIKI-291] Added patch from Thomas Engelschmidt to replace ORO

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=730713&r1=730712&r2=730713&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Fri Jan  2 05:15:06 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "41";
+    public static final String     BUILD         = "42";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java?rev=730713&r1=730712&r2=730713&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java Fri Jan  2 05:15:06 2009
@@ -123,8 +123,8 @@
         }
         catch ( LoginException e )
         {
-            log.info( "Failed to authenticate user " + m_username );
-            errors.addGlobalError( new LocalizableError( "login.error.password" ) );
+            log.info( "Failed to authenticate user " + m_username + ", reason: " + e.getMessage());
+            errors.addGlobalError( new SimpleError( e.getMessage() ) );
         }
         catch( WikiSecurityException e )
         {