svnno****@sourc*****
svnno****@sourc*****
2008年 8月 7日 (木) 07:40:39 JST
Revision: 1084
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1084
Author: shinsuke
Date: 2008-08-07 07:40:38 +0900 (Thu, 07 Aug 2008)
Log Message:
-----------
clean up a password error handling.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java
pal-admin/trunk/src/main/resources/PAMessages.properties
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2008-08-06 08:32:08 UTC (rev 1083)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2008-08-06 22:40:38 UTC (rev 1084)
@@ -76,7 +76,7 @@
return true;
}
- public void updatePassword(String username, String currentPassword,
+ public String updatePassword(String username, String currentPassword,
String newPassword) throws CommonException {
UserManager userManager = PortalComponentUtil.getUserManager();
@@ -106,19 +106,16 @@
requestContext.setSessionAttribute(
PortalReservedParameters.SESSION_KEY_SUBJECT, subject);
} catch (InvalidPasswordException ipe) {
- throw new CommonException("invalid.current.password",
- "Invalid password. ");
+ return "invalid.current.password";
} catch (InvalidNewPasswordException inpe) {
- throw new CommonException("invalid.new.password",
- "Invalid new password. ");
+ return "invalid.new.password";
} catch (PasswordAlreadyUsedException paue) {
- throw new CommonException("password.already.used",
- "The password already used. ");
+ return "password.already.used";
} catch (SecurityException e) {
throw new CommonException("could.not.change.password",
- "Security exception. ");
+ "Security exception. ", e);
}
-
+ return null;
}
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2008-08-06 08:32:08 UTC (rev 1083)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2008-08-06 22:40:38 UTC (rev 1084)
@@ -84,12 +84,19 @@
}
try {
- getPasswordManagementService().updatePassword(username,
- currentPassword, newPassword);
- FacesMessageUtil.addInfoMessage("changed.password");
+ String msgId = getPasswordManagementService().updatePassword(
+ username, currentPassword, newPassword);
+ if (msgId == null) {
+ FacesMessageUtil.addInfoMessage("changed.password");
+ } else {
+ FacesMessageUtil.addWarnMessage(msgId);
+ }
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0046", new Object[] {}, e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("could.not.change.password");
+ logger.log("EPA0176", new Object[] {}, e);
}
return null;
}
Modified: pal-admin/trunk/src/main/resources/PAMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/PAMessages.properties 2008-08-06 08:32:08 UTC (rev 1083)
+++ pal-admin/trunk/src/main/resources/PAMessages.properties 2008-08-06 22:40:38 UTC (rev 1084)
@@ -173,6 +173,7 @@
EPA0173=Failed to delete new repository.
EPA0174=Invalid repository parameters.
EPA0175=Could not create user: {0}
+EPA0176=Could not change the password.
WPA0001=Failed to delete a user. The username is null.
WPA0002=Could not find a user: {0}