svnno****@sourc*****
svnno****@sourc*****
2007年 7月 24日 (火) 09:37:49 JST
Revision: 359 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=359 Author: shinsuke Date: 2007-07-24 09:37:48 +0900 (Tue, 24 Jul 2007) Log Message: ----------- extracted abstract classes. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 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/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 Added Paths: ----------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java Removed Paths: ------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationPage.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2007-07-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2007-07-24 00:37:48 UTC (rev 359) @@ -21,12 +21,12 @@ import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.util.PortalComponentUtil; import jp.sf.pal.admin.util.UserRegistrationUtil; -import jp.sf.pal.admin.web.registration.ForgottenPasswordPage; -import jp.sf.pal.admin.web.registration.PublicPortalRegistrationPage; +import jp.sf.pal.admin.web.registration.AbstractForgottenPasswordPage; +import jp.sf.pal.admin.web.registration.AbstractPublicPortalRegistrationPage; import jp.sf.pal.admin.web.registration.PublicPortalRegistrationUpdatePage; import jp.sf.pal.admin.web.registration.PublicPortalSecretAnswerPage; -import jp.sf.pal.admin.web.registration.ResetPasswordPage; -import jp.sf.pal.admin.web.registration.UserRegistrationPage; +import jp.sf.pal.admin.web.registration.AbstractResetPasswordPage; +import jp.sf.pal.admin.web.registration.AbstractUserRegistrationPage; import jp.sf.pal.common.CommonException; import org.apache.jetspeed.PortalReservedParameters; @@ -89,7 +89,7 @@ } } - public void register(UserRegistrationPage page) throws CommonException { + public void register(AbstractUserRegistrationPage page) throws CommonException { if (!UserRegistrationUtil .getBoolean(PALAdminConstants.FORCE_GENERATED_PASSWORD)) { @@ -244,7 +244,7 @@ return false; } - public void sendNewPassword(ForgottenPasswordPage page) + public void sendNewPassword(AbstractForgottenPasswordPage page) throws CommonException { User user = null; @@ -316,7 +316,7 @@ } - public void updatePassword(ResetPasswordPage page) throws CommonException { + public void updatePassword(AbstractResetPasswordPage page) throws CommonException { Map map = PortalComponentUtil.getPortalAdministration() .getNewLoginInfo(page.getGuid()); if (map == null) { @@ -500,7 +500,7 @@ } - protected void updateUserInfo(UserRegistrationPage page, + protected void updateUserInfo(AbstractUserRegistrationPage page, Preferences userAttributes) { if (userAttributes.get("user.business-info.online.email", null) != null) { page.setUserBusinessInfoOnlineEmail(userAttributes.get( @@ -821,7 +821,7 @@ } } - protected Map<String, String> createUserInfoMap(UserRegistrationPage page) { + protected Map<String, String> createUserInfoMap(AbstractUserRegistrationPage page) { Map<String, String> userInfo = new HashMap<String, String>(); if (page.getUserBusinessInfoOnlineEmail() != null) { @@ -1093,8 +1093,8 @@ .getUserBusinessInfoOnlineUri()); } - if (page instanceof PublicPortalRegistrationPage) { - PublicPortalRegistrationPage p = (PublicPortalRegistrationPage) page; + if (page instanceof AbstractPublicPortalRegistrationPage) { + AbstractPublicPortalRegistrationPage p = (AbstractPublicPortalRegistrationPage) page; if (p.getUserBdateYear() != null) { userInfo .put("user.bdate.year", p.getUserBdateYear().toString()); Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java 2007-07-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -0,0 +1,106 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.registration; + +import java.io.Serializable; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.admin.service.UserRegistrationService; + +import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; + +public abstract class AbstractForgottenPasswordPage implements Serializable { + + private FacesContext facesContext; + + private LabelHelper labelHelper; + + private UserRegistrationService userRegistrationService; + + //TODO mail validator + @Required + private String email; + + private String guid; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + /** + * @return the guid + */ + public String getGuid() { + return guid; + } + + /** + * @param guid the guid to set + */ + public void setGuid(String guid) { + this.guid = guid; + } + + /** + * @return the facesContext + */ + public FacesContext getFacesContext() { + return facesContext; + } + + /** + * @param facesContext the facesContext to set + */ + public void setFacesContext(FacesContext facesContext) { + this.facesContext = facesContext; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + /** + * @return the userRegistrationService + */ + public UserRegistrationService getUserRegistrationService() { + return userRegistrationService; + } + + /** + * @param userRegistrationService the userRegistrationService to set + */ + public void setUserRegistrationService( + UserRegistrationService userRegistrationService) { + this.userRegistrationService = userRegistrationService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java ___________________________________________________________________ Name: svn:eol-style + native Copied: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java (from rev 358, 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -0,0 +1,125 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.registration; + +import java.io.Serializable; + +public abstract class AbstractPublicPortalRegistrationPage extends + AbstractUserRegistrationPage implements Serializable { + + private String userNameFamilyYomi; + + private String userNameGivenYomi; + + private String termOfService; + + private Integer userBdateDate; + + private Integer userBdateMonth; + + private Integer userBdateYear; + + private String userIndustry; + + private String userSecretAnswer; + + private String userSecretQuestion; + + public String getTermOfService() { + return termOfService; + } + + public void setTermOfService(String termOfService) { + this.termOfService = termOfService; + } + + public Integer getUserBdateDate() { + return userBdateDate; + } + + public void setUserBdateDate(Integer userBdateDate) { + this.userBdateDate = userBdateDate; + } + + public Integer getUserBdateMonth() { + return userBdateMonth; + } + + public void setUserBdateMonth(Integer userBdateMonth) { + this.userBdateMonth = userBdateMonth; + } + + public Integer getUserBdateYear() { + return userBdateYear; + } + + public void setUserBdateYear(Integer userBdateYear) { + this.userBdateYear = userBdateYear; + } + + public String getUserIndustry() { + return userIndustry; + } + + public void setUserIndustry(String userIndustry) { + this.userIndustry = userIndustry; + } + + public String getUserSecretAnswer() { + return userSecretAnswer; + } + + public void setUserSecretAnswer(String userSecretAnswer) { + this.userSecretAnswer = userSecretAnswer; + } + + public String getUserSecretQuestion() { + return userSecretQuestion; + } + + public void setUserSecretQuestion(String userSecretQuestion) { + this.userSecretQuestion = userSecretQuestion; + } + + /** + * @return the userNameFamilyYomi + */ + public String getUserNameFamilyYomi() { + return userNameFamilyYomi; + } + + /** + * @param userNameFamilyYomi the userNameFamilyYomi to set + */ + public void setUserNameFamilyYomi(String userNameFamilyYomi) { + this.userNameFamilyYomi = userNameFamilyYomi; + } + + /** + * @return the userNameGivenYomi + */ + public String getUserNameGivenYomi() { + return userNameGivenYomi; + } + + /** + * @param userNameGivenYomi the userNameGivenYomi to set + */ + public void setUserNameGivenYomi(String userNameGivenYomi) { + this.userNameGivenYomi = userNameGivenYomi; + } + +} Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java 2007-07-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -0,0 +1,69 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.registration; + +import java.io.Serializable; + +import jp.sf.pal.admin.service.UserRegistrationService; + +import org.seasar.teeda.extension.util.LabelHelper; + +public abstract class AbstractResetPasswordPage implements Serializable { + + private String guid; + + private LabelHelper labelHelper; + + private UserRegistrationService userRegistrationService; + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + /** + * @return the userRegistrationService + */ + public UserRegistrationService getUserRegistrationService() { + return userRegistrationService; + } + + /** + * @param userRegistrationService the userRegistrationService to set + */ + public void setUserRegistrationService( + UserRegistrationService userRegistrationService) { + this.userRegistrationService = userRegistrationService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java 2007-07-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -0,0 +1,921 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.registration; + +import java.io.Serializable; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.admin.service.UserRegistrationService; + +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; + +public abstract class AbstractUserRegistrationPage implements Serializable { + + private FacesContext facesContext; + + private LabelHelper labelHelper; + + private UserRegistrationService userRegistrationService; + + @Length(maximum = 80) + private String password; + + @Length(maximum = 25) + private String userBdate; + + @Required + @Length(maximum = 80) + private String userBusinessInfoOnlineEmail; + + @Length(maximum = 80) + private String userBusinessInfoOnlineUri; + + @Length(maximum = 80) + private String userBusinessInfoPostalCity; + + @Length(maximum = 80) + private String userBusinessInfoPostalCountry; + + @Length(maximum = 80) + private String userBusinessInfoPostalName; + + @Length(maximum = 80) + private String userBusinessInfoPostalOrganization; + + @Length(maximum = 80) + private String userBusinessInfoPostalPostalcode; + + @Length(maximum = 80) + private String userBusinessInfoPostalStateprov; + + @Length(maximum = 80) + private String userBusinessInfoPostalStreet; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxNumber; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileNumber; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerNumber; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneNumber; + + @Length(maximum = 80) + private String userDepartment; + + @Length(maximum = 80) + private String userEmployer; + + @Length(maximum = 10) + private String userGender; + + @Length(maximum = 80) + private String userHomeInfoOnlineEmail; + + @Length(maximum = 80) + private String userHomeInfoOnlineUri; + + @Length(maximum = 80) + private String userHomeInfoPostalCity; + + @Length(maximum = 80) + private String userHomeInfoPostalCountry; + + @Length(maximum = 80) + private String userHomeInfoPostalName; + + @Length(maximum = 80) + private String userHomeInfoPostalOrganization; + + @Length(maximum = 80) + private String userHomeInfoPostalPostalcode; + + @Length(maximum = 80) + private String userHomeInfoPostalStateprov; + + @Length(maximum = 80) + private String userHomeInfoPostalStreet; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxNumber; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileNumber; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerNumber; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneNumber; + + @Length(maximum = 80) + private String userJobtitle; + + @Required + @Length(maximum = 80) + private String userName; + + @Length(maximum = 30) + private String userNameFamily; + + @Length(maximum = 30) + private String userNameGiven; + + @Length(maximum = 30) + private String userNameMiddle; + + @Length(maximum = 30) + private String userNameNickName; + + @Length(maximum = 10) + private String userNamePrefix; + + @Length(maximum = 10) + private String userNameSuffix; + + @Length(maximum = 80) + private String verifyPassword; + + /** + * @return the facesContext + */ + public FacesContext getFacesContext() { + return facesContext; + } + + /** + * @param facesContext the facesContext to set + */ + public void setFacesContext(FacesContext facesContext) { + this.facesContext = facesContext; + } + + /** + * @return the userRegistrationService + */ + public UserRegistrationService getUserRegistrationService() { + return userRegistrationService; + } + + /** + * @param userRegistrationService the userRegistrationService to set + */ + public void setUserRegistrationService( + UserRegistrationService userRegistrationService) { + this.userRegistrationService = userRegistrationService; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getUserBdate() { + return userBdate; + } + + public void setUserBdate(String userBdate) { + this.userBdate = userBdate; + } + + public String getUserBusinessInfoOnlineEmail() { + return userBusinessInfoOnlineEmail; + } + + public void setUserBusinessInfoOnlineEmail( + String userBusinessInfoOnlineEmail) { + this.userBusinessInfoOnlineEmail = userBusinessInfoOnlineEmail; + } + + public String getUserBusinessInfoOnlineUri() { + return userBusinessInfoOnlineUri; + } + + public void setUserBusinessInfoOnlineUri(String userBusinessInfoOnlineUri) { + this.userBusinessInfoOnlineUri = userBusinessInfoOnlineUri; + } + + public String getUserBusinessInfoPostalCity() { + return userBusinessInfoPostalCity; + } + + public void setUserBusinessInfoPostalCity(String userBusinessInfoPostalCity) { + this.userBusinessInfoPostalCity = userBusinessInfoPostalCity; + } + + public String getUserBusinessInfoPostalCountry() { + return userBusinessInfoPostalCountry; + } + + public void setUserBusinessInfoPostalCountry( + String userBusinessInfoPostalCountry) { + this.userBusinessInfoPostalCountry = userBusinessInfoPostalCountry; + } + + public String getUserBusinessInfoPostalName() { + return userBusinessInfoPostalName; + } + + public void setUserBusinessInfoPostalName(String userBusinessInfoPostalName) { + this.userBusinessInfoPostalName = userBusinessInfoPostalName; + } + + public String getUserBusinessInfoPostalOrganization() { + return userBusinessInfoPostalOrganization; + } + + public void setUserBusinessInfoPostalOrganization( + String userBusinessInfoPostalOrganization) { + this.userBusinessInfoPostalOrganization = userBusinessInfoPostalOrganization; + } + + public String getUserBusinessInfoPostalPostalcode() { + return userBusinessInfoPostalPostalcode; + } + + public void setUserBusinessInfoPostalPostalcode( + String userBusinessInfoPostalPostalcode) { + this.userBusinessInfoPostalPostalcode = userBusinessInfoPostalPostalcode; + } + + public String getUserBusinessInfoPostalStateprov() { + return userBusinessInfoPostalStateprov; + } + + public void setUserBusinessInfoPostalStateprov( + String userBusinessInfoPostalStateprov) { + this.userBusinessInfoPostalStateprov = userBusinessInfoPostalStateprov; + } + + public String getUserBusinessInfoPostalStreet() { + return userBusinessInfoPostalStreet; + } + + public void setUserBusinessInfoPostalStreet( + String userBusinessInfoPostalStreet) { + this.userBusinessInfoPostalStreet = userBusinessInfoPostalStreet; + } + + public String getUserBusinessInfoTelecomFaxComment() { + return userBusinessInfoTelecomFaxComment; + } + + public void setUserBusinessInfoTelecomFaxComment( + String userBusinessInfoTelecomFaxComment) { + this.userBusinessInfoTelecomFaxComment = userBusinessInfoTelecomFaxComment; + } + + public String getUserBusinessInfoTelecomFaxExt() { + return userBusinessInfoTelecomFaxExt; + } + + public void setUserBusinessInfoTelecomFaxExt( + String userBusinessInfoTelecomFaxExt) { + this.userBusinessInfoTelecomFaxExt = userBusinessInfoTelecomFaxExt; + } + + public String getUserBusinessInfoTelecomFaxIntcode() { + return userBusinessInfoTelecomFaxIntcode; + } + + public void setUserBusinessInfoTelecomFaxIntcode( + String userBusinessInfoTelecomFaxIntcode) { + this.userBusinessInfoTelecomFaxIntcode = userBusinessInfoTelecomFaxIntcode; + } + + public String getUserBusinessInfoTelecomFaxLoccode() { + return userBusinessInfoTelecomFaxLoccode; + } + + public void setUserBusinessInfoTelecomFaxLoccode( + String userBusinessInfoTelecomFaxLoccode) { + this.userBusinessInfoTelecomFaxLoccode = userBusinessInfoTelecomFaxLoccode; + } + + public String getUserBusinessInfoTelecomFaxNumber() { + return userBusinessInfoTelecomFaxNumber; + } + + public void setUserBusinessInfoTelecomFaxNumber( + String userBusinessInfoTelecomFaxNumber) { + this.userBusinessInfoTelecomFaxNumber = userBusinessInfoTelecomFaxNumber; + } + + public String getUserBusinessInfoTelecomMobileComment() { + return userBusinessInfoTelecomMobileComment; + } + + public void setUserBusinessInfoTelecomMobileComment( + String userBusinessInfoTelecomMobileComment) { + this.userBusinessInfoTelecomMobileComment = userBusinessInfoTelecomMobileComment; + } + + public String getUserBusinessInfoTelecomMobileExt() { + return userBusinessInfoTelecomMobileExt; + } + + public void setUserBusinessInfoTelecomMobileExt( + String userBusinessInfoTelecomMobileExt) { + this.userBusinessInfoTelecomMobileExt = userBusinessInfoTelecomMobileExt; + } + + public String getUserBusinessInfoTelecomMobileIntcode() { + return userBusinessInfoTelecomMobileIntcode; + } + + public void setUserBusinessInfoTelecomMobileIntcode( + String userBusinessInfoTelecomMobileIntcode) { + this.userBusinessInfoTelecomMobileIntcode = userBusinessInfoTelecomMobileIntcode; + } + + public String getUserBusinessInfoTelecomMobileLoccode() { + return userBusinessInfoTelecomMobileLoccode; + } + + public void setUserBusinessInfoTelecomMobileLoccode( + String userBusinessInfoTelecomMobileLoccode) { + this.userBusinessInfoTelecomMobileLoccode = userBusinessInfoTelecomMobileLoccode; + } + + public String getUserBusinessInfoTelecomMobileNumber() { + return userBusinessInfoTelecomMobileNumber; + } + + public void setUserBusinessInfoTelecomMobileNumber( + String userBusinessInfoTelecomMobileNumber) { + this.userBusinessInfoTelecomMobileNumber = userBusinessInfoTelecomMobileNumber; + } + + public String getUserBusinessInfoTelecomPagerComment() { + return userBusinessInfoTelecomPagerComment; + } + + public void setUserBusinessInfoTelecomPagerComment( + String userBusinessInfoTelecomPagerComment) { + this.userBusinessInfoTelecomPagerComment = userBusinessInfoTelecomPagerComment; + } + + public String getUserBusinessInfoTelecomPagerExt() { + return userBusinessInfoTelecomPagerExt; + } + + public void setUserBusinessInfoTelecomPagerExt( + String userBusinessInfoTelecomPagerExt) { + this.userBusinessInfoTelecomPagerExt = userBusinessInfoTelecomPagerExt; + } + + public String getUserBusinessInfoTelecomPagerIntcode() { + return userBusinessInfoTelecomPagerIntcode; + } + + public void setUserBusinessInfoTelecomPagerIntcode( + String userBusinessInfoTelecomPagerIntcode) { + this.userBusinessInfoTelecomPagerIntcode = userBusinessInfoTelecomPagerIntcode; + } + + public String getUserBusinessInfoTelecomPagerLoccode() { + return userBusinessInfoTelecomPagerLoccode; + } + + public void setUserBusinessInfoTelecomPagerLoccode( + String userBusinessInfoTelecomPagerLoccode) { + this.userBusinessInfoTelecomPagerLoccode = userBusinessInfoTelecomPagerLoccode; + } + + public String getUserBusinessInfoTelecomPagerNumber() { + return userBusinessInfoTelecomPagerNumber; + } + + public void setUserBusinessInfoTelecomPagerNumber( + String userBusinessInfoTelecomPagerNumber) { + this.userBusinessInfoTelecomPagerNumber = userBusinessInfoTelecomPagerNumber; + } + + public String getUserBusinessInfoTelecomTelephoneComment() { + return userBusinessInfoTelecomTelephoneComment; + } + + public void setUserBusinessInfoTelecomTelephoneComment( + String userBusinessInfoTelecomTelephoneComment) { + this.userBusinessInfoTelecomTelephoneComment = userBusinessInfoTelecomTelephoneComment; + } + + public String getUserBusinessInfoTelecomTelephoneExt() { + return userBusinessInfoTelecomTelephoneExt; + } + + public void setUserBusinessInfoTelecomTelephoneExt( + String userBusinessInfoTelecomTelephoneExt) { + this.userBusinessInfoTelecomTelephoneExt = userBusinessInfoTelecomTelephoneExt; + } + + public String getUserBusinessInfoTelecomTelephoneIntcode() { + return userBusinessInfoTelecomTelephoneIntcode; + } + + public void setUserBusinessInfoTelecomTelephoneIntcode( + String userBusinessInfoTelecomTelephoneIntcode) { + this.userBusinessInfoTelecomTelephoneIntcode = userBusinessInfoTelecomTelephoneIntcode; + } + + public String getUserBusinessInfoTelecomTelephoneLoccode() { + return userBusinessInfoTelecomTelephoneLoccode; + } + + public void setUserBusinessInfoTelecomTelephoneLoccode( + String userBusinessInfoTelecomTelephoneLoccode) { + this.userBusinessInfoTelecomTelephoneLoccode = userBusinessInfoTelecomTelephoneLoccode; + } + + public String getUserBusinessInfoTelecomTelephoneNumber() { + return userBusinessInfoTelecomTelephoneNumber; + } + + public void setUserBusinessInfoTelecomTelephoneNumber( + String userBusinessInfoTelecomTelephoneNumber) { + this.userBusinessInfoTelecomTelephoneNumber = userBusinessInfoTelecomTelephoneNumber; + } + + public String getUserDepartment() { + return userDepartment; + } + + public void setUserDepartment(String userDepartment) { + this.userDepartment = userDepartment; + } + + public String getUserEmployer() { + return userEmployer; + } + + public void setUserEmployer(String userEmployer) { + this.userEmployer = userEmployer; + } + + public String getUserGender() { + return userGender; + } + + public void setUserGender(String userGender) { + this.userGender = userGender; + } + + public String getUserHomeInfoOnlineEmail() { + return userHomeInfoOnlineEmail; + } + + public void setUserHomeInfoOnlineEmail(String userHomeInfoOnlineEmail) { + this.userHomeInfoOnlineEmail = userHomeInfoOnlineEmail; + } + + public String getUserHomeInfoOnlineUri() { + return userHomeInfoOnlineUri; + } + + public void setUserHomeInfoOnlineUri(String userHomeInfoOnlineUri) { + this.userHomeInfoOnlineUri = userHomeInfoOnlineUri; + } + + public String getUserHomeInfoPostalCity() { + return userHomeInfoPostalCity; + } + + public void setUserHomeInfoPostalCity(String userHomeInfoPostalCity) { + this.userHomeInfoPostalCity = userHomeInfoPostalCity; + } + + public String getUserHomeInfoPostalCountry() { + return userHomeInfoPostalCountry; + } + + public void setUserHomeInfoPostalCountry(String userHomeInfoPostalCountry) { + this.userHomeInfoPostalCountry = userHomeInfoPostalCountry; + } + + public String getUserHomeInfoPostalName() { + return userHomeInfoPostalName; + } + + public void setUserHomeInfoPostalName(String userHomeInfoPostalName) { + this.userHomeInfoPostalName = userHomeInfoPostalName; + } + + public String getUserHomeInfoPostalOrganization() { + return userHomeInfoPostalOrganization; + } + + public void setUserHomeInfoPostalOrganization( + String userHomeInfoPostalOrganization) { + this.userHomeInfoPostalOrganization = userHomeInfoPostalOrganization; + } + + public String getUserHomeInfoPostalPostalcode() { + return userHomeInfoPostalPostalcode; + } + + public void setUserHomeInfoPostalPostalcode( + String userHomeInfoPostalPostalcode) { + this.userHomeInfoPostalPostalcode = userHomeInfoPostalPostalcode; + } + + public String getUserHomeInfoPostalStateprov() { + return userHomeInfoPostalStateprov; + } + + public void setUserHomeInfoPostalStateprov( + String userHomeInfoPostalStateprov) { + this.userHomeInfoPostalStateprov = userHomeInfoPostalStateprov; + } + + public String getUserHomeInfoPostalStreet() { + return userHomeInfoPostalStreet; + } + + public void setUserHomeInfoPostalStreet(String userHomeInfoPostalStreet) { + this.userHomeInfoPostalStreet = userHomeInfoPostalStreet; + } + + public String getUserHomeInfoTelecomFaxComment() { + return userHomeInfoTelecomFaxComment; + } + + public void setUserHomeInfoTelecomFaxComment( + String userHomeInfoTelecomFaxComment) { + this.userHomeInfoTelecomFaxComment = userHomeInfoTelecomFaxComment; + } + + public String getUserHomeInfoTelecomFaxExt() { + return userHomeInfoTelecomFaxExt; + } + + public void setUserHomeInfoTelecomFaxExt(String userHomeInfoTelecomFaxExt) { + this.userHomeInfoTelecomFaxExt = userHomeInfoTelecomFaxExt; + } + + public String getUserHomeInfoTelecomFaxIntcode() { + return userHomeInfoTelecomFaxIntcode; + } + + public void setUserHomeInfoTelecomFaxIntcode( + String userHomeInfoTelecomFaxIntcode) { + this.userHomeInfoTelecomFaxIntcode = userHomeInfoTelecomFaxIntcode; + } + + public String getUserHomeInfoTelecomFaxLoccode() { + return userHomeInfoTelecomFaxLoccode; + } + + public void setUserHomeInfoTelecomFaxLoccode( + String userHomeInfoTelecomFaxLoccode) { + this.userHomeInfoTelecomFaxLoccode = userHomeInfoTelecomFaxLoccode; + } + + public String getUserHomeInfoTelecomFaxNumber() { + return userHomeInfoTelecomFaxNumber; + } + + public void setUserHomeInfoTelecomFaxNumber( + String userHomeInfoTelecomFaxNumber) { + this.userHomeInfoTelecomFaxNumber = userHomeInfoTelecomFaxNumber; + } + + public String getUserHomeInfoTelecomMobileComment() { + return userHomeInfoTelecomMobileComment; + } + + public void setUserHomeInfoTelecomMobileComment( + String userHomeInfoTelecomMobileComment) { + this.userHomeInfoTelecomMobileComment = userHomeInfoTelecomMobileComment; + } + + public String getUserHomeInfoTelecomMobileExt() { + return userHomeInfoTelecomMobileExt; + } + + public void setUserHomeInfoTelecomMobileExt( + String userHomeInfoTelecomMobileExt) { + this.userHomeInfoTelecomMobileExt = userHomeInfoTelecomMobileExt; + } + + public String getUserHomeInfoTelecomMobileIntcode() { + return userHomeInfoTelecomMobileIntcode; + } + + public void setUserHomeInfoTelecomMobileIntcode( + String userHomeInfoTelecomMobileIntcode) { + this.userHomeInfoTelecomMobileIntcode = userHomeInfoTelecomMobileIntcode; + } + + public String getUserHomeInfoTelecomMobileLoccode() { + return userHomeInfoTelecomMobileLoccode; + } + + public void setUserHomeInfoTelecomMobileLoccode( + String userHomeInfoTelecomMobileLoccode) { + this.userHomeInfoTelecomMobileLoccode = userHomeInfoTelecomMobileLoccode; + } + + public String getUserHomeInfoTelecomMobileNumber() { + return userHomeInfoTelecomMobileNumber; + } + + public void setUserHomeInfoTelecomMobileNumber( + String userHomeInfoTelecomMobileNumber) { + this.userHomeInfoTelecomMobileNumber = userHomeInfoTelecomMobileNumber; + } + + public String getUserHomeInfoTelecomPagerComment() { + return userHomeInfoTelecomPagerComment; + } + + public void setUserHomeInfoTelecomPagerComment( + String userHomeInfoTelecomPagerComment) { + this.userHomeInfoTelecomPagerComment = userHomeInfoTelecomPagerComment; + } + + public String getUserHomeInfoTelecomPagerExt() { + return userHomeInfoTelecomPagerExt; + } + + public void setUserHomeInfoTelecomPagerExt( + String userHomeInfoTelecomPagerExt) { + this.userHomeInfoTelecomPagerExt = userHomeInfoTelecomPagerExt; + } + + public String getUserHomeInfoTelecomPagerIntcode() { + return userHomeInfoTelecomPagerIntcode; + } + + public void setUserHomeInfoTelecomPagerIntcode( + String userHomeInfoTelecomPagerIntcode) { + this.userHomeInfoTelecomPagerIntcode = userHomeInfoTelecomPagerIntcode; + } + + public String getUserHomeInfoTelecomPagerLoccode() { + return userHomeInfoTelecomPagerLoccode; + } + + public void setUserHomeInfoTelecomPagerLoccode( + String userHomeInfoTelecomPagerLoccode) { + this.userHomeInfoTelecomPagerLoccode = userHomeInfoTelecomPagerLoccode; + } + + public String getUserHomeInfoTelecomPagerNumber() { + return userHomeInfoTelecomPagerNumber; + } + + public void setUserHomeInfoTelecomPagerNumber( + String userHomeInfoTelecomPagerNumber) { + this.userHomeInfoTelecomPagerNumber = userHomeInfoTelecomPagerNumber; + } + + public String getUserHomeInfoTelecomTelephoneComment() { + return userHomeInfoTelecomTelephoneComment; + } + + public void setUserHomeInfoTelecomTelephoneComment( + String userHomeInfoTelecomTelephoneComment) { + this.userHomeInfoTelecomTelephoneComment = userHomeInfoTelecomTelephoneComment; + } + + public String getUserHomeInfoTelecomTelephoneExt() { + return userHomeInfoTelecomTelephoneExt; + } + + public void setUserHomeInfoTelecomTelephoneExt( + String userHomeInfoTelecomTelephoneExt) { + this.userHomeInfoTelecomTelephoneExt = userHomeInfoTelecomTelephoneExt; + } + + public String getUserHomeInfoTelecomTelephoneIntcode() { + return userHomeInfoTelecomTelephoneIntcode; + } + + public void setUserHomeInfoTelecomTelephoneIntcode( + String userHomeInfoTelecomTelephoneIntcode) { + this.userHomeInfoTelecomTelephoneIntcode = userHomeInfoTelecomTelephoneIntcode; + } + + public String getUserHomeInfoTelecomTelephoneLoccode() { + return userHomeInfoTelecomTelephoneLoccode; + } + + public void setUserHomeInfoTelecomTelephoneLoccode( + String userHomeInfoTelecomTelephoneLoccode) { + this.userHomeInfoTelecomTelephoneLoccode = userHomeInfoTelecomTelephoneLoccode; + } + + public String getUserHomeInfoTelecomTelephoneNumber() { + return userHomeInfoTelecomTelephoneNumber; + } + + public void setUserHomeInfoTelecomTelephoneNumber( + String userHomeInfoTelecomTelephoneNumber) { + this.userHomeInfoTelecomTelephoneNumber = userHomeInfoTelecomTelephoneNumber; + } + + public String getUserJobtitle() { + return userJobtitle; + } + + public void setUserJobtitle(String userJobtitle) { + this.userJobtitle = userJobtitle; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserNameFamily() { + return userNameFamily; + } + + public void setUserNameFamily(String userNameFamily) { + this.userNameFamily = userNameFamily; + } + + public String getUserNameGiven() { + return userNameGiven; + } + + public void setUserNameGiven(String userNameGiven) { + this.userNameGiven = userNameGiven; + } + + public String getUserNameMiddle() { + return userNameMiddle; + } + + public void setUserNameMiddle(String userNameMiddle) { + this.userNameMiddle = userNameMiddle; + } + + public String getUserNameNickName() { + return userNameNickName; + } + + public void setUserNameNickName(String userNameNickName) { + this.userNameNickName = userNameNickName; + } + + public String getUserNamePrefix() { + return userNamePrefix; + } + + public void setUserNamePrefix(String userNamePrefix) { + this.userNamePrefix = userNamePrefix; + } + + public String getUserNameSuffix() { + return userNameSuffix; + } + + public void setUserNameSuffix(String userNameSuffix) { + this.userNameSuffix = userNameSuffix; + } + + public String getVerifyPassword() { + return verifyPassword; + } + + public void setVerifyPassword(String verifyPassword) { + this.verifyPassword = verifyPassword; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java ___________________________________________________________________ Name: svn:eol-style + native 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -4,19 +4,18 @@ import javax.faces.context.FacesContext; -import jp.sf.pal.admin.service.UserRegistrationService; +import org.seasar.framework.log.Logger; + 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 extends AbstractForgottenPasswordPage + implements Serializable { -public class ForgottenPasswordPage implements Serializable { /** * */ - private static final long serialVersionUID = -4345312306321998608L; + private static final long serialVersionUID = -1002535740755952748L; /** * Logger for this class @@ -24,84 +23,9 @@ private static final Logger logger = Logger .getLogger(ForgottenPasswordPage.class); - private FacesContext facesContext; + // TODO validation - private LabelHelper labelHelper; - - private UserRegistrationService userRegistrationService; - - //TODO mail validator - @Required - private String email; - - private String guid; - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - /** - * @return the guid - */ - public String getGuid() { - return guid; - } - - /** - * @param guid the guid to set - */ - public void setGuid(String guid) { - this.guid = guid; - } - - /** - * @return the facesContext - */ - public FacesContext getFacesContext() { - return facesContext; - } - - /** - * @param facesContext the facesContext to set - */ - public void setFacesContext(FacesContext facesContext) { - this.facesContext = facesContext; - } - - /** - * @return the labelHelper - */ - public LabelHelper getLabelHelper() { - return labelHelper; - } - - /** - * @param labelHelper the labelHelper to set - */ - public void setLabelHelper(LabelHelper labelHelper) { - this.labelHelper = labelHelper; - } - - /** - * @return the userRegistrationService - */ - public UserRegistrationService getUserRegistrationService() { - return userRegistrationService; - } - - /** - * @param userRegistrationService the userRegistrationService to set - */ - public void setUserRegistrationService( - UserRegistrationService userRegistrationService) { - this.userRegistrationService = userRegistrationService; - } - - public String initialize() { + public Class<?> initialize() { return null; } @@ -135,4 +59,5 @@ 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.registration; import java.io.Serializable; @@ -2,6 +17,9 @@ +import org.seasar.framework.log.Logger; + +import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; public class PublicPortalForgottenPasswordCompletedPage extends - ResetPasswordPage implements Serializable { + AbstractResetPasswordPage implements Serializable { @@ -12,12 +30,27 @@ */ private static final long serialVersionUID = -5203115307227054989L; - public String initialize() { + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(ResetPasswordPage.class); + + public Class<?> initialize() { return null; } public Class<?> prerender() { - super.prerender(); + if (getGuid() != null) { + try { + getUserRegistrationService().updatePassword(this); + 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(); 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -1,8 +1,26 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.registration; +import javax.faces.context.FacesContext; + import jp.sf.pal.common.util.FacesMessageUtil; -public class PublicPortalForgottenPasswordPage extends ForgottenPasswordPage { +public class PublicPortalForgottenPasswordPage extends + AbstractForgottenPasswordPage { /** * @@ -18,12 +36,13 @@ return PublicPortalSecretAnswerPage.class; } - public String initialize() { + public Class<?> initialize() { return null; } public Class<?> prerender() { - super.prerender(); + setGuid((String) FacesContext.getCurrentInstance().getExternalContext() + .getRequestParameterMap().get("guid")); if (getGuid() != null) { return PublicPortalForgottenPasswordCompletedPage.class; } 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.registration; import java.io.Serializable; @@ -11,11 +26,11 @@ */ private static final long serialVersionUID = -5112166307058162379L; - public String initialize() { + public Class<?> initialize() { return null; } - public String prerender() { + public Class<?> prerender() { // render FacesMessage FacesMessageUtil.renderMessages(); return null; Deleted: 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -1,115 +0,0 @@ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -public class PublicPortalRegistrationPage extends UserRegistrationPage - implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 8681176430915097393L; - - private String userNameFamilyYomi; - - private String userNameGivenYomi; - - private String termOfService; - - private Integer userBdateDate; - - private Integer userBdateMonth; - - private Integer userBdateYear; - - private String userIndustry; - - private String userSecretAnswer; - - private String userSecretQuestion; - - public String getTermOfService() { - return termOfService; - } - - public void setTermOfService(String termOfService) { - this.termOfService = termOfService; - } - - public Integer getUserBdateDate() { - return userBdateDate; - } - - public void setUserBdateDate(Integer userBdateDate) { - this.userBdateDate = userBdateDate; - } - - public Integer getUserBdateMonth() { - return userBdateMonth; - } - - public void setUserBdateMonth(Integer userBdateMonth) { - this.userBdateMonth = userBdateMonth; - } - - public Integer getUserBdateYear() { - return userBdateYear; - } - - public void setUserBdateYear(Integer userBdateYear) { - this.userBdateYear = userBdateYear; - } - - public String getUserIndustry() { - return userIndustry; - } - - public void setUserIndustry(String userIndustry) { - this.userIndustry = userIndustry; - } - - public String getUserSecretAnswer() { - return userSecretAnswer; - } - - public void setUserSecretAnswer(String userSecretAnswer) { - this.userSecretAnswer = userSecretAnswer; - } - - public String getUserSecretQuestion() { - return userSecretQuestion; - } - - public void setUserSecretQuestion(String userSecretQuestion) { - this.userSecretQuestion = userSecretQuestion; - } - - /** - * @return the userNameFamilyYomi - */ - public String getUserNameFamilyYomi() { - return userNameFamilyYomi; - } - - /** - * @param userNameFamilyYomi the userNameFamilyYomi to set - */ - public void setUserNameFamilyYomi(String userNameFamilyYomi) { - this.userNameFamilyYomi = userNameFamilyYomi; - } - - /** - * @return the userNameGivenYomi - */ - public String getUserNameGivenYomi() { - return userNameGivenYomi; - } - - /** - * @param userNameGivenYomi the userNameGivenYomi to set - */ - 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.registration; import java.io.BufferedReader; @@ -20,7 +35,7 @@ import org.seasar.framework.log.Logger; public class PublicPortalRegistrationRegisterPage extends - PublicPortalRegistrationPage { + AbstractPublicPortalRegistrationPage { /** * */ 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.registration; import java.io.Serializable; @@ -9,7 +24,7 @@ import org.seasar.framework.log.Logger; public class PublicPortalRegistrationUpdatePage extends - PublicPortalRegistrationPage implements Serializable { + AbstractPublicPortalRegistrationPage implements Serializable { /** * 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.registration; import java.io.Serializable; @@ -2,2 +17,4 @@ +import javax.faces.context.FacesContext; + import jp.sf.pal.admin.PALAdminConstants; @@ -10,7 +27,7 @@ import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; -public class PublicPortalSecretAnswerPage extends ForgottenPasswordPage +public class PublicPortalSecretAnswerPage extends AbstractForgottenPasswordPage implements Serializable { /** * @@ -79,12 +96,13 @@ return PublicPortalForgottenPasswordPage.class; } - public String initialize() { + public Class<?> initialize() { return null; } public Class<?> prerender() { - super.prerender(); + setGuid((String) FacesContext.getCurrentInstance().getExternalContext() + .getRequestParameterMap().get("guid")); if (getGuid() != null) { return PublicPortalForgottenPasswordCompletedPage.class; } 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -6,18 +6,17 @@ import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -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 extends AbstractResetPasswordPage implements + Serializable { /** * */ - private static final long serialVersionUID = -8378731734943234757L; + private static final long serialVersionUID = -774792006598626453L; /** * Logger for this class @@ -25,66 +24,10 @@ private static final Logger logger = Logger .getLogger(ResetPasswordPage.class); - private String guid; - - private LabelHelper labelHelper; - - private UserRegistrationService userRegistrationService; - - public String getGuid() { - return guid; - } - - public void setGuid(String guid) { - this.guid = guid; - } - - /** - * @return the labelHelper - */ - public LabelHelper getLabelHelper() { - return labelHelper; - } - - /** - * @param labelHelper the labelHelper to set - */ - public void setLabelHelper(LabelHelper labelHelper) { - this.labelHelper = labelHelper; - } - - /** - * @return the userRegistrationService - */ - public UserRegistrationService getUserRegistrationService() { - return userRegistrationService; - } - - /** - * @param userRegistrationService the userRegistrationService to set - */ - 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) { - return ForgottenPasswordPage.class; - } + public Class<?> initialize() { return null; } - public String initialize() { - return null; - } - public Class<?> prerender() { if (getGuid() != null) { try { @@ -102,6 +45,19 @@ return null; } + 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 getDoLoginValue() { return getLabelHelper().getLabelValue("login"); } 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-23 13:42:36 UTC (rev 358) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2007-07-24 00:37:48 UTC (rev 359) @@ -2,24 +2,19 @@ import java.io.Serializable; -import javax.faces.context.FacesContext; +import org.seasar.framework.log.Logger; + 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 extends AbstractUserRegistrationPage + implements Serializable { /** * */ - private static final long serialVersionUID = -8133681534556233811L; + private static final long serialVersionUID = -5852964123222268945L; /** * Logger for this class @@ -27,897 +22,8 @@ private static final Logger logger = Logger .getLogger(UserRegistrationPage.class); - private FacesContext facesContext; + // TODO validation - private LabelHelper labelHelper; - - private UserRegistrationService userRegistrationService; - - @Length(maximum = 80) - private String password; - - @Length(maximum = 25) - private String userBdate; - - @Required - @Length(maximum = 80) - private String userBusinessInfoOnlineEmail; - - @Length(maximum = 80) - private String userBusinessInfoOnlineUri; - - @Length(maximum = 80) - private String userBusinessInfoPostalCity; - - @Length(maximum = 80) - private String userBusinessInfoPostalCountry; - - @Length(maximum = 80) - private String userBusinessInfoPostalName; - - @Length(maximum = 80) - private String userBusinessInfoPostalOrganization; - - @Length(maximum = 80) - private String userBusinessInfoPostalPostalcode; - - @Length(maximum = 80) - private String userBusinessInfoPostalStateprov; - - @Length(maximum = 80) - private String userBusinessInfoPostalStreet; - - @Length(maximum = 80) - private String userBusinessInfoTelecomFaxComment; - - @Length(maximum = 80) - private String userBusinessInfoTelecomFaxExt; - - @Length(maximum = 80) - private String userBusinessInfoTelecomFaxIntcode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomFaxLoccode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomFaxNumber; - - @Length(maximum = 80) - private String userBusinessInfoTelecomMobileComment; - - @Length(maximum = 80) - private String userBusinessInfoTelecomMobileExt; - - @Length(maximum = 80) - private String userBusinessInfoTelecomMobileIntcode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomMobileLoccode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomMobileNumber; - - @Length(maximum = 80) - private String userBusinessInfoTelecomPagerComment; - - @Length(maximum = 80) - private String userBusinessInfoTelecomPagerExt; - - @Length(maximum = 80) - private String userBusinessInfoTelecomPagerIntcode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomPagerLoccode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomPagerNumber; - - @Length(maximum = 80) - private String userBusinessInfoTelecomTelephoneComment; - - @Length(maximum = 80) - private String userBusinessInfoTelecomTelephoneExt; - - @Length(maximum = 80) - private String userBusinessInfoTelecomTelephoneIntcode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomTelephoneLoccode; - - @Length(maximum = 80) - private String userBusinessInfoTelecomTelephoneNumber; - - @Length(maximum = 80) - private String userDepartment; - - @Length(maximum = 80) - private String userEmployer; - - @Length(maximum = 10) - private String userGender; - - @Length(maximum = 80) - private String userHomeInfoOnlineEmail; - - @Length(maximum = 80) - private String userHomeInfoOnlineUri; - - @Length(maximum = 80) - private String userHomeInfoPostalCity; - - @Length(maximum = 80) - private String userHomeInfoPostalCountry; - - @Length(maximum = 80) - private String userHomeInfoPostalName; - - @Length(maximum = 80) - private String userHomeInfoPostalOrganization; - - @Length(maximum = 80) - private String userHomeInfoPostalPostalcode; - - @Length(maximum = 80) - private String userHomeInfoPostalStateprov; - - @Length(maximum = 80) - private String userHomeInfoPostalStreet; - - @Length(maximum = 80) - private String userHomeInfoTelecomFaxComment; - - @Length(maximum = 80) - private String userHomeInfoTelecomFaxExt; - - @Length(maximum = 80) - private String userHomeInfoTelecomFaxIntcode; - - @Length(maximum = 80) - private String userHomeInfoTelecomFaxLoccode; - - @Length(maximum = 80) - private String userHomeInfoTelecomFaxNumber; - - @Length(maximum = 80) - private String userHomeInfoTelecomMobileComment; - - @Length(maximum = 80) - private String userHomeInfoTelecomMobileExt; - - @Length(maximum = 80) - private String userHomeInfoTelecomMobileIntcode; - - @Length(maximum = 80) - private String userHomeInfoTelecomMobileLoccode; - - @Length(maximum = 80) - private String userHomeInfoTelecomMobileNumber; - - @Length(maximum = 80) - private String userHomeInfoTelecomPagerComment; - - @Length(maximum = 80) - private String userHomeInfoTelecomPagerExt; - - @Length(maximum = 80) - private String userHomeInfoTelecomPagerIntcode; - - @Length(maximum = 80) - private String userHomeInfoTelecomPagerLoccode; - - @Length(maximum = 80) - private String userHomeInfoTelecomPagerNumber; - - @Length(maximum = 80) - private String userHomeInfoTelecomTelephoneComment; - - @Length(maximum = 80) - private String userHomeInfoTelecomTelephoneExt; - - @Length(maximum = 80) - private String userHomeInfoTelecomTelephoneIntcode; - - @Length(maximum = 80) - private String userHomeInfoTelecomTelephoneLoccode; - - @Length(maximum = 80) - private String userHomeInfoTelecomTelephoneNumber; - - @Length(maximum = 80) - private String userJobtitle; - - @Required - @Length(maximum = 80) - private String userName; - - @Length(maximum = 30) - private String userNameFamily; - - @Length(maximum = 30) - private String userNameGiven; - - @Length(maximum = 30) - private String userNameMiddle; - - @Length(maximum = 30) - private String userNameNickName; - - @Length(maximum = 10) - private String userNamePrefix; - - @Length(maximum = 10) - private String userNameSuffix; - - @Length(maximum = 80) - private String verifyPassword; - - /** - * @return the facesContext - */ - public FacesContext getFacesContext() { - return facesContext; - } - - /** - * @param facesContext the facesContext to set - */ - public void setFacesContext(FacesContext facesContext) { - this.facesContext = facesContext; - } - - /** - * @return the userRegistrationService - */ - public UserRegistrationService getUserRegistrationService() { - return userRegistrationService; - } - - /** - * @param userRegistrationService the userRegistrationService to set - */ - public void setUserRegistrationService( - UserRegistrationService userRegistrationService) { - this.userRegistrationService = userRegistrationService; - } - - /** - * @return the labelHelper - */ - public LabelHelper getLabelHelper() { - return labelHelper; - } - - /** - * @param labelHelper the labelHelper to set - */ - public void setLabelHelper(LabelHelper labelHelper) { - this.labelHelper = labelHelper; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getUserBdate() { - return userBdate; - } - - public void setUserBdate(String userBdate) { - this.userBdate = userBdate; - } - - public String getUserBusinessInfoOnlineEmail() { - return userBusinessInfoOnlineEmail; - } - - public void setUserBusinessInfoOnlineEmail( - String userBusinessInfoOnlineEmail) { - this.userBusinessInfoOnlineEmail = userBusinessInfoOnlineEmail; - } - - public String getUserBusinessInfoOnlineUri() { - return userBusinessInfoOnlineUri; - } - - public void setUserBusinessInfoOnlineUri(String userBusinessInfoOnlineUri) { - this.userBusinessInfoOnlineUri = userBusinessInfoOnlineUri; - } - - public String getUserBusinessInfoPostalCity() { - return userBusinessInfoPostalCity; - } - - public void setUserBusinessInfoPostalCity(String userBusinessInfoPostalCity) { - this.userBusinessInfoPostalCity = userBusinessInfoPostalCity; - } - - public String getUserBusinessInfoPostalCountry() { - return userBusinessInfoPostalCountry; - } - - public void setUserBusinessInfoPostalCountry( - String userBusinessInfoPostalCountry) { - this.userBusinessInfoPostalCountry = userBusinessInfoPostalCountry; - } - - public String getUserBusinessInfoPostalName() { - return userBusinessInfoPostalName; - } - - public void setUserBusinessInfoPostalName(String userBusinessInfoPostalName) { - this.userBusinessInfoPostalName = userBusinessInfoPostalName; - } - - public String getUserBusinessInfoPostalOrganization() { - return userBusinessInfoPostalOrganization; - } - - public void setUserBusinessInfoPostalOrganization( - String userBusinessInfoPostalOrganization) { - this.userBusinessInfoPostalOrganization = userBusinessInfoPostalOrganization; - } - - public String getUserBusinessInfoPostalPostalcode() { - return userBusinessInfoPostalPostalcode; - } - - public void setUserBusinessInfoPostalPostalcode( - String userBusinessInfoPostalPostalcode) { - this.userBusinessInfoPostalPostalcode = userBusinessInfoPostalPostalcode; - } - - public String getUserBusinessInfoPostalStateprov() { - return userBusinessInfoPostalStateprov; - } - - public void setUserBusinessInfoPostalStateprov( - String userBusinessInfoPostalStateprov) { - this.userBusinessInfoPostalStateprov = userBusinessInfoPostalStateprov; - } - - public String getUserBusinessInfoPostalStreet() { - return userBusinessInfoPostalStreet; - } - - public void setUserBusinessInfoPostalStreet( - String userBusinessInfoPostalStreet) { - this.userBusinessInfoPostalStreet = userBusinessInfoPostalStreet; - } - - public String getUserBusinessInfoTelecomFaxComment() { - return userBusinessInfoTelecomFaxComment; - } - - public void setUserBusinessInfoTelecomFaxComment( - String userBusinessInfoTelecomFaxComment) { - this.userBusinessInfoTelecomFaxComment = userBusinessInfoTelecomFaxComment; - } - - public String getUserBusinessInfoTelecomFaxExt() { - return userBusinessInfoTelecomFaxExt; - } - - public void setUserBusinessInfoTelecomFaxExt( - String userBusinessInfoTelecomFaxExt) { - this.userBusinessInfoTelecomFaxExt = userBusinessInfoTelecomFaxExt; - } - - public String getUserBusinessInfoTelecomFaxIntcode() { - return userBusinessInfoTelecomFaxIntcode; - } - - public void setUserBusinessInfoTelecomFaxIntcode( - String userBusinessInfoTelecomFaxIntcode) { - this.userBusinessInfoTelecomFaxIntcode = userBusinessInfoTelecomFaxIntcode; - } - - public String getUserBusinessInfoTelecomFaxLoccode() { - return userBusinessInfoTelecomFaxLoccode; - } - - public void setUserBusinessInfoTelecomFaxLoccode( - String userBusinessInfoTelecomFaxLoccode) { - this.userBusinessInfoTelecomFaxLoccode = userBusinessInfoTelecomFaxLoccode; - } - - public String getUserBusinessInfoTelecomFaxNumber() { - return userBusinessInfoTelecomFaxNumber; - } - - public void setUserBusinessInfoTelecomFaxNumber( - String userBusinessInfoTelecomFaxNumber) { - this.userBusinessInfoTelecomFaxNumber = userBusinessInfoTelecomFaxNumber; - } - - public String getUserBusinessInfoTelecomMobileComment() { - return userBusinessInfoTelecomMobileComment; - } - - public void setUserBusinessInfoTelecomMobileComment( - String userBusinessInfoTelecomMobileComment) { - this.userBusinessInfoTelecomMobileComment = userBusinessInfoTelecomMobileComment; - } - - public String getUserBusinessInfoTelecomMobileExt() { - return userBusinessInfoTelecomMobileExt; - } - - public void setUserBusinessInfoTelecomMobileExt( - String userBusinessInfoTelecomMobileExt) { - this.userBusinessInfoTelecomMobileExt = userBusinessInfoTelecomMobileExt; - } - - public String getUserBusinessInfoTelecomMobileIntcode() { - return userBusinessInfoTelecomMobileIntcode; - } - - public void setUserBusinessInfoTelecomMobileIntcode( - String userBusinessInfoTelecomMobileIntcode) { - this.userBusinessInfoTelecomMobileIntcode = userBusinessInfoTelecomMobileIntcode; - } - - public String getUserBusinessInfoTelecomMobileLoccode() { - return userBusinessInfoTelecomMobileLoccode; - } - - public void setUserBusinessInfoTelecomMobileLoccode( - String userBusinessInfoTelecomMobileLoccode) { - this.userBusinessInfoTelecomMobileLoccode = userBusinessInfoTelecomMobileLoccode; - } - - public String getUserBusinessInfoTelecomMobileNumber() { - return userBusinessInfoTelecomMobileNumber; - } - - public void setUserBusinessInfoTelecomMobileNumber( - String userBusinessInfoTelecomMobileNumber) { - this.userBusinessInfoTelecomMobileNumber = userBusinessInfoTelecomMobileNumber; - } - - public String getUserBusinessInfoTelecomPagerComment() { - return userBusinessInfoTelecomPagerComment; - } - - public void setUserBusinessInfoTelecomPagerComment( - String userBusinessInfoTelecomPagerComment) { - this.userBusinessInfoTelecomPagerComment = userBusinessInfoTelecomPagerComment; - } - - public String getUserBusinessInfoTelecomPagerExt() { - return userBusinessInfoTelecomPagerExt; - } - - public void setUserBusinessInfoTelecomPagerExt( - String userBusinessInfoTelecomPagerExt) { - this.userBusinessInfoTelecomPagerExt = userBusinessInfoTelecomPagerExt; - } - - public String getUserBusinessInfoTelecomPagerIntcode() { - return userBusinessInfoTelecomPagerIntcode; - } - - public void setUserBusinessInfoTelecomPagerIntcode( - String userBusinessInfoTelecomPagerIntcode) { - this.userBusinessInfoTelecomPagerIntcode = userBusinessInfoTelecomPagerIntcode; - } - - public String getUserBusinessInfoTelecomPagerLoccode() { - return userBusinessInfoTelecomPagerLoccode; - } - - public void setUserBusinessInfoTelecomPagerLoccode( - String userBusinessInfoTelecomPagerLoccode) { - this.userBusinessInfoTelecomPagerLoccode = userBusinessInfoTelecomPagerLoccode; - } - - public String getUserBusinessInfoTelecomPagerNumber() { - return userBusinessInfoTelecomPagerNumber; - } - - public void setUserBusinessInfoTelecomPagerNumber( - String userBusinessInfoTelecomPagerNumber) { - this.userBusinessInfoTelecomPagerNumber = userBusinessInfoTelecomPagerNumber; - } - - public String getUserBusinessInfoTelecomTelephoneComment() { - return userBusinessInfoTelecomTelephoneComment; - } - - public void setUserBusinessInfoTelecomTelephoneComment( - String userBusinessInfoTelecomTelephoneComment) { - this.userBusinessInfoTelecomTelephoneComment = userBusinessInfoTelecomTelephoneComment; - } - - public String getUserBusinessInfoTelecomTelephoneExt() { - return userBusinessInfoTelecomTelephoneExt; - } - - public void setUserBusinessInfoTelecomTelephoneExt( - String userBusinessInfoTelecomTelephoneExt) { - this.userBusinessInfoTelecomTelephoneExt = userBusinessInfoTelecomTelephoneExt; - } - - public String getUserBusinessInfoTelecomTelephoneIntcode() { - return userBusinessInfoTelecomTelephoneIntcode; - } - - public void setUserBusinessInfoTelecomTelephoneIntcode( - String userBusinessInfoTelecomTelephoneIntcode) { - this.userBusinessInfoTelecomTelephoneIntcode = userBusinessInfoTelecomTelephoneIntcode; - } - - public String getUserBusinessInfoTelecomTelephoneLoccode() { - return userBusinessInfoTelecomTelephoneLoccode; - } - - public void setUserBusinessInfoTelecomTelephoneLoccode( - String userBusinessInfoTelecomTelephoneLoccode) { - this.userBusinessInfoTelecomTelephoneLoccode = userBusinessInfoTelecomTelephoneLoccode; - } - - public String getUserBusinessInfoTelecomTelephoneNumber() { - return userBusinessInfoTelecomTelephoneNumber; - } - - public void setUserBusinessInfoTelecomTelephoneNumber( - String userBusinessInfoTelecomTelephoneNumber) { - this.userBusinessInfoTelecomTelephoneNumber = userBusinessInfoTelecomTelephoneNumber; - } - - public String getUserDepartment() { - return userDepartment; - } - - public void setUserDepartment(String userDepartment) { - this.userDepartment = userDepartment; - } - - public String getUserEmployer() { - return userEmployer; - } - - public void setUserEmployer(String userEmployer) { - this.userEmployer = userEmployer; - } - - public String getUserGender() { - return userGender; - } - - public void setUserGender(String userGender) { - this.userGender = userGender; - } - - public String getUserHomeInfoOnlineEmail() { - return userHomeInfoOnlineEmail; - } - - public void setUserHomeInfoOnlineEmail(String userHomeInfoOnlineEmail) { - this.userHomeInfoOnlineEmail = userHomeInfoOnlineEmail; - } - - public String getUserHomeInfoOnlineUri() { - return userHomeInfoOnlineUri; - } - - public void setUserHomeInfoOnlineUri(String userHomeInfoOnlineUri) { - this.userHomeInfoOnlineUri = userHomeInfoOnlineUri; - } - - public String getUserHomeInfoPostalCity() { - return userHomeInfoPostalCity; - } - - public void setUserHomeInfoPostalCity(String userHomeInfoPostalCity) { - this.userHomeInfoPostalCity = userHomeInfoPostalCity; - } - - public String getUserHomeInfoPostalCountry() { - return userHomeInfoPostalCountry; - } - - public void setUserHomeInfoPostalCountry(String userHomeInfoPostalCountry) { - this.userHomeInfoPostalCountry = userHomeInfoPostalCountry; - } - - public String getUserHomeInfoPostalName() { - return userHomeInfoPostalName; - } - - public void setUserHomeInfoPostalName(String userHomeInfoPostalName) { - this.userHomeInfoPostalName = userHomeInfoPostalName; - } - - public String getUserHomeInfoPostalOrganization() { - return userHomeInfoPostalOrganization; - } - - public void setUserHomeInfoPostalOrganization( - String userHomeInfoPostalOrganization) { - this.userHomeInfoPostalOrganization = userHomeInfoPostalOrganization; - } - - public String getUserHomeInfoPostalPostalcode() { - return userHomeInfoPostalPostalcode; - } - - public void setUserHomeInfoPostalPostalcode( - String userHomeInfoPostalPostalcode) { - this.userHomeInfoPostalPostalcode = userHomeInfoPostalPostalcode; - } - - public String getUserHomeInfoPostalStateprov() { - return userHomeInfoPostalStateprov; - } - - public void setUserHomeInfoPostalStateprov( - String userHomeInfoPostalStateprov) { - this.userHomeInfoPostalStateprov = userHomeInfoPostalStateprov; - } - - public String getUserHomeInfoPostalStreet() { - return userHomeInfoPostalStreet; - } - - public void setUserHomeInfoPostalStreet(String userHomeInfoPostalStreet) { - this.userHomeInfoPostalStreet = userHomeInfoPostalStreet; - } - - public String getUserHomeInfoTelecomFaxComment() { - return userHomeInfoTelecomFaxComment; - } - - public void setUserHomeInfoTelecomFaxComment( - String userHomeInfoTelecomFaxComment) { - this.userHomeInfoTelecomFaxComment = userHomeInfoTelecomFaxComment; - } - - public String getUserHomeInfoTelecomFaxExt() { - return userHomeInfoTelecomFaxExt; - } - - public void setUserHomeInfoTelecomFaxExt(String userHomeInfoTelecomFaxExt) { - this.userHomeInfoTelecomFaxExt = userHomeInfoTelecomFaxExt; - } - - public String getUserHomeInfoTelecomFaxIntcode() { - return userHomeInfoTelecomFaxIntcode; - } - - public void setUserHomeInfoTelecomFaxIntcode( - String userHomeInfoTelecomFaxIntcode) { - this.userHomeInfoTelecomFaxIntcode = userHomeInfoTelecomFaxIntcode; - } - - public String getUserHomeInfoTelecomFaxLoccode() { - return userHomeInfoTelecomFaxLoccode; - } - - public void setUserHomeInfoTelecomFaxLoccode( - String userHomeInfoTelecomFaxLoccode) { - this.userHomeInfoTelecomFaxLoccode = userHomeInfoTelecomFaxLoccode; - } - - public String getUserHomeInfoTelecomFaxNumber() { - return userHomeInfoTelecomFaxNumber; - } - - public void setUserHomeInfoTelecomFaxNumber( - String userHomeInfoTelecomFaxNumber) { - this.userHomeInfoTelecomFaxNumber = userHomeInfoTelecomFaxNumber; - } - - public String getUserHomeInfoTelecomMobileComment() { - return userHomeInfoTelecomMobileComment; - } - - public void setUserHomeInfoTelecomMobileComment( - String userHomeInfoTelecomMobileComment) { - this.userHomeInfoTelecomMobileComment = userHomeInfoTelecomMobileComment; - } - - public String getUserHomeInfoTelecomMobileExt() { - return userHomeInfoTelecomMobileExt; - } - - public void setUserHomeInfoTelecomMobileExt( - String userHomeInfoTelecomMobileExt) { - this.userHomeInfoTelecomMobileExt = userHomeInfoTelecomMobileExt; - } - - public String getUserHomeInfoTelecomMobileIntcode() { - return userHomeInfoTelecomMobileIntcode; - } - - public void setUserHomeInfoTelecomMobileIntcode( - String userHomeInfoTelecomMobileIntcode) { - this.userHomeInfoTelecomMobileIntcode = userHomeInfoTelecomMobileIntcode; - } - - public String getUserHomeInfoTelecomMobileLoccode() { - return userHomeInfoTelecomMobileLoccode; - } - - public void setUserHomeInfoTelecomMobileLoccode( - String userHomeInfoTelecomMobileLoccode) { - this.userHomeInfoTelecomMobileLoccode = userHomeInfoTelecomMobileLoccode; - } - - public String getUserHomeInfoTelecomMobileNumber() { - return userHomeInfoTelecomMobileNumber; - } - - public void setUserHomeInfoTelecomMobileNumber( - String userHomeInfoTelecomMobileNumber) { - this.userHomeInfoTelecomMobileNumber = userHomeInfoTelecomMobileNumber; - } - - public String getUserHomeInfoTelecomPagerComment() { - return userHomeInfoTelecomPagerComment; - } - - public void setUserHomeInfoTelecomPagerComment( - String userHomeInfoTelecomPagerComment) { - this.userHomeInfoTelecomPagerComment = userHomeInfoTelecomPagerComment; - } - - public String getUserHomeInfoTelecomPagerExt() { - return userHomeInfoTelecomPagerExt; - } - - public void setUserHomeInfoTelecomPagerExt( - String userHomeInfoTelecomPagerExt) { - this.userHomeInfoTelecomPagerExt = userHomeInfoTelecomPagerExt; - } - - public String getUserHomeInfoTelecomPagerIntcode() { - return userHomeInfoTelecomPagerIntcode; - } - - public void setUserHomeInfoTelecomPagerIntcode( - String userHomeInfoTelecomPagerIntcode) { - this.userHomeInfoTelecomPagerIntcode = userHomeInfoTelecomPagerIntcode; - } - - public String getUserHomeInfoTelecomPagerLoccode() { - return userHomeInfoTelecomPagerLoccode; - } - - public void setUserHomeInfoTelecomPagerLoccode( - String userHomeInfoTelecomPagerLoccode) { - this.userHomeInfoTelecomPagerLoccode = userHomeInfoTelecomPagerLoccode; - } - - public String getUserHomeInfoTelecomPagerNumber() { - return userHomeInfoTelecomPagerNumber; - } - - public void setUserHomeInfoTelecomPagerNumber( - String userHomeInfoTelecomPagerNumber) { - this.userHomeInfoTelecomPagerNumber = userHomeInfoTelecomPagerNumber; - } - - public String getUserHomeInfoTelecomTelephoneComment() { - return userHomeInfoTelecomTelephoneComment; - } - - public void setUserHomeInfoTelecomTelephoneComment( - String userHomeInfoTelecomTelephoneComment) { - this.userHomeInfoTelecomTelephoneComment = userHomeInfoTelecomTelephoneComment; - } - - public String getUserHomeInfoTelecomTelephoneExt() { - return userHomeInfoTelecomTelephoneExt; - } - - public void setUserHomeInfoTelecomTelephoneExt( - String userHomeInfoTelecomTelephoneExt) { - this.userHomeInfoTelecomTelephoneExt = userHomeInfoTelecomTelephoneExt; - } - - public String getUserHomeInfoTelecomTelephoneIntcode() { - return userHomeInfoTelecomTelephoneIntcode; - } - - public void setUserHomeInfoTelecomTelephoneIntcode( - String userHomeInfoTelecomTelephoneIntcode) { - this.userHomeInfoTelecomTelephoneIntcode = userHomeInfoTelecomTelephoneIntcode; - } - - public String getUserHomeInfoTelecomTelephoneLoccode() { - return userHomeInfoTelecomTelephoneLoccode; - } - - public void setUserHomeInfoTelecomTelephoneLoccode( - String userHomeInfoTelecomTelephoneLoccode) { - this.userHomeInfoTelecomTelephoneLoccode = userHomeInfoTelecomTelephoneLoccode; - } - - public String getUserHomeInfoTelecomTelephoneNumber() { - return userHomeInfoTelecomTelephoneNumber; - } - - public void setUserHomeInfoTelecomTelephoneNumber( - String userHomeInfoTelecomTelephoneNumber) { - this.userHomeInfoTelecomTelephoneNumber = userHomeInfoTelecomTelephoneNumber; - } - - public String getUserJobtitle() { - return userJobtitle; - } - - public void setUserJobtitle(String userJobtitle) { - this.userJobtitle = userJobtitle; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getUserNameFamily() { - return userNameFamily; - } - - public void setUserNameFamily(String userNameFamily) { - this.userNameFamily = userNameFamily; - } - - public String getUserNameGiven() { - return userNameGiven; - } - - public void setUserNameGiven(String userNameGiven) { - this.userNameGiven = userNameGiven; - } - - public String getUserNameMiddle() { - return userNameMiddle; - } - - public void setUserNameMiddle(String userNameMiddle) { - this.userNameMiddle = userNameMiddle; - } - - public String getUserNameNickName() { - return userNameNickName; - } - - public void setUserNameNickName(String userNameNickName) { - this.userNameNickName = userNameNickName; - } - - public String getUserNamePrefix() { - return userNamePrefix; - } - - public void setUserNamePrefix(String userNamePrefix) { - this.userNamePrefix = userNamePrefix; - } - - public String getUserNameSuffix() { - return userNameSuffix; - } - - public void setUserNameSuffix(String userNameSuffix) { - this.userNameSuffix = userNameSuffix; - } - - public String getVerifyPassword() { - return verifyPassword; - } - - public void setVerifyPassword(String verifyPassword) { - this.verifyPassword = verifyPassword; - } - public Class<?> initialize() { return null; } @@ -949,4 +55,5 @@ public String getDoFinishValue() { return getLabelHelper().getLabelValue("SignUp"); } + }