svnno****@sourc*****
svnno****@sourc*****
2007年 7月 19日 (木) 15:54:48 JST
Revision: 314
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=314
Author: shinsuke
Date: 2007-07-19 15:54:48 +0900 (Thu, 19 Jul 2007)
Log Message:
-----------
added pull-down box for secret question, code alignment, replaced FacesMessagesUtil.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties
pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html
pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -3,17 +3,16 @@
import java.io.Serializable;
import javax.faces.context.FacesContext;
-import javax.faces.internal.FacesMessageUtil;
import jp.sf.pal.admin.service.UserRegistrationService;
import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
import org.seasar.framework.log.Logger;
import org.seasar.teeda.extension.annotation.validator.Required;
import org.seasar.teeda.extension.util.LabelHelper;
-public class ForgottenPasswordPage implements Serializable
-{
+public class ForgottenPasswordPage implements Serializable {
/**
*
*/
@@ -22,7 +21,8 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(ForgottenPasswordPage.class);
+ private static final Logger logger = Logger
+ .getLogger(ForgottenPasswordPage.class);
private FacesContext facesContext;
@@ -36,106 +36,94 @@
private String guid;
- public String getEmail()
- {
+ public String getEmail() {
return email;
}
- public void setEmail(String email)
- {
+ public void setEmail(String email) {
this.email = email;
}
/**
* @return the guid
*/
- public String getGuid()
- {
+ public String getGuid() {
return guid;
}
/**
* @param guid the guid to set
*/
- public void setGuid(String guid)
- {
+ public void setGuid(String guid) {
this.guid = guid;
}
/**
* @return the facesContext
*/
- public FacesContext getFacesContext()
- {
+ public FacesContext getFacesContext() {
return facesContext;
}
/**
* @param facesContext the facesContext to set
*/
- public void setFacesContext(FacesContext facesContext)
- {
+ public void setFacesContext(FacesContext facesContext) {
this.facesContext = facesContext;
}
/**
* @return the labelHelper
*/
- public LabelHelper getLabelHelper()
- {
+ public LabelHelper getLabelHelper() {
return labelHelper;
}
/**
* @param labelHelper the labelHelper to set
*/
- public void setLabelHelper(LabelHelper labelHelper)
- {
+ public void setLabelHelper(LabelHelper labelHelper) {
this.labelHelper = labelHelper;
}
/**
* @return the userRegistrationService
*/
- public UserRegistrationService getUserRegistrationService()
- {
+ public UserRegistrationService getUserRegistrationService() {
return userRegistrationService;
}
/**
* @param userRegistrationService the userRegistrationService to set
*/
- public void setUserRegistrationService(UserRegistrationService userRegistrationService)
- {
+ public void setUserRegistrationService(
+ UserRegistrationService userRegistrationService) {
this.userRegistrationService = userRegistrationService;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public Class prerender()
- {
+ public Class<?> prerender() {
//TODO Teeda problem: ExternalContext is released after calling action..
- setGuid((String) FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("guid"));
- if (getGuid() != null)
- {
+ setGuid((String) FacesContext.getCurrentInstance().getExternalContext()
+ .getRequestParameterMap().get("guid"));
+ if (getGuid() != null) {
return ResetPasswordPage.class;
}
+
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
- public Class doFinish()
- {
- try
- {
+ public Class<?> doFinish() {
+ try {
getUserRegistrationService().sendNewPassword(this);
FacesMessageUtil.addInfoMessage("an_email_has_been_sent");
return ForgottenPasswordPage.class;
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0002", new Object[] { this.toString() }, e);
@@ -144,8 +132,7 @@
return null;
}
- public String getDoFinishValue()
- {
+ public String getDoFinishValue() {
return getLabelHelper().getLabelValue("RequestNewPassword");
}
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -2,22 +2,25 @@
import java.io.Serializable;
-public class PublicPortalForgottenPasswordCompletedPage extends ResetPasswordPage implements Serializable
-{
+import jp.sf.pal.common.util.FacesMessageUtil;
+public class PublicPortalForgottenPasswordCompletedPage extends
+ ResetPasswordPage implements Serializable {
+
/**
*
*/
private static final long serialVersionUID = -5203115307227054989L;
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public Class prerender()
- {
+ public Class<?> prerender() {
super.prerender();
+
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -1,8 +1,9 @@
package jp.sf.pal.admin.web.registration;
-public class PublicPortalForgottenPasswordPage extends ForgottenPasswordPage
-{
+import jp.sf.pal.common.util.FacesMessageUtil;
+public class PublicPortalForgottenPasswordPage extends ForgottenPasswordPage {
+
/**
*
*/
@@ -12,29 +13,27 @@
public static final String email_lengthValidator = "minimum=5, maximum=80";
- public Class doNext()
- {
+ public Class<?> doNext() {
//TODO check email
return PublicPortalSecretAnswerPage.class;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public Class prerender()
- {
+ public Class<?> prerender() {
super.prerender();
- if (getGuid() != null)
- {
+ if (getGuid() != null) {
return PublicPortalForgottenPasswordCompletedPage.class;
}
+
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
- public String getDoNextValue()
- {
+ public String getDoNextValue() {
return getLabelHelper().getLabelValue("Next");
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -2,21 +2,22 @@
import java.io.Serializable;
-public class PublicPortalRegistrationCompletedPage implements Serializable
-{
+import jp.sf.pal.common.util.FacesMessageUtil;
+public class PublicPortalRegistrationCompletedPage implements Serializable {
+
/**
*
*/
private static final long serialVersionUID = -5112166307058162379L;
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public String prerender()
- {
+ public String prerender() {
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -2,8 +2,8 @@
import java.io.Serializable;
-public class PublicPortalRegistrationPage extends UserRegistrationPage implements Serializable
-{
+public class PublicPortalRegistrationPage extends UserRegistrationPage
+ implements Serializable {
/**
*
@@ -28,105 +28,87 @@
private String userSecretQuestion;
- public String getTermOfService()
- {
+ public String getTermOfService() {
return termOfService;
}
- public void setTermOfService(String termOfService)
- {
+ public void setTermOfService(String termOfService) {
this.termOfService = termOfService;
}
- public Integer getUserBdateDate()
- {
+ public Integer getUserBdateDate() {
return userBdateDate;
}
- public void setUserBdateDate(Integer userBdateDate)
- {
+ public void setUserBdateDate(Integer userBdateDate) {
this.userBdateDate = userBdateDate;
}
- public Integer getUserBdateMonth()
- {
+ public Integer getUserBdateMonth() {
return userBdateMonth;
}
- public void setUserBdateMonth(Integer userBdateMonth)
- {
+ public void setUserBdateMonth(Integer userBdateMonth) {
this.userBdateMonth = userBdateMonth;
}
- public Integer getUserBdateYear()
- {
+ public Integer getUserBdateYear() {
return userBdateYear;
}
- public void setUserBdateYear(Integer userBdateYear)
- {
+ public void setUserBdateYear(Integer userBdateYear) {
this.userBdateYear = userBdateYear;
}
- public String getUserIndustry()
- {
+ public String getUserIndustry() {
return userIndustry;
}
- public void setUserIndustry(String userIndustry)
- {
+ public void setUserIndustry(String userIndustry) {
this.userIndustry = userIndustry;
}
- public String getUserSecretAnswer()
- {
+ public String getUserSecretAnswer() {
return userSecretAnswer;
}
- public void setUserSecretAnswer(String userSecretAnswer)
- {
+ public void setUserSecretAnswer(String userSecretAnswer) {
this.userSecretAnswer = userSecretAnswer;
}
- public String getUserSecretQuestion()
- {
+ public String getUserSecretQuestion() {
return userSecretQuestion;
}
- public void setUserSecretQuestion(String userSecretQuestion)
- {
+ public void setUserSecretQuestion(String userSecretQuestion) {
this.userSecretQuestion = userSecretQuestion;
}
/**
* @return the userNameFamilyYomi
*/
- public String getUserNameFamilyYomi()
- {
+ public String getUserNameFamilyYomi() {
return userNameFamilyYomi;
}
/**
* @param userNameFamilyYomi the userNameFamilyYomi to set
*/
- public void setUserNameFamilyYomi(String userNameFamilyYomi)
- {
+ public void setUserNameFamilyYomi(String userNameFamilyYomi) {
this.userNameFamilyYomi = userNameFamilyYomi;
}
/**
* @return the userNameGivenYomi
*/
- public String getUserNameGivenYomi()
- {
+ public String getUserNameGivenYomi() {
return userNameGivenYomi;
}
/**
* @param userNameGivenYomi the userNameGivenYomi to set
*/
- public void setUserNameGivenYomi(String userNameGivenYomi)
- {
+ public void setUserNameGivenYomi(String userNameGivenYomi) {
this.userNameGivenYomi = userNameGivenYomi;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -6,18 +6,21 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import javax.faces.internal.FacesMessageUtil;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.util.PALAdminUtil;
import jp.sf.pal.admin.util.UserRegistrationUtil;
import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
import org.seasar.framework.log.Logger;
-public class PublicPortalRegistrationRegisterPage extends PublicPortalRegistrationPage
-{
+public class PublicPortalRegistrationRegisterPage extends
+ PublicPortalRegistrationPage {
/**
*
*/
@@ -26,7 +29,8 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(PublicPortalRegistrationRegisterPage.class);
+ private static final Logger logger = Logger
+ .getLogger(PublicPortalRegistrationRegisterPage.class);
public static final String userName_TRequiredValidator = null;
@@ -82,28 +86,75 @@
public static final String userSecretAnswer_lengthValidator = "maximum=100";
- public Class doFinish()
- {
- if (getUserBusinessInfoOnlineEmail() != null)
- {
+ private String userSecretQuestionSelection;
+
+ private List<Map<String, String>> userSecretQuestionSelectionItems;
+
+ private int userSecretQuestionSelectionIndex;
+
+ /**
+ * @return the userSecretQuestionSelection
+ */
+ public String getUserSecretQuestionSelection() {
+ return userSecretQuestionSelection;
+ }
+
+ /**
+ * @param userSecretQuestionSelection the userSecretQuestionSelection to set
+ */
+ public void setUserSecretQuestionSelection(
+ String userSecretQuestionSelection) {
+ this.userSecretQuestionSelection = userSecretQuestionSelection;
+ }
+
+ /**
+ * @return the userSecretQuestionSelectionItems
+ */
+ public List<Map<String, String>> getUserSecretQuestionSelectionItems() {
+ return userSecretQuestionSelectionItems;
+ }
+
+ /**
+ * @param userSecretQuestionSelectionItems the userSecretQuestionSelectionItems to set
+ */
+ public void setUserSecretQuestionSelectionItems(
+ List<Map<String, String>> userSecretQuestionSelectionItems) {
+ this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems;
+ }
+
+ /**
+ * @return the userSecretQuestionSelectionIndex
+ */
+ public int getUserSecretQuestionSelectionIndex() {
+ return userSecretQuestionSelectionIndex;
+ }
+
+ /**
+ * @param userSecretQuestionSelectionIndex the userSecretQuestionSelectionIndex to set
+ */
+ public void setUserSecretQuestionSelectionIndex(
+ int userSecretQuestionSelectionIndex) {
+ this.userSecretQuestionSelectionIndex = userSecretQuestionSelectionIndex;
+ }
+
+ public Class<?> doFinish() {
+ if (getUserBusinessInfoOnlineEmail() != null) {
setUserHomeInfoOnlineEmail(getUserBusinessInfoOnlineEmail());
}
- try
- {
+ if (userSecretQuestionSelection != null) {
+ setUserSecretQuestion(userSecretQuestionSelection);
+ }
+
+ try {
getUserRegistrationService().register(this);
- if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL))
- {
+ if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) {
FacesMessageUtil.addInfoMessage("success.check_your_email");
return PublicPortalRegistrationCompletedPage.class;
- }
- else
- {
+ } else {
FacesMessageUtil.addInfoMessage("success.login_above");
}
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0001", new Object[] { this.toString() }, e);
@@ -112,65 +163,66 @@
return null;
}
- public Class initialize()
- {
+ public Class<?> initialize() {
+ // Load Term Of Service
String filename = getLabelHelper().getLabelValue("termOfServiceFile");
- if (filename == null)
- {
+ if (filename == null) {
filename = "/WEB-INF/template/term_of_service.txt";
}
- String encoding = getLabelHelper().getLabelValue("termOfServiceEncoding");
- if (encoding == null)
- {
+ String encoding = getLabelHelper().getLabelValue(
+ "termOfServiceEncoding");
+ if (encoding == null) {
encoding = "UTF-8";
}
StringBuffer buf = new StringBuffer();
BufferedReader reader = null;
- try
- {
- reader = new BufferedReader(new InputStreamReader(new FileInputStream(PALAdminUtil.getContextRealPath(filename)),
- encoding));
+ try {
+ reader = new BufferedReader(new InputStreamReader(
+ new FileInputStream(PALAdminUtil
+ .getContextRealPath(filename)), encoding));
String line;
- while ((line = reader.readLine()) != null)
- {
+ while ((line = reader.readLine()) != null) {
buf.append(line).append("\n");
}
- }
- catch (UnsupportedEncodingException e)
- {
+ } catch (UnsupportedEncodingException e) {
FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
logger.log("EPA0004", new Object[] { this.toString() }, e);
- }
- catch (FileNotFoundException e)
- {
+ } catch (FileNotFoundException e) {
FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
logger.log("EPA0004", new Object[] { this.toString() }, e);
- }
- catch (IOException e)
- {
+ } catch (IOException e) {
FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
logger.log("EPA0004", new Object[] { this.toString() }, e);
- }
- finally
- {
- if (reader != null)
- {
- try
- {
+ } finally {
+ if (reader != null) {
+ try {
reader.close();
+ } catch (IOException e) {
}
- catch (IOException e)
- {
- }
}
}
setTermOfService(buf.toString());
+ // Load Secret Question
+ List<Map<String, String>> questionItems = new ArrayList<Map<String, String>>();
+ int numOfQuestions = Integer.parseInt(getLabelHelper().getLabelValue(
+ "secretQuestion.num"));
+ for (int i = 1; i <= numOfQuestions; i++) {
+ Map<String, String> map = new HashMap<String, String>(2);
+ String value = getLabelHelper()
+ .getLabelValue("secretQuestion." + i);
+ map.put("label", value);
+ map.put("value", value);
+ questionItems.add(map);
+ }
+ setUserSecretQuestionSelectionItems(questionItems);
+
return null;
}
- public Class prerender()
- {
+ public Class<?> prerender() {
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -2,14 +2,13 @@
import java.io.Serializable;
-import javax.faces.internal.FacesMessageUtil;
-
import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
import org.seasar.framework.log.Logger;
-public class PublicPortalRegistrationUpdatePage extends PublicPortalRegistrationPage implements Serializable
-{
+public class PublicPortalRegistrationUpdatePage extends
+ PublicPortalRegistrationPage implements Serializable {
/**
*
@@ -19,7 +18,8 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(PublicPortalRegistrationUpdatePage.class);
+ private static final Logger logger = Logger
+ .getLogger(PublicPortalRegistrationUpdatePage.class);
public static final String userName_TRequiredValidator = null;
@@ -75,37 +75,31 @@
public static final String userSecretAnswer_lengthValidator = "maximum=100";
- public Class doFinish()
- {
- try
- {
+ public Class<?> doFinish() {
+ try {
getUserRegistrationService().update(this);
FacesMessageUtil.addInfoMessage("updated.user.info");
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0001", new Object[] { this.toString() }, e);
}
return null;
}
- public Class initialize()
- {
+ public Class<?> initialize() {
return null;
}
- public Class prerender()
- {
- try
- {
+ public Class<?> prerender() {
+ try {
getUserRegistrationService().loadPage(this);
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0001", new Object[] { this.toString() }, e);
}
+
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -1,13 +1,14 @@
package jp.sf.pal.admin.web.registration;
-import javax.faces.internal.FacesMessageUtil;
+import java.io.Serializable;
import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
import org.seasar.framework.log.Logger;
public class PublicPortalSecretAnswerPage extends ForgottenPasswordPage
-{
+ implements Serializable {
/**
*
*/
@@ -16,96 +17,78 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(PublicPortalSecretAnswerPage.class);
+ private static final Logger logger = Logger
+ .getLogger(PublicPortalSecretAnswerPage.class);
private String userSecretAnswer;
private String userSecretQuestion;
- public String getUserSecretAnswer()
- {
+ public String getUserSecretAnswer() {
return userSecretAnswer;
}
- public void setUserSecretAnswer(String userSecretAnswer)
- {
+ public void setUserSecretAnswer(String userSecretAnswer) {
this.userSecretAnswer = userSecretAnswer;
}
- public String getUserSecretQuestion()
- {
+ public String getUserSecretQuestion() {
return userSecretQuestion;
}
- public void setUserSecretQuestion(String userSecretQuestion)
- {
+ public void setUserSecretQuestion(String userSecretQuestion) {
this.userSecretQuestion = userSecretQuestion;
}
- public Class doFinish()
- {
- try
- {
- if (getUserRegistrationService().checkSecretAnswer(this))
- {
- try
- {
+ public Class<?> doFinish() {
+ try {
+ if (getUserRegistrationService().checkSecretAnswer(this)) {
+ try {
getUserRegistrationService().sendNewPassword(this);
FacesMessageUtil.addInfoMessage("an_email_has_been_sent");
return PublicPortalForgottenPasswordCompletedPage.class;
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0002", new Object[] { this.toString() }, e);
}
- }
- else
- {
+ } else {
FacesMessageUtil.addInfoMessage("incorrect.scret.answer");
}
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0002", new Object[] { this.toString() }, e);
}
return null;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public Class prerender()
- {
+ public Class<?> prerender() {
super.prerender();
- if (getGuid() != null)
- {
+ if (getGuid() != null) {
return PublicPortalForgottenPasswordCompletedPage.class;
}
-
- if (getEmail() == null)
- {
+
+ if (getEmail() == null) {
return PublicPortalForgottenPasswordPage.class;
}
- try
- {
+ try {
getUserRegistrationService().setSecretQuestion(this);
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
logger.log("EPA0005", new Object[] { this.toString() }, e);
return PublicPortalForgottenPasswordPage.class;
}
+
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
- public String getDoNextValue()
- {
+ public String getDoNextValue() {
return getLabelHelper().getLabelValue("Next");
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -5,16 +5,15 @@
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.faces.internal.FacesMessageUtil;
import jp.sf.pal.admin.service.UserRegistrationService;
import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
import org.seasar.framework.log.Logger;
import org.seasar.teeda.extension.util.LabelHelper;
-public class ResetPasswordPage implements Serializable
-{
+public class ResetPasswordPage implements Serializable {
/**
*
*/
@@ -23,7 +22,8 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(ResetPasswordPage.class);
+ private static final Logger logger = Logger
+ .getLogger(ResetPasswordPage.class);
private String guid;
@@ -31,93 +31,82 @@
private UserRegistrationService userRegistrationService;
- public String getGuid()
- {
+ public String getGuid() {
return guid;
}
- public void setGuid(String guid)
- {
+ public void setGuid(String guid) {
this.guid = guid;
}
/**
* @return the labelHelper
*/
- public LabelHelper getLabelHelper()
- {
+ public LabelHelper getLabelHelper() {
return labelHelper;
}
/**
* @param labelHelper the labelHelper to set
*/
- public void setLabelHelper(LabelHelper labelHelper)
- {
+ public void setLabelHelper(LabelHelper labelHelper) {
this.labelHelper = labelHelper;
}
/**
* @return the userRegistrationService
*/
- public UserRegistrationService getUserRegistrationService()
- {
+ public UserRegistrationService getUserRegistrationService() {
return userRegistrationService;
}
/**
* @param userRegistrationService the userRegistrationService to set
*/
- public void setUserRegistrationService(UserRegistrationService userRegistrationService)
- {
+ public void setUserRegistrationService(
+ UserRegistrationService userRegistrationService) {
this.userRegistrationService = userRegistrationService;
}
- public Class doLogin()
- {
- ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
- try
- {
- externalContext.redirect(externalContext.getRequestContextPath()
- + "/login/proxy?org.apache.jetspeed.login.username=&org.apache.jetspeed.login.password=");
- }
- catch (IOException e)
- {
+ public Class<?> doLogin() {
+ ExternalContext externalContext = FacesContext.getCurrentInstance()
+ .getExternalContext();
+ try {
+ externalContext
+ .redirect(externalContext.getRequestContextPath()
+ + "/login/proxy?org.apache.jetspeed.login.username=&org.apache.jetspeed.login.password=");
+ } catch (IOException e) {
return ForgottenPasswordPage.class;
}
return null;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public Class prerender()
- {
- if (getGuid() != null)
- {
- try
- {
+ public Class<?> prerender() {
+ if (getGuid() != null) {
+ try {
getUserRegistrationService().updatePassword(this);
- FacesMessageUtil.addInfoMessage("forgotten.successful_pw_update");
- }
- catch (CommonException e)
- {
+ FacesMessageUtil
+ .addInfoMessage("forgotten.successful_pw_update");
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0003", new Object[] { this.toString() }, e);
}
}
+
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
- public String getDoLoginValue()
- {
+ public String getDoLoginValue() {
return getLabelHelper().getLabelValue("login");
}
- public String getGoForgottenPasswordValue()
- {
+ public String getGoForgottenPasswordValue() {
return getLabelHelper().getLabelValue("sendNewPassword");
}
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2007-07-19 06:54:48 UTC (rev 314)
@@ -3,20 +3,18 @@
import java.io.Serializable;
import javax.faces.context.FacesContext;
-import javax.faces.internal.FacesMessageUtil;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.service.UserRegistrationService;
import jp.sf.pal.admin.util.UserRegistrationUtil;
import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
import org.seasar.framework.log.Logger;
import org.seasar.teeda.extension.annotation.validator.Length;
import org.seasar.teeda.extension.annotation.validator.Required;
import org.seasar.teeda.extension.util.LabelHelper;
-public class UserRegistrationPage implements Serializable
-{
+public class UserRegistrationPage implements Serializable {
/**
*
@@ -26,7 +24,8 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(UserRegistrationPage.class);
+ private static final Logger logger = Logger
+ .getLogger(UserRegistrationPage.class);
private FacesContext facesContext;
@@ -255,807 +254,699 @@
/**
* @return the facesContext
*/
- public FacesContext getFacesContext()
- {
+ public FacesContext getFacesContext() {
return facesContext;
}
/**
* @param facesContext the facesContext to set
*/
- public void setFacesContext(FacesContext facesContext)
- {
+ public void setFacesContext(FacesContext facesContext) {
this.facesContext = facesContext;
}
/**
* @return the userRegistrationService
*/
- public UserRegistrationService getUserRegistrationService()
- {
+ public UserRegistrationService getUserRegistrationService() {
return userRegistrationService;
}
/**
* @param userRegistrationService the userRegistrationService to set
*/
- public void setUserRegistrationService(UserRegistrationService userRegistrationService)
- {
+ public void setUserRegistrationService(
+ UserRegistrationService userRegistrationService) {
this.userRegistrationService = userRegistrationService;
}
/**
* @return the labelHelper
*/
- public LabelHelper getLabelHelper()
- {
+ public LabelHelper getLabelHelper() {
return labelHelper;
}
/**
* @param labelHelper the labelHelper to set
*/
- public void setLabelHelper(LabelHelper labelHelper)
- {
+ public void setLabelHelper(LabelHelper labelHelper) {
this.labelHelper = labelHelper;
}
- public String getPassword()
- {
+ public String getPassword() {
return password;
}
- public void setPassword(String password)
- {
+ public void setPassword(String password) {
this.password = password;
}
- public String getUserBdate()
- {
+ public String getUserBdate() {
return userBdate;
}
- public void setUserBdate(String userBdate)
- {
+ public void setUserBdate(String userBdate) {
this.userBdate = userBdate;
}
- public String getUserBusinessInfoOnlineEmail()
- {
+ public String getUserBusinessInfoOnlineEmail() {
return userBusinessInfoOnlineEmail;
}
- public void setUserBusinessInfoOnlineEmail(String userBusinessInfoOnlineEmail)
- {
+ public void setUserBusinessInfoOnlineEmail(
+ String userBusinessInfoOnlineEmail) {
this.userBusinessInfoOnlineEmail = userBusinessInfoOnlineEmail;
}
- public String getUserBusinessInfoOnlineUri()
- {
+ public String getUserBusinessInfoOnlineUri() {
return userBusinessInfoOnlineUri;
}
- public void setUserBusinessInfoOnlineUri(String userBusinessInfoOnlineUri)
- {
+ public void setUserBusinessInfoOnlineUri(String userBusinessInfoOnlineUri) {
this.userBusinessInfoOnlineUri = userBusinessInfoOnlineUri;
}
- public String getUserBusinessInfoPostalCity()
- {
+ public String getUserBusinessInfoPostalCity() {
return userBusinessInfoPostalCity;
}
- public void setUserBusinessInfoPostalCity(String userBusinessInfoPostalCity)
- {
+ public void setUserBusinessInfoPostalCity(String userBusinessInfoPostalCity) {
this.userBusinessInfoPostalCity = userBusinessInfoPostalCity;
}
- public String getUserBusinessInfoPostalCountry()
- {
+ public String getUserBusinessInfoPostalCountry() {
return userBusinessInfoPostalCountry;
}
- public void setUserBusinessInfoPostalCountry(String userBusinessInfoPostalCountry)
- {
+ public void setUserBusinessInfoPostalCountry(
+ String userBusinessInfoPostalCountry) {
this.userBusinessInfoPostalCountry = userBusinessInfoPostalCountry;
}
- public String getUserBusinessInfoPostalName()
- {
+ public String getUserBusinessInfoPostalName() {
return userBusinessInfoPostalName;
}
- public void setUserBusinessInfoPostalName(String userBusinessInfoPostalName)
- {
+ public void setUserBusinessInfoPostalName(String userBusinessInfoPostalName) {
this.userBusinessInfoPostalName = userBusinessInfoPostalName;
}
- public String getUserBusinessInfoPostalOrganization()
- {
+ public String getUserBusinessInfoPostalOrganization() {
return userBusinessInfoPostalOrganization;
}
- public void setUserBusinessInfoPostalOrganization(String userBusinessInfoPostalOrganization)
- {
+ public void setUserBusinessInfoPostalOrganization(
+ String userBusinessInfoPostalOrganization) {
this.userBusinessInfoPostalOrganization = userBusinessInfoPostalOrganization;
}
- public String getUserBusinessInfoPostalPostalcode()
- {
+ public String getUserBusinessInfoPostalPostalcode() {
return userBusinessInfoPostalPostalcode;
}
- public void setUserBusinessInfoPostalPostalcode(String userBusinessInfoPostalPostalcode)
- {
+ public void setUserBusinessInfoPostalPostalcode(
+ String userBusinessInfoPostalPostalcode) {
this.userBusinessInfoPostalPostalcode = userBusinessInfoPostalPostalcode;
}
- public String getUserBusinessInfoPostalStateprov()
- {
+ public String getUserBusinessInfoPostalStateprov() {
return userBusinessInfoPostalStateprov;
}
- public void setUserBusinessInfoPostalStateprov(String userBusinessInfoPostalStateprov)
- {
+ public void setUserBusinessInfoPostalStateprov(
+ String userBusinessInfoPostalStateprov) {
this.userBusinessInfoPostalStateprov = userBusinessInfoPostalStateprov;
}
- public String getUserBusinessInfoPostalStreet()
- {
+ public String getUserBusinessInfoPostalStreet() {
return userBusinessInfoPostalStreet;
}
- public void setUserBusinessInfoPostalStreet(String userBusinessInfoPostalStreet)
- {
+ public void setUserBusinessInfoPostalStreet(
+ String userBusinessInfoPostalStreet) {
this.userBusinessInfoPostalStreet = userBusinessInfoPostalStreet;
}
- public String getUserBusinessInfoTelecomFaxComment()
- {
+ public String getUserBusinessInfoTelecomFaxComment() {
return userBusinessInfoTelecomFaxComment;
}
- public void setUserBusinessInfoTelecomFaxComment(String userBusinessInfoTelecomFaxComment)
- {
+ public void setUserBusinessInfoTelecomFaxComment(
+ String userBusinessInfoTelecomFaxComment) {
this.userBusinessInfoTelecomFaxComment = userBusinessInfoTelecomFaxComment;
}
- public String getUserBusinessInfoTelecomFaxExt()
- {
+ public String getUserBusinessInfoTelecomFaxExt() {
return userBusinessInfoTelecomFaxExt;
}
- public void setUserBusinessInfoTelecomFaxExt(String userBusinessInfoTelecomFaxExt)
- {
+ public void setUserBusinessInfoTelecomFaxExt(
+ String userBusinessInfoTelecomFaxExt) {
this.userBusinessInfoTelecomFaxExt = userBusinessInfoTelecomFaxExt;
}
- public String getUserBusinessInfoTelecomFaxIntcode()
- {
+ public String getUserBusinessInfoTelecomFaxIntcode() {
return userBusinessInfoTelecomFaxIntcode;
}
- public void setUserBusinessInfoTelecomFaxIntcode(String userBusinessInfoTelecomFaxIntcode)
- {
+ public void setUserBusinessInfoTelecomFaxIntcode(
+ String userBusinessInfoTelecomFaxIntcode) {
this.userBusinessInfoTelecomFaxIntcode = userBusinessInfoTelecomFaxIntcode;
}
- public String getUserBusinessInfoTelecomFaxLoccode()
- {
+ public String getUserBusinessInfoTelecomFaxLoccode() {
return userBusinessInfoTelecomFaxLoccode;
}
- public void setUserBusinessInfoTelecomFaxLoccode(String userBusinessInfoTelecomFaxLoccode)
- {
+ public void setUserBusinessInfoTelecomFaxLoccode(
+ String userBusinessInfoTelecomFaxLoccode) {
this.userBusinessInfoTelecomFaxLoccode = userBusinessInfoTelecomFaxLoccode;
}
- public String getUserBusinessInfoTelecomFaxNumber()
- {
+ public String getUserBusinessInfoTelecomFaxNumber() {
return userBusinessInfoTelecomFaxNumber;
}
- public void setUserBusinessInfoTelecomFaxNumber(String userBusinessInfoTelecomFaxNumber)
- {
+ public void setUserBusinessInfoTelecomFaxNumber(
+ String userBusinessInfoTelecomFaxNumber) {
this.userBusinessInfoTelecomFaxNumber = userBusinessInfoTelecomFaxNumber;
}
- public String getUserBusinessInfoTelecomMobileComment()
- {
+ public String getUserBusinessInfoTelecomMobileComment() {
return userBusinessInfoTelecomMobileComment;
}
- public void setUserBusinessInfoTelecomMobileComment(String userBusinessInfoTelecomMobileComment)
- {
+ public void setUserBusinessInfoTelecomMobileComment(
+ String userBusinessInfoTelecomMobileComment) {
this.userBusinessInfoTelecomMobileComment = userBusinessInfoTelecomMobileComment;
}
- public String getUserBusinessInfoTelecomMobileExt()
- {
+ public String getUserBusinessInfoTelecomMobileExt() {
return userBusinessInfoTelecomMobileExt;
}
- public void setUserBusinessInfoTelecomMobileExt(String userBusinessInfoTelecomMobileExt)
- {
+ public void setUserBusinessInfoTelecomMobileExt(
+ String userBusinessInfoTelecomMobileExt) {
this.userBusinessInfoTelecomMobileExt = userBusinessInfoTelecomMobileExt;
}
- public String getUserBusinessInfoTelecomMobileIntcode()
- {
+ public String getUserBusinessInfoTelecomMobileIntcode() {
return userBusinessInfoTelecomMobileIntcode;
}
- public void setUserBusinessInfoTelecomMobileIntcode(String userBusinessInfoTelecomMobileIntcode)
- {
+ public void setUserBusinessInfoTelecomMobileIntcode(
+ String userBusinessInfoTelecomMobileIntcode) {
this.userBusinessInfoTelecomMobileIntcode = userBusinessInfoTelecomMobileIntcode;
}
- public String getUserBusinessInfoTelecomMobileLoccode()
- {
+ public String getUserBusinessInfoTelecomMobileLoccode() {
return userBusinessInfoTelecomMobileLoccode;
}
- public void setUserBusinessInfoTelecomMobileLoccode(String userBusinessInfoTelecomMobileLoccode)
- {
+ public void setUserBusinessInfoTelecomMobileLoccode(
+ String userBusinessInfoTelecomMobileLoccode) {
this.userBusinessInfoTelecomMobileLoccode = userBusinessInfoTelecomMobileLoccode;
}
- public String getUserBusinessInfoTelecomMobileNumber()
- {
+ public String getUserBusinessInfoTelecomMobileNumber() {
return userBusinessInfoTelecomMobileNumber;
}
- public void setUserBusinessInfoTelecomMobileNumber(String userBusinessInfoTelecomMobileNumber)
- {
+ public void setUserBusinessInfoTelecomMobileNumber(
+ String userBusinessInfoTelecomMobileNumber) {
this.userBusinessInfoTelecomMobileNumber = userBusinessInfoTelecomMobileNumber;
}
- public String getUserBusinessInfoTelecomPagerComment()
- {
+ public String getUserBusinessInfoTelecomPagerComment() {
return userBusinessInfoTelecomPagerComment;
}
- public void setUserBusinessInfoTelecomPagerComment(String userBusinessInfoTelecomPagerComment)
- {
+ public void setUserBusinessInfoTelecomPagerComment(
+ String userBusinessInfoTelecomPagerComment) {
this.userBusinessInfoTelecomPagerComment = userBusinessInfoTelecomPagerComment;
}
- public String getUserBusinessInfoTelecomPagerExt()
- {
+ public String getUserBusinessInfoTelecomPagerExt() {
return userBusinessInfoTelecomPagerExt;
}
- public void setUserBusinessInfoTelecomPagerExt(String userBusinessInfoTelecomPagerExt)
- {
+ public void setUserBusinessInfoTelecomPagerExt(
+ String userBusinessInfoTelecomPagerExt) {
this.userBusinessInfoTelecomPagerExt = userBusinessInfoTelecomPagerExt;
}
- public String getUserBusinessInfoTelecomPagerIntcode()
- {
+ public String getUserBusinessInfoTelecomPagerIntcode() {
return userBusinessInfoTelecomPagerIntcode;
}
- public void setUserBusinessInfoTelecomPagerIntcode(String userBusinessInfoTelecomPagerIntcode)
- {
+ public void setUserBusinessInfoTelecomPagerIntcode(
+ String userBusinessInfoTelecomPagerIntcode) {
this.userBusinessInfoTelecomPagerIntcode = userBusinessInfoTelecomPagerIntcode;
}
- public String getUserBusinessInfoTelecomPagerLoccode()
- {
+ public String getUserBusinessInfoTelecomPagerLoccode() {
return userBusinessInfoTelecomPagerLoccode;
}
- public void setUserBusinessInfoTelecomPagerLoccode(String userBusinessInfoTelecomPagerLoccode)
- {
+ public void setUserBusinessInfoTelecomPagerLoccode(
+ String userBusinessInfoTelecomPagerLoccode) {
this.userBusinessInfoTelecomPagerLoccode = userBusinessInfoTelecomPagerLoccode;
}
- public String getUserBusinessInfoTelecomPagerNumber()
- {
+ public String getUserBusinessInfoTelecomPagerNumber() {
return userBusinessInfoTelecomPagerNumber;
}
- public void setUserBusinessInfoTelecomPagerNumber(String userBusinessInfoTelecomPagerNumber)
- {
+ public void setUserBusinessInfoTelecomPagerNumber(
+ String userBusinessInfoTelecomPagerNumber) {
this.userBusinessInfoTelecomPagerNumber = userBusinessInfoTelecomPagerNumber;
}
- public String getUserBusinessInfoTelecomTelephoneComment()
- {
+ public String getUserBusinessInfoTelecomTelephoneComment() {
return userBusinessInfoTelecomTelephoneComment;
}
- public void setUserBusinessInfoTelecomTelephoneComment(String userBusinessInfoTelecomTelephoneComment)
- {
+ public void setUserBusinessInfoTelecomTelephoneComment(
+ String userBusinessInfoTelecomTelephoneComment) {
this.userBusinessInfoTelecomTelephoneComment = userBusinessInfoTelecomTelephoneComment;
}
- public String getUserBusinessInfoTelecomTelephoneExt()
- {
+ public String getUserBusinessInfoTelecomTelephoneExt() {
return userBusinessInfoTelecomTelephoneExt;
}
- public void setUserBusinessInfoTelecomTelephoneExt(String userBusinessInfoTelecomTelephoneExt)
- {
+ public void setUserBusinessInfoTelecomTelephoneExt(
+ String userBusinessInfoTelecomTelephoneExt) {
this.userBusinessInfoTelecomTelephoneExt = userBusinessInfoTelecomTelephoneExt;
}
- public String getUserBusinessInfoTelecomTelephoneIntcode()
- {
+ public String getUserBusinessInfoTelecomTelephoneIntcode() {
return userBusinessInfoTelecomTelephoneIntcode;
}
- public void setUserBusinessInfoTelecomTelephoneIntcode(String userBusinessInfoTelecomTelephoneIntcode)
- {
+ public void setUserBusinessInfoTelecomTelephoneIntcode(
+ String userBusinessInfoTelecomTelephoneIntcode) {
this.userBusinessInfoTelecomTelephoneIntcode = userBusinessInfoTelecomTelephoneIntcode;
}
- public String getUserBusinessInfoTelecomTelephoneLoccode()
- {
+ public String getUserBusinessInfoTelecomTelephoneLoccode() {
return userBusinessInfoTelecomTelephoneLoccode;
}
- public void setUserBusinessInfoTelecomTelephoneLoccode(String userBusinessInfoTelecomTelephoneLoccode)
- {
+ public void setUserBusinessInfoTelecomTelephoneLoccode(
+ String userBusinessInfoTelecomTelephoneLoccode) {
this.userBusinessInfoTelecomTelephoneLoccode = userBusinessInfoTelecomTelephoneLoccode;
}
- public String getUserBusinessInfoTelecomTelephoneNumber()
- {
+ public String getUserBusinessInfoTelecomTelephoneNumber() {
return userBusinessInfoTelecomTelephoneNumber;
}
- public void setUserBusinessInfoTelecomTelephoneNumber(String userBusinessInfoTelecomTelephoneNumber)
- {
+ public void setUserBusinessInfoTelecomTelephoneNumber(
+ String userBusinessInfoTelecomTelephoneNumber) {
this.userBusinessInfoTelecomTelephoneNumber = userBusinessInfoTelecomTelephoneNumber;
}
- public String getUserDepartment()
- {
+ public String getUserDepartment() {
return userDepartment;
}
- public void setUserDepartment(String userDepartment)
- {
+ public void setUserDepartment(String userDepartment) {
this.userDepartment = userDepartment;
}
- public String getUserEmployer()
- {
+ public String getUserEmployer() {
return userEmployer;
}
- public void setUserEmployer(String userEmployer)
- {
+ public void setUserEmployer(String userEmployer) {
this.userEmployer = userEmployer;
}
- public String getUserGender()
- {
+ public String getUserGender() {
return userGender;
}
- public void setUserGender(String userGender)
- {
+ public void setUserGender(String userGender) {
this.userGender = userGender;
}
- public String getUserHomeInfoOnlineEmail()
- {
+ public String getUserHomeInfoOnlineEmail() {
return userHomeInfoOnlineEmail;
}
- public void setUserHomeInfoOnlineEmail(String userHomeInfoOnlineEmail)
- {
+ public void setUserHomeInfoOnlineEmail(String userHomeInfoOnlineEmail) {
this.userHomeInfoOnlineEmail = userHomeInfoOnlineEmail;
}
- public String getUserHomeInfoOnlineUri()
- {
+ public String getUserHomeInfoOnlineUri() {
return userHomeInfoOnlineUri;
}
- public void setUserHomeInfoOnlineUri(String userHomeInfoOnlineUri)
- {
+ public void setUserHomeInfoOnlineUri(String userHomeInfoOnlineUri) {
this.userHomeInfoOnlineUri = userHomeInfoOnlineUri;
}
- public String getUserHomeInfoPostalCity()
- {
+ public String getUserHomeInfoPostalCity() {
return userHomeInfoPostalCity;
}
- public void setUserHomeInfoPostalCity(String userHomeInfoPostalCity)
- {
+ public void setUserHomeInfoPostalCity(String userHomeInfoPostalCity) {
this.userHomeInfoPostalCity = userHomeInfoPostalCity;
}
- public String getUserHomeInfoPostalCountry()
- {
+ public String getUserHomeInfoPostalCountry() {
return userHomeInfoPostalCountry;
}
- public void setUserHomeInfoPostalCountry(String userHomeInfoPostalCountry)
- {
+ public void setUserHomeInfoPostalCountry(String userHomeInfoPostalCountry) {
this.userHomeInfoPostalCountry = userHomeInfoPostalCountry;
}
- public String getUserHomeInfoPostalName()
- {
+ public String getUserHomeInfoPostalName() {
return userHomeInfoPostalName;
}
- public void setUserHomeInfoPostalName(String userHomeInfoPostalName)
- {
+ public void setUserHomeInfoPostalName(String userHomeInfoPostalName) {
this.userHomeInfoPostalName = userHomeInfoPostalName;
}
- public String getUserHomeInfoPostalOrganization()
- {
+ public String getUserHomeInfoPostalOrganization() {
return userHomeInfoPostalOrganization;
}
- public void setUserHomeInfoPostalOrganization(String userHomeInfoPostalOrganization)
- {
+ public void setUserHomeInfoPostalOrganization(
+ String userHomeInfoPostalOrganization) {
this.userHomeInfoPostalOrganization = userHomeInfoPostalOrganization;
}
- public String getUserHomeInfoPostalPostalcode()
- {
+ public String getUserHomeInfoPostalPostalcode() {
return userHomeInfoPostalPostalcode;
}
- public void setUserHomeInfoPostalPostalcode(String userHomeInfoPostalPostalcode)
- {
+ public void setUserHomeInfoPostalPostalcode(
+ String userHomeInfoPostalPostalcode) {
this.userHomeInfoPostalPostalcode = userHomeInfoPostalPostalcode;
}
- public String getUserHomeInfoPostalStateprov()
- {
+ public String getUserHomeInfoPostalStateprov() {
return userHomeInfoPostalStateprov;
}
- public void setUserHomeInfoPostalStateprov(String userHomeInfoPostalStateprov)
- {
+ public void setUserHomeInfoPostalStateprov(
+ String userHomeInfoPostalStateprov) {
this.userHomeInfoPostalStateprov = userHomeInfoPostalStateprov;
}
- public String getUserHomeInfoPostalStreet()
- {
+ public String getUserHomeInfoPostalStreet() {
return userHomeInfoPostalStreet;
}
- public void setUserHomeInfoPostalStreet(String userHomeInfoPostalStreet)
- {
+ public void setUserHomeInfoPostalStreet(String userHomeInfoPostalStreet) {
this.userHomeInfoPostalStreet = userHomeInfoPostalStreet;
}
- public String getUserHomeInfoTelecomFaxComment()
- {
+ public String getUserHomeInfoTelecomFaxComment() {
return userHomeInfoTelecomFaxComment;
}
- public void setUserHomeInfoTelecomFaxComment(String userHomeInfoTelecomFaxComment)
- {
+ public void setUserHomeInfoTelecomFaxComment(
+ String userHomeInfoTelecomFaxComment) {
this.userHomeInfoTelecomFaxComment = userHomeInfoTelecomFaxComment;
}
- public String getUserHomeInfoTelecomFaxExt()
- {
+ public String getUserHomeInfoTelecomFaxExt() {
return userHomeInfoTelecomFaxExt;
}
- public void setUserHomeInfoTelecomFaxExt(String userHomeInfoTelecomFaxExt)
- {
+ public void setUserHomeInfoTelecomFaxExt(String userHomeInfoTelecomFaxExt) {
this.userHomeInfoTelecomFaxExt = userHomeInfoTelecomFaxExt;
}
- public String getUserHomeInfoTelecomFaxIntcode()
- {
+ public String getUserHomeInfoTelecomFaxIntcode() {
return userHomeInfoTelecomFaxIntcode;
}
- public void setUserHomeInfoTelecomFaxIntcode(String userHomeInfoTelecomFaxIntcode)
- {
+ public void setUserHomeInfoTelecomFaxIntcode(
+ String userHomeInfoTelecomFaxIntcode) {
this.userHomeInfoTelecomFaxIntcode = userHomeInfoTelecomFaxIntcode;
}
- public String getUserHomeInfoTelecomFaxLoccode()
- {
+ public String getUserHomeInfoTelecomFaxLoccode() {
return userHomeInfoTelecomFaxLoccode;
}
- public void setUserHomeInfoTelecomFaxLoccode(String userHomeInfoTelecomFaxLoccode)
- {
+ public void setUserHomeInfoTelecomFaxLoccode(
+ String userHomeInfoTelecomFaxLoccode) {
this.userHomeInfoTelecomFaxLoccode = userHomeInfoTelecomFaxLoccode;
}
- public String getUserHomeInfoTelecomFaxNumber()
- {
+ public String getUserHomeInfoTelecomFaxNumber() {
return userHomeInfoTelecomFaxNumber;
}
- public void setUserHomeInfoTelecomFaxNumber(String userHomeInfoTelecomFaxNumber)
- {
+ public void setUserHomeInfoTelecomFaxNumber(
+ String userHomeInfoTelecomFaxNumber) {
this.userHomeInfoTelecomFaxNumber = userHomeInfoTelecomFaxNumber;
}
- public String getUserHomeInfoTelecomMobileComment()
- {
+ public String getUserHomeInfoTelecomMobileComment() {
return userHomeInfoTelecomMobileComment;
}
- public void setUserHomeInfoTelecomMobileComment(String userHomeInfoTelecomMobileComment)
- {
+ public void setUserHomeInfoTelecomMobileComment(
+ String userHomeInfoTelecomMobileComment) {
this.userHomeInfoTelecomMobileComment = userHomeInfoTelecomMobileComment;
}
- public String getUserHomeInfoTelecomMobileExt()
- {
+ public String getUserHomeInfoTelecomMobileExt() {
return userHomeInfoTelecomMobileExt;
}
- public void setUserHomeInfoTelecomMobileExt(String userHomeInfoTelecomMobileExt)
- {
+ public void setUserHomeInfoTelecomMobileExt(
+ String userHomeInfoTelecomMobileExt) {
this.userHomeInfoTelecomMobileExt = userHomeInfoTelecomMobileExt;
}
- public String getUserHomeInfoTelecomMobileIntcode()
- {
+ public String getUserHomeInfoTelecomMobileIntcode() {
return userHomeInfoTelecomMobileIntcode;
}
- public void setUserHomeInfoTelecomMobileIntcode(String userHomeInfoTelecomMobileIntcode)
- {
+ public void setUserHomeInfoTelecomMobileIntcode(
+ String userHomeInfoTelecomMobileIntcode) {
this.userHomeInfoTelecomMobileIntcode = userHomeInfoTelecomMobileIntcode;
}
- public String getUserHomeInfoTelecomMobileLoccode()
- {
+ public String getUserHomeInfoTelecomMobileLoccode() {
return userHomeInfoTelecomMobileLoccode;
}
- public void setUserHomeInfoTelecomMobileLoccode(String userHomeInfoTelecomMobileLoccode)
- {
+ public void setUserHomeInfoTelecomMobileLoccode(
+ String userHomeInfoTelecomMobileLoccode) {
this.userHomeInfoTelecomMobileLoccode = userHomeInfoTelecomMobileLoccode;
}
- public String getUserHomeInfoTelecomMobileNumber()
- {
+ public String getUserHomeInfoTelecomMobileNumber() {
return userHomeInfoTelecomMobileNumber;
}
- public void setUserHomeInfoTelecomMobileNumber(String userHomeInfoTelecomMobileNumber)
- {
+ public void setUserHomeInfoTelecomMobileNumber(
+ String userHomeInfoTelecomMobileNumber) {
this.userHomeInfoTelecomMobileNumber = userHomeInfoTelecomMobileNumber;
}
- public String getUserHomeInfoTelecomPagerComment()
- {
+ public String getUserHomeInfoTelecomPagerComment() {
return userHomeInfoTelecomPagerComment;
}
- public void setUserHomeInfoTelecomPagerComment(String userHomeInfoTelecomPagerComment)
- {
+ public void setUserHomeInfoTelecomPagerComment(
+ String userHomeInfoTelecomPagerComment) {
this.userHomeInfoTelecomPagerComment = userHomeInfoTelecomPagerComment;
}
- public String getUserHomeInfoTelecomPagerExt()
- {
+ public String getUserHomeInfoTelecomPagerExt() {
return userHomeInfoTelecomPagerExt;
}
- public void setUserHomeInfoTelecomPagerExt(String userHomeInfoTelecomPagerExt)
- {
+ public void setUserHomeInfoTelecomPagerExt(
+ String userHomeInfoTelecomPagerExt) {
this.userHomeInfoTelecomPagerExt = userHomeInfoTelecomPagerExt;
}
- public String getUserHomeInfoTelecomPagerIntcode()
- {
+ public String getUserHomeInfoTelecomPagerIntcode() {
return userHomeInfoTelecomPagerIntcode;
}
- public void setUserHomeInfoTelecomPagerIntcode(String userHomeInfoTelecomPagerIntcode)
- {
+ public void setUserHomeInfoTelecomPagerIntcode(
+ String userHomeInfoTelecomPagerIntcode) {
this.userHomeInfoTelecomPagerIntcode = userHomeInfoTelecomPagerIntcode;
}
- public String getUserHomeInfoTelecomPagerLoccode()
- {
+ public String getUserHomeInfoTelecomPagerLoccode() {
return userHomeInfoTelecomPagerLoccode;
}
- public void setUserHomeInfoTelecomPagerLoccode(String userHomeInfoTelecomPagerLoccode)
- {
+ public void setUserHomeInfoTelecomPagerLoccode(
+ String userHomeInfoTelecomPagerLoccode) {
this.userHomeInfoTelecomPagerLoccode = userHomeInfoTelecomPagerLoccode;
}
- public String getUserHomeInfoTelecomPagerNumber()
- {
+ public String getUserHomeInfoTelecomPagerNumber() {
return userHomeInfoTelecomPagerNumber;
}
- public void setUserHomeInfoTelecomPagerNumber(String userHomeInfoTelecomPagerNumber)
- {
+ public void setUserHomeInfoTelecomPagerNumber(
+ String userHomeInfoTelecomPagerNumber) {
this.userHomeInfoTelecomPagerNumber = userHomeInfoTelecomPagerNumber;
}
- public String getUserHomeInfoTelecomTelephoneComment()
- {
+ public String getUserHomeInfoTelecomTelephoneComment() {
return userHomeInfoTelecomTelephoneComment;
}
- public void setUserHomeInfoTelecomTelephoneComment(String userHomeInfoTelecomTelephoneComment)
- {
+ public void setUserHomeInfoTelecomTelephoneComment(
+ String userHomeInfoTelecomTelephoneComment) {
this.userHomeInfoTelecomTelephoneComment = userHomeInfoTelecomTelephoneComment;
}
- public String getUserHomeInfoTelecomTelephoneExt()
- {
+ public String getUserHomeInfoTelecomTelephoneExt() {
return userHomeInfoTelecomTelephoneExt;
}
- public void setUserHomeInfoTelecomTelephoneExt(String userHomeInfoTelecomTelephoneExt)
- {
+ public void setUserHomeInfoTelecomTelephoneExt(
+ String userHomeInfoTelecomTelephoneExt) {
this.userHomeInfoTelecomTelephoneExt = userHomeInfoTelecomTelephoneExt;
}
- public String getUserHomeInfoTelecomTelephoneIntcode()
- {
+ public String getUserHomeInfoTelecomTelephoneIntcode() {
return userHomeInfoTelecomTelephoneIntcode;
}
- public void setUserHomeInfoTelecomTelephoneIntcode(String userHomeInfoTelecomTelephoneIntcode)
- {
+ public void setUserHomeInfoTelecomTelephoneIntcode(
+ String userHomeInfoTelecomTelephoneIntcode) {
this.userHomeInfoTelecomTelephoneIntcode = userHomeInfoTelecomTelephoneIntcode;
}
- public String getUserHomeInfoTelecomTelephoneLoccode()
- {
+ public String getUserHomeInfoTelecomTelephoneLoccode() {
return userHomeInfoTelecomTelephoneLoccode;
}
- public void setUserHomeInfoTelecomTelephoneLoccode(String userHomeInfoTelecomTelephoneLoccode)
- {
+ public void setUserHomeInfoTelecomTelephoneLoccode(
+ String userHomeInfoTelecomTelephoneLoccode) {
this.userHomeInfoTelecomTelephoneLoccode = userHomeInfoTelecomTelephoneLoccode;
}
- public String getUserHomeInfoTelecomTelephoneNumber()
- {
+ public String getUserHomeInfoTelecomTelephoneNumber() {
return userHomeInfoTelecomTelephoneNumber;
}
- public void setUserHomeInfoTelecomTelephoneNumber(String userHomeInfoTelecomTelephoneNumber)
- {
+ public void setUserHomeInfoTelecomTelephoneNumber(
+ String userHomeInfoTelecomTelephoneNumber) {
this.userHomeInfoTelecomTelephoneNumber = userHomeInfoTelecomTelephoneNumber;
}
- public String getUserJobtitle()
- {
+ public String getUserJobtitle() {
return userJobtitle;
}
- public void setUserJobtitle(String userJobtitle)
- {
+ public void setUserJobtitle(String userJobtitle) {
this.userJobtitle = userJobtitle;
}
- public String getUserName()
- {
+ public String getUserName() {
return userName;
}
- public void setUserName(String userName)
- {
+ public void setUserName(String userName) {
this.userName = userName;
}
- public String getUserNameFamily()
- {
+ public String getUserNameFamily() {
return userNameFamily;
}
- public void setUserNameFamily(String userNameFamily)
- {
+ public void setUserNameFamily(String userNameFamily) {
this.userNameFamily = userNameFamily;
}
- public String getUserNameGiven()
- {
+ public String getUserNameGiven() {
return userNameGiven;
}
- public void setUserNameGiven(String userNameGiven)
- {
+ public void setUserNameGiven(String userNameGiven) {
this.userNameGiven = userNameGiven;
}
- public String getUserNameMiddle()
- {
+ public String getUserNameMiddle() {
return userNameMiddle;
}
- public void setUserNameMiddle(String userNameMiddle)
- {
+ public void setUserNameMiddle(String userNameMiddle) {
this.userNameMiddle = userNameMiddle;
}
- public String getUserNameNickName()
- {
+ public String getUserNameNickName() {
return userNameNickName;
}
- public void setUserNameNickName(String userNameNickName)
- {
+ public void setUserNameNickName(String userNameNickName) {
this.userNameNickName = userNameNickName;
}
- public String getUserNamePrefix()
- {
+ public String getUserNamePrefix() {
return userNamePrefix;
}
- public void setUserNamePrefix(String userNamePrefix)
- {
+ public void setUserNamePrefix(String userNamePrefix) {
this.userNamePrefix = userNamePrefix;
}
- public String getUserNameSuffix()
- {
+ public String getUserNameSuffix() {
return userNameSuffix;
}
- public void setUserNameSuffix(String userNameSuffix)
- {
+ public void setUserNameSuffix(String userNameSuffix) {
this.userNameSuffix = userNameSuffix;
}
- public String getVerifyPassword()
- {
+ public String getVerifyPassword() {
return verifyPassword;
}
- public void setVerifyPassword(String verifyPassword)
- {
+ public void setVerifyPassword(String verifyPassword) {
this.verifyPassword = verifyPassword;
}
- public Class initialize()
- {
+ public Class<?> initialize() {
return null;
}
- public Class prerender()
- {
+ public Class<?> prerender() {
+ // render FacesMessage
+ FacesMessageUtil.renderMessages();
return null;
}
- public Class doFinish()
- {
- try
- {
+ public Class<?> doFinish() {
+ try {
getUserRegistrationService().register(this);
- if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL))
- {
+ if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) {
FacesMessageUtil.addInfoMessage("success.check_your_email");
- }
- else
- {
+ } else {
FacesMessageUtil.addInfoMessage("success.login_above");
}
return UserRegistrationPage.class;
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0001", new Object[] { this.toString() }, e);
}
+
return null;
}
- public String getDoFinishValue()
- {
+ public String getDoFinishValue() {
return getLabelHelper().getLabelValue("SignUp");
}
}
Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties 2007-07-19 06:54:48 UTC (rev 314)
@@ -157,6 +157,8 @@
publicPortalRegistrationRegister.nameYomi=\u6c0f\u540d(\u3075\u308a\u304c\u306a)
publicPortalRegistrationRegister.userNameFamilyYomi= (\u59d3)
publicPortalRegistrationRegister.userNameGivenYomi= (\u540d)
+publicPortalRegistrationRegister.otherUserSecretQuestion=\u4e0a\u8a18\u4ee5\u5916\u306e\u8cea\u554f\u3092\u767b\u9332\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002
+
publicPortalRegistrationCompleted.registAgain=\u518d\u5ea6\u3001\u30e6\u30fc\u30b6\u30fc\u3092\u767b\u9332\u3059\u308b\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
publicPortalRegistrationCompleted.registLink=\u30e6\u30fc\u30b6\u30fc\u767b\u9332
@@ -252,3 +254,12 @@
publicPortalRegistrationUpdate.userPasswordHint=\u30d1\u30b9\u30ef\u30fc\u30c9\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8
publicPortalRegistrationUpdate.charAvailable=\u6587\u5b57\u306f\u534a\u89d2\u82f1\u6570\u5b57\u304c\u5229\u7528\u53ef\u80fd\u3067\u3059
+secretQuestion.num=8
+secretQuestion.1=\u30da\u30c3\u30c8\u3068\u3044\u3048\u3070\uff1f
+secretQuestion.2=\u65c5\u884c\u3068\u3044\u3048\u3070\uff1f
+secretQuestion.3=\u30d2\u30fc\u30ed\u30fc\u3068\u3044\u3048\u3070\uff1f
+secretQuestion.4=\u98df\u3079\u7269\u3068\u3044\u3048\u3070\uff1f
+secretQuestion.5=\u30c1\u30fc\u30e0\u3068\u3044\u3048\u3070\uff1f
+secretQuestion.6=\u5b66\u6821\u3068\u3044\u3048\u3070\uff1f
+secretQuestion.7=\u6620\u753b\u3068\u3044\u3048\u3070\uff1f
+secretQuestion.8=\u8a18\u5ff5\u65e5\u3068\u3044\u3048\u3070\uff1f
Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html 2007-07-19 06:54:48 UTC (rev 314)
@@ -14,7 +14,7 @@
<div class="portlet-form-label">
<label id="pageMessageLabel" class="portlet-form-label"></label>
</div>
- <div style="text-align:center;">
+ <div style="text-align:center;margin-top: 10px;">
<label id="emailLabel" for="email" class="portlet-form-label">email</label>:
<input id="email" type="text" class="portlet-form-input-field" size="24" />
</div>
Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html 2007-07-19 02:53:49 UTC (rev 313)
+++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html 2007-07-19 06:54:48 UTC (rev 314)
@@ -269,15 +269,28 @@
<table>
<tbody>
<tr>
- <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userSecretQuestionLabel" class="portlet-form-field-label">秘密の質問</label>:
- </td>
+ <td align="right" width="25%">
+ <font color="#FF3F0C">*</font><label id="userSecretQuestionLabel" class="portlet-form-field-label">秘密の質問</label>:
+ </td>
<td width="75%">
+ <select id="userSecretQuestionSelection">
+ <option>ほげ</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%">
+ </td>
+ <td width="75%">
+ <label id="otherUserSecretQuestionLabel">上記以外の質問を登録することもできます。</label>
<input id="userSecretQuestion" type="text" class="portlet-form-input-field" size="24" />
+ <br/>
</td>
</tr>
<tr>
- <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userSecretAnswerLabel" class="portlet-form-field-label">秘密の答え</label>:
- </td>
+ <td align="right" width="25%">
+ <font color="#FF3F0C">*</font><label id="userSecretAnswerLabel" class="portlet-form-field-label">秘密の答え</label>:
+ </td>
<td width="75%">
<input id="userSecretAnswer" type="text" class="portlet-form-input-field" size="24" />
</td>