You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by mo...@apache.org on 2002/09/16 19:57:15 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_de.properties JetspeedLocalization_en.properties JetspeedLocalization_es.properties JetspeedLocalization_fr.properties JetspeedLocalization_it.properties JetspeedLocalization_ja.properties JetspeedLocalization_my.properties JetspeedLocalization_nl.properties JetspeedLocalization_no.properties
morciuch 2002/09/16 10:57:15
Modified: src/java/org/apache/jetspeed/modules/actions JLoginUser.java
src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization_de.properties
JetspeedLocalization_en.properties
JetspeedLocalization_es.properties
JetspeedLocalization_fr.properties
JetspeedLocalization_it.properties
JetspeedLocalization_ja.properties
JetspeedLocalization_my.properties
JetspeedLocalization_nl.properties
JetspeedLocalization_no.properties
Log:
Localized messages for 2 common login exceptions: password expired and invalid password/username.
Revision Changes Path
1.30 +4 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JLoginUser.java 13 Sep 2002 18:44:06 -0000 1.29
+++ JLoginUser.java 16 Sep 2002 17:57:14 -0000 1.30
@@ -91,6 +91,7 @@
import org.apache.jetspeed.services.security.FailedLoginException;
import org.apache.jetspeed.services.security.CredentialExpiredException;
import org.apache.jetspeed.services.security.AccountExpiredException;
+import org.apache.jetspeed.services.security.UnknownUserException;
/**
This class is responsible for logging a user into the system. It is also
@@ -259,7 +260,8 @@
if (e instanceof FailedLoginException)
{
- Log.info("JLoginUser: Credential Failure on login", e);
+ Log.info("JLoginUser: Credential Failure on login for user: " + username, e);
+ data.setMessage(Localization.getString("PASSWORDFORM_FAILED_MSG"));
}
else if (e instanceof AccountExpiredException)
{
@@ -271,12 +273,11 @@
data.setScreenTemplate(
JetspeedResources.getString(JetspeedResources.CHANGE_PASSWORD_TEMPLATE, "ChangePassword")
);
- data.setMessage("Your password has expired. Please change your password.");
+ data.setMessage(Localization.getString("PASSWORDFORM_EXPIRED_MSG"));
data.getParameters().setString("username", username);
}
return;
-
}
if (user.getDisabled())
1.9 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties
Index: JetspeedLocalization_de.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JetspeedLocalization_de.properties 13 Sep 2002 18:44:06 -0000 1.8
+++ JetspeedLocalization_de.properties 16 Sep 2002 17:57:14 -0000 1.9
@@ -110,3 +110,5 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.24 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
Index: JetspeedLocalization_en.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JetspeedLocalization_en.properties 13 Sep 2002 18:44:06 -0000 1.23
+++ JetspeedLocalization_en.properties 16 Sep 2002 17:57:14 -0000 1.24
@@ -189,4 +189,6 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.8 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties
Index: JetspeedLocalization_es.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JetspeedLocalization_es.properties 13 Sep 2002 18:44:06 -0000 1.7
+++ JetspeedLocalization_es.properties 16 Sep 2002 17:57:14 -0000 1.8
@@ -123,3 +123,5 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.11 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties
Index: JetspeedLocalization_fr.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JetspeedLocalization_fr.properties 13 Sep 2002 18:44:06 -0000 1.10
+++ JetspeedLocalization_fr.properties 16 Sep 2002 17:57:14 -0000 1.11
@@ -122,7 +122,7 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
-
-
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.3 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_it.properties
Index: JetspeedLocalization_it.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_it.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLocalization_it.properties 13 Sep 2002 18:44:06 -0000 1.2
+++ JetspeedLocalization_it.properties 16 Sep 2002 17:57:14 -0000 1.3
@@ -186,3 +186,5 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.5 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_ja.properties
Index: JetspeedLocalization_ja.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_ja.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JetspeedLocalization_ja.properties 14 Sep 2002 16:54:44 -0000 1.4
+++ JetspeedLocalization_ja.properties 16 Sep 2002 17:57:14 -0000 1.5
@@ -188,4 +188,6 @@
PASSWORDFORM_CHANGE=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4
PASSWORDFORM_DONE=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4\u306b\u6210\u529f\u3057\u307e\u3057\u305f\uff0e
PASSWORDFORM_THESAME_MSG=\u53e4\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3068\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u540c\u3058\u3067\u3059\uff0e\u65b0\u3057\u3044\u5225\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\uff0e
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.3 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_my.properties
Index: JetspeedLocalization_my.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_my.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLocalization_my.properties 13 Sep 2002 18:44:06 -0000 1.2
+++ JetspeedLocalization_my.properties 16 Sep 2002 17:57:14 -0000 1.3
@@ -190,3 +190,5 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.4 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_nl.properties
Index: JetspeedLocalization_nl.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_nl.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedLocalization_nl.properties 13 Sep 2002 18:44:06 -0000 1.3
+++ JetspeedLocalization_nl.properties 16 Sep 2002 17:57:14 -0000 1.4
@@ -190,3 +190,5 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
1.3 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_no.properties
Index: JetspeedLocalization_no.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_no.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLocalization_no.properties 13 Sep 2002 18:44:06 -0000 1.2
+++ JetspeedLocalization_no.properties 16 Sep 2002 17:57:14 -0000 1.3
@@ -194,3 +194,5 @@
PASSWORDFORM_CHANGE=Change Password
PASSWORDFORM_DONE=Password has been successfully changed
PASSWORDFORM_THESAME_MSG=Old and new passwords are the same. Please select another new password.
+PASSWORDFORM_EXPIRED_MSG=Your password has expired. Please change your password.
+PASSWORDFORM_FAILED_MSG=Invalid user name and/or password. Please reenter your credentials.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>