continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r443530 - in /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources: META-INF/plexus/application.xml localization/Continuum.properties
Date Fri, 15 Sep 2006 00:13:05 GMT
Author: carlos
Date: Thu Sep 14 17:13:04 2006
New Revision: 443530

URL: http://svn.apache.org/viewvc?view=rev&rev=443530
Log:
Added account locked message

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=443530&r1=443529&r2=443530
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Thu Sep 14 17:13:04 2006
@@ -379,13 +379,17 @@
         </requirement>
       </requirements>
       <configuration>
-        <authenticationFailureUrl>/user/login.jsp?login_error=1</authenticationFailureUrl>
+        <authenticationFailureUrl>/user/login.jsp?login_error=login.bad_login_password</authenticationFailureUrl>
         <defaultTargetUrl>/</defaultTargetUrl>
         <filterProcessesUrl>/j_acegi_security_check</filterProcessesUrl>
         <exceptionMappings>
           <property>
             <name>org.acegisecurity.CredentialsExpiredException</name>
             <value>/user/expiredPassword.action</value>
+          </property>
+          <property>
+            <name>org.acegisecurity.LockedException</name>
+            <value>/user/login.jsp?login_error=login.account.locked</value>
           </property>
         </exceptionMappings>
       </configuration>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=443530&r1=443529&r2=443530
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
Thu Sep 14 17:13:04 2006
@@ -403,26 +403,28 @@
 login.password = Password
 login.rememberMe = Remember me
 login.submit = Login
-login.bad_login_password = Wrong username or password
+login.bad.login.password = Wrong username or password
+login.account.locked = Your account has been locked. Please contact your administrator.
 
 # ----------------------------------------------------------------------
 # Page: Add/Edit/DeleteUsers
 # ----------------------------------------------------------------------
 
 user.username = User Name
+user.fullname = Full Name
 user.password = Password
 user.email = Email Address
-users.page.title = Continuum - Users List
+users.page.title = Users List
 users.section.title = Users List
-user.add.page.title = Continuum - Add User
+user.add.page.title = Add User
 user.add.section.title = Add User
-user.edit.page.title = Continuum - Edit User
+user.edit.page.title = Edit User
 user.edit.section.title = Edit User
 user.edit.account = Edit user info
-user.delete.page.title = Continuum - Delete User
+user.delete.page.title = Delete User
 user.delete.section.title = Delete User
 user.delete.confirmation.message = Are you sure you want to delete the user "{0}"?
-role.page.title = Continuum - Roles List
+role.page.title = Roles List
 role.section.title = Roles List
 role.rolename = Roles
 user.group.header = Groups



Mime
View raw message