svnno****@sourc*****
svnno****@sourc*****
2007年 7月 3日 (火) 16:28:13 JST
Revision: 207
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=207
Author: shinsuke
Date: 2007-07-03 16:28:12 +0900 (Tue, 03 Jul 2007)
Log Message:
-----------
added user inforupdater.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
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/PublicPortalRegistrationPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
pal-admin/trunk/src/main/resources/appMessages.properties
pal-admin/trunk/src/main/resources/appMessages_ja.properties
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties
pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml
pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
Added Paths:
-----------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties
pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html
Removed Paths:
-------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/AbstractUserRegistrationFilter.java
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -134,7 +134,7 @@
public static final String USER_REGISTRATION_PARAMS = PREFIX
+ "UserRegistrationParams";
- public static final String DEFAULT_TEMPLATE_LOCATION = "/WEB-INF/view/userreg/";
+ public static final String DEFAULT_TEMPLATE_LOCATION = "/WEB-INF/template/userreg/";
public static final String DEFAULT_TEMPLATE_NAME = "userRegistrationEmail.vm";
Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/AbstractUserRegistrationFilter.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/AbstractUserRegistrationFilter.java 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/AbstractUserRegistrationFilter.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -1,202 +0,0 @@
-package jp.sf.pal.admin.filter;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import jp.sf.pal.admin.PALAdminConstants;
-
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.administration.PortalAdministration;
-import org.apache.jetspeed.locator.JetspeedTemplateLocator;
-import org.apache.jetspeed.security.UserManager;
-import org.apache.portals.bridges.portletfilter.PortletFilter;
-import org.apache.portals.bridges.portletfilter.PortletFilterChain;
-import org.apache.portals.bridges.portletfilter.PortletFilterConfig;
-
-public abstract class AbstractUserRegistrationFilter implements PortletFilter
-{
-
- private PortalAdministration portalAdministration;
-
- private UserManager userManager;
-
- private Map<String, Object> userRegistrationParams;
-
- public void destroy()
- {
- portalAdministration = null;
- userManager = null;
- userRegistrationParams = null;
- }
-
- public void init(PortletFilterConfig filterConfig) throws PortletException
- {
- PortletConfig portletConfig = filterConfig.getPortletConfig();
- PortletContext portletContext = portletConfig.getPortletContext();
-
- // portalAdministration
- portalAdministration = (PortalAdministration) portletContext
- .getAttribute(CommonPortletServices.CPS_PORTAL_ADMINISTRATION);
- if (portalAdministration == null)
- {
- throw new PortletException(
- "Failed to find the `prtaon portlet initialization");
- }
-
- // userManager
- userManager = (UserManager) portletContext
- .getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT);
- if (userManager == null)
- {
- throw new PortletException(
- "Failed to find the User Manager on portlet initialization");
- }
-
- userRegistrationParams = new HashMap<String, Object>();
-
- String templateLocation = portletConfig
- .getInitParameter(PALAdminConstants.EMAIL_TEMPLATE_LOCATION);
- if (templateLocation == null)
- {
- templateLocation = PALAdminConstants.DEFAULT_TEMPLATE_LOCATION;
- }
- templateLocation = portletContext.getRealPath(templateLocation);
- userRegistrationParams.put(PALAdminConstants.EMAIL_TEMPLATE_LOCATION,
- templateLocation);
-
- String templateName = portletConfig
- .getInitParameter(PALAdminConstants.EMAIL_TEMPLATE_NAME);
- if (templateName == null)
- {
- templateName = PALAdminConstants.DEFAULT_TEMPLATE_NAME;
- }
- userRegistrationParams.put(PALAdminConstants.EMAIL_TEMPLATE_NAME,
- templateName);
-
- ArrayList<String> roots = new ArrayList<String>(1);
- roots.add(templateLocation);
-
- try
- {
- JetspeedTemplateLocator templateLocator = new JetspeedTemplateLocator(
- roots, "email", portletContext.getRealPath("/"));
- templateLocator.start();
- userRegistrationParams.put(PALAdminConstants.TEMPLATE_LOCATOR,
- templateLocator);
- }
- catch (FileNotFoundException e)
- {
- throw new PortletException("Could not start the template locator.",
- e);
- }
- }
-
- public void processActionFilter(ActionRequest request,
- ActionResponse response, PortletFilterChain chain)
- throws PortletException, IOException
- {
- request.setAttribute(PALAdminConstants.PORTAL_ADMINISTRATION_COMPONENT,
- portalAdministration);
- request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
- userManager);
- request.setAttribute(PALAdminConstants.USER_REGISTRATION_PARAMS,
- userRegistrationParams);
-
- chain.processActionFilter(request, response);
- }
-
- public void renderFilter(RenderRequest request, RenderResponse response,
- PortletFilterChain chain) throws PortletException, IOException
- {
- request.setAttribute(PALAdminConstants.PORTAL_ADMINISTRATION_COMPONENT,
- portalAdministration);
- request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
- userManager);
- request.setAttribute(PALAdminConstants.USER_REGISTRATION_PARAMS,
- userRegistrationParams);
-
- chain.renderFilter(request, response);
- }
-
- protected List<String> getInitParameterList(PortletConfig portletConfig,
- String ipName)
- {
- String temp = portletConfig.getInitParameter(ipName);
- if (temp == null)
- {
- return new ArrayList<String>();
- }
-
- String[] temps = temp.split("\\,");
- for (int ix = 0; ix < temps.length; ix++)
- {
- temps[ix] = temps[ix].trim();
- }
-
- return Arrays.asList(temps);
- }
-
- /**
- * @return the portalAdministration
- */
- public PortalAdministration getPortalAdministration()
- {
- return portalAdministration;
- }
-
- /**
- * @param portalAdministration the portalAdministration to set
- */
- public void setPortalAdministration(
- PortalAdministration portalAdministration)
- {
- this.portalAdministration = portalAdministration;
- }
-
- /**
- * @return the userManager
- */
- public UserManager getUserManager()
- {
- return userManager;
- }
-
- /**
- * @param userManager the userManager to set
- */
- public void setUserManager(UserManager userManager)
- {
- this.userManager = userManager;
- }
-
- /**
- * @return the userRegistrationParams
- */
- public Map<String, Object> getUserRegistrationParams()
- {
- return userRegistrationParams;
- }
-
- /**
- * @param userRegistrationParams the userRegistrationParams to set
- */
- public void setUserRegistrationParams(
- Map<String, Object> userRegistrationParams)
- {
- this.userRegistrationParams = userRegistrationParams;
- }
-
-}
\ No newline at end of file
Copied: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java (from rev 206, pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/AbstractUserRegistrationFilter.java)
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/AbstractUserRegistrationFilter.java 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -0,0 +1,202 @@
+package jp.sf.pal.admin.filter;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import jp.sf.pal.admin.PALAdminConstants;
+
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.administration.PortalAdministration;
+import org.apache.jetspeed.locator.JetspeedTemplateLocator;
+import org.apache.jetspeed.security.UserManager;
+import org.apache.portals.bridges.portletfilter.PortletFilter;
+import org.apache.portals.bridges.portletfilter.PortletFilterChain;
+import org.apache.portals.bridges.portletfilter.PortletFilterConfig;
+
+public class DefaultUserRegistrationFilter implements PortletFilter
+{
+
+ private PortalAdministration portalAdministration;
+
+ private UserManager userManager;
+
+ private Map<String, Object> userRegistrationParams;
+
+ public void destroy()
+ {
+ portalAdministration = null;
+ userManager = null;
+ userRegistrationParams = null;
+ }
+
+ public void init(PortletFilterConfig filterConfig) throws PortletException
+ {
+ PortletConfig portletConfig = filterConfig.getPortletConfig();
+ PortletContext portletContext = portletConfig.getPortletContext();
+
+ // portalAdministration
+ portalAdministration = (PortalAdministration) portletContext
+ .getAttribute(CommonPortletServices.CPS_PORTAL_ADMINISTRATION);
+ if (portalAdministration == null)
+ {
+ throw new PortletException(
+ "Failed to find the `prtaon portlet initialization");
+ }
+
+ // userManager
+ userManager = (UserManager) portletContext
+ .getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT);
+ if (userManager == null)
+ {
+ throw new PortletException(
+ "Failed to find the User Manager on portlet initialization");
+ }
+
+ userRegistrationParams = new HashMap<String, Object>();
+
+ String templateLocation = portletConfig
+ .getInitParameter(PALAdminConstants.EMAIL_TEMPLATE_LOCATION);
+ if (templateLocation == null)
+ {
+ templateLocation = PALAdminConstants.DEFAULT_TEMPLATE_LOCATION;
+ }
+ templateLocation = portletContext.getRealPath(templateLocation);
+ userRegistrationParams.put(PALAdminConstants.EMAIL_TEMPLATE_LOCATION,
+ templateLocation);
+
+ String templateName = portletConfig
+ .getInitParameter(PALAdminConstants.EMAIL_TEMPLATE_NAME);
+ if (templateName == null)
+ {
+ templateName = PALAdminConstants.DEFAULT_TEMPLATE_NAME;
+ }
+ userRegistrationParams.put(PALAdminConstants.EMAIL_TEMPLATE_NAME,
+ templateName);
+
+ ArrayList<String> roots = new ArrayList<String>(1);
+ roots.add(templateLocation);
+
+ try
+ {
+ JetspeedTemplateLocator templateLocator = new JetspeedTemplateLocator(
+ roots, "email", portletContext.getRealPath("/"));
+ templateLocator.start();
+ userRegistrationParams.put(PALAdminConstants.TEMPLATE_LOCATOR,
+ templateLocator);
+ }
+ catch (FileNotFoundException e)
+ {
+ throw new PortletException("Could not start the template locator.",
+ e);
+ }
+ }
+
+ public void processActionFilter(ActionRequest request,
+ ActionResponse response, PortletFilterChain chain)
+ throws PortletException, IOException
+ {
+ request.setAttribute(PALAdminConstants.PORTAL_ADMINISTRATION_COMPONENT,
+ portalAdministration);
+ request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
+ userManager);
+ request.setAttribute(PALAdminConstants.USER_REGISTRATION_PARAMS,
+ userRegistrationParams);
+
+ chain.processActionFilter(request, response);
+ }
+
+ public void renderFilter(RenderRequest request, RenderResponse response,
+ PortletFilterChain chain) throws PortletException, IOException
+ {
+ request.setAttribute(PALAdminConstants.PORTAL_ADMINISTRATION_COMPONENT,
+ portalAdministration);
+ request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
+ userManager);
+ request.setAttribute(PALAdminConstants.USER_REGISTRATION_PARAMS,
+ userRegistrationParams);
+
+ chain.renderFilter(request, response);
+ }
+
+ protected List<String> getInitParameterList(PortletConfig portletConfig,
+ String ipName)
+ {
+ String temp = portletConfig.getInitParameter(ipName);
+ if (temp == null)
+ {
+ return new ArrayList<String>();
+ }
+
+ String[] temps = temp.split("\\,");
+ for (int ix = 0; ix < temps.length; ix++)
+ {
+ temps[ix] = temps[ix].trim();
+ }
+
+ return Arrays.asList(temps);
+ }
+
+ /**
+ * @return the portalAdministration
+ */
+ public PortalAdministration getPortalAdministration()
+ {
+ return portalAdministration;
+ }
+
+ /**
+ * @param portalAdministration the portalAdministration to set
+ */
+ public void setPortalAdministration(
+ PortalAdministration portalAdministration)
+ {
+ this.portalAdministration = portalAdministration;
+ }
+
+ /**
+ * @return the userManager
+ */
+ public UserManager getUserManager()
+ {
+ return userManager;
+ }
+
+ /**
+ * @param userManager the userManager to set
+ */
+ public void setUserManager(UserManager userManager)
+ {
+ this.userManager = userManager;
+ }
+
+ /**
+ * @return the userRegistrationParams
+ */
+ public Map<String, Object> getUserRegistrationParams()
+ {
+ return userRegistrationParams;
+ }
+
+ /**
+ * @param userRegistrationParams the userRegistrationParams to set
+ */
+ public void setUserRegistrationParams(
+ Map<String, Object> userRegistrationParams)
+ {
+ this.userRegistrationParams = userRegistrationParams;
+ }
+
+}
\ No newline at end of file
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -7,7 +7,7 @@
import org.apache.portals.bridges.portletfilter.PortletFilterConfig;
-public class ForgottenPasswordFilter extends AbstractUserRegistrationFilter
+public class ForgottenPasswordFilter extends DefaultUserRegistrationFilter
{
public ForgottenPasswordFilter()
{
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -28,7 +28,7 @@
import org.apache.portals.bridges.portletfilter.PortletFilter;
import org.apache.portals.bridges.portletfilter.PortletFilterConfig;
-public class UserRegistrationFilter extends AbstractUserRegistrationFilter
+public class UserRegistrationFilter extends DefaultUserRegistrationFilter
implements PortletFilter
{
public UserRegistrationFilter()
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -471,18 +471,22 @@
user = new User();
user.setName(username);
user.setPassword(null);//TODO null?
- user.setUpdateRequired(credential.isUpdateRequired());
- user.setLastLogon(credential.getLastAuthenticationDate());
- user.setUserEnabled(credential.isEnabled());
- user.setExpirationDate(credential.getExpirationDate());
- if (credential.isExpired())
+ // not guest
+ if (credential != null)
{
- user.setExpires(PALAdminConstants.USER_CREDENTIAL_EXPIRED);
+ user.setUpdateRequired(credential.isUpdateRequired());
+ user.setLastLogon(credential.getLastAuthenticationDate());
+ user.setUserEnabled(credential.isEnabled());
+ user.setExpirationDate(credential.getExpirationDate());
+ if (credential.isExpired())
+ {
+ user.setExpires(PALAdminConstants.USER_CREDENTIAL_EXPIRED);
+ }
+ else
+ {
+ user.setExpires(PALAdminConstants.USER_CREDENTIAL_ACTIVE);
+ }
}
- else
- {
- user.setExpires(PALAdminConstants.USER_CREDENTIAL_ACTIVE);
- }
//TODO groups
//TODO roles
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-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -20,6 +20,7 @@
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.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;
@@ -128,7 +129,7 @@
}
}
- // Ok, we think we're good to go, let's create the user!
+ // we think we're good to go, let's create the user!
Map<String, String> userInfo = createUserInfoMap(page);
try
@@ -276,7 +277,7 @@
throw new CommonException("failed_to_send", "Could not send a mail.", e);
}
- //TODO this is currently hacked with a hashmap... needs to move to either a DB table
+ //TODO this is currently hacked with a hash map... needs to move to either a DB table
// or to some sort of credential
Map<String, String> map = new HashMap<String, String>();
map.put("user.name", userName);
@@ -394,6 +395,404 @@
return url;
}
+ public void loadPage(PublicPortalRegistrationUpdatePage page) throws CommonException
+ {
+ Principal userPrincipal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal();
+ if (userPrincipal == null)
+ {
+ throw new CommonException("could.not.find.your.credential", "User principal is null.");
+ }
+
+ User user;
+ try
+ {
+ user = PortalComponentUtil.getUserManager().getUser(userPrincipal.getName());
+ if (user == null)
+ {
+ throw new CommonException("could.not.find.your.account", "User is null.");
+ }
+ }
+ catch (SecurityException e)
+ {
+ throw new CommonException("could.not.find.your.account", "User is null.", e);
+ }
+
+ Preferences userAttributes = user.getUserAttributes();
+ updateUserInfo(page, userAttributes);
+ }
+
+ public void update(PublicPortalRegistrationUpdatePage page) throws CommonException
+ {
+ Principal userPrincipal = page.getFacesContext().getExternalContext().getUserPrincipal();
+ if (userPrincipal == null)
+ {
+ throw new CommonException("could.not.find.your.credential", "User principal is null.");
+ }
+
+ if (page.getPassword() != null && !page.getPassword().equals(""))
+ {
+ if (page.getPassword().equals(page.getVerifyPassword()))
+ {
+ try
+ {
+ PortalComponentUtil.getUserManager().setPassword(userPrincipal.getName(), null, page.getPassword());
+ }
+ catch (SecurityException e)
+ {
+ throw new CommonException("could.not.update.password", "Could not update a password.", e);
+ }
+ }
+ else
+ {
+ throw new CommonException("could.not.match.passwords", "Could not match passwords.");
+ }
+ }
+
+ User user;
+ try
+ {
+ user = PortalComponentUtil.getUserManager().getUser(userPrincipal.getName());
+ if (user == null)
+ {
+ throw new CommonException("could.not.find.your.account", "User is null.");
+ }
+ }
+ catch (SecurityException e)
+ {
+ throw new CommonException("could.not.find.your.account", "User is null.", e);
+ }
+
+ Preferences userAttributes = user.getUserAttributes();
+ Map<String, String> userInfo = createUserInfoMap(page);
+ for (Iterator<Map.Entry<String, String>> ite = userInfo.entrySet().iterator(); ite.hasNext();)
+ {
+ Map.Entry<String, String> entry = ite.next();
+ userAttributes.put(entry.getKey(), entry.getValue());
+ }
+
+ }
+
+ protected void updateUserInfo(UserRegistrationPage page, Preferences userAttributes)
+ {
+ if (userAttributes.get("user.business-info.online.email", null) != null)
+ {
+ page.setUserBusinessInfoOnlineEmail(userAttributes.get("user.business-info.online.email", ""));
+ }
+ if (userAttributes.get("user.name", null) != null)
+ {
+ page.setUserName(userAttributes.get("user.name", ""));
+ }
+ if (userAttributes.get("user.bdate", null) != null)
+ {
+ page.setUserBdate(userAttributes.get("user.bdate", ""));
+ }
+ if (userAttributes.get("user.gender", null) != null)
+ {
+ page.setUserGender(userAttributes.get("user.gender", ""));
+ }
+ if (userAttributes.get("user.employer", null) != null)
+ {
+ page.setUserEmployer(userAttributes.get("user.employer", ""));
+ }
+ if (userAttributes.get("user.department", null) != null)
+ {
+ page.setUserDepartment(userAttributes.get("user.department", ""));
+ }
+ if (userAttributes.get("user.jobtitle", null) != null)
+ {
+ page.setUserJobtitle(userAttributes.get("user.jobtitle", ""));
+ }
+ if (userAttributes.get("user.name.prefix", null) != null)
+ {
+ page.setUserNamePrefix(userAttributes.get("user.name.prefix", ""));
+ }
+ if (userAttributes.get("user.name.given", null) != null)
+ {
+ page.setUserNameGiven(userAttributes.get("user.name.given", ""));
+ }
+ if (userAttributes.get("user.name.family", null) != null)
+ {
+ page.setUserNameFamily(userAttributes.get("user.name.family", ""));
+ }
+ if (userAttributes.get("user.name.middle", null) != null)
+ {
+ page.setUserNameMiddle(userAttributes.get("user.name.middle", ""));
+ }
+ if (userAttributes.get("user.name.suffix", null) != null)
+ {
+ page.setUserNameSuffix(userAttributes.get("user.name.suffix", ""));
+ }
+ if (userAttributes.get("user.name.nickName", null) != null)
+ {
+ page.setUserNameNickName(userAttributes.get("user.name.nickName", ""));
+ }
+ if (userAttributes.get("user.home-info.postal.name", null) != null)
+ {
+ page.setUserHomeInfoPostalName(userAttributes.get("user.home-info.postal.name", ""));
+ }
+ if (userAttributes.get("user.home-info.postal.street", null) != null)
+ {
+ page.setUserHomeInfoPostalStreet(userAttributes.get("user.home-info.postal.street", ""));
+ }
+ if (userAttributes.get("user.home-info.postal.city", null) != null)
+ {
+ page.setUserHomeInfoPostalCity(userAttributes.get("user.home-info.postal.city", ""));
+ }
+ if (userAttributes.get("user.home-info.postal.stateprov", null) != null)
+ {
+ page.setUserHomeInfoPostalStateprov(userAttributes.get("user.home-info.postal.stateprov", ""));
+ }
+ if (userAttributes.get("user.home-info.postal.postalcode", null) != null)
+ {
+ page.setUserHomeInfoPostalPostalcode(userAttributes.get("user.home-info.postal.postalcode", ""));
+ }
+ if (userAttributes.get("user.home-info.postal.country", null) != null)
+ {
+ page.setUserHomeInfoPostalCountry(userAttributes.get("user.home-info.postal.country", ""));
+ }
+ if (userAttributes.get("user.home-info.postal.organization", null) != null)
+ {
+ page.setUserHomeInfoPostalOrganization(userAttributes.get("user.home-info.postal.organization", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.telephone.intcode", null) != null)
+ {
+ page.setUserHomeInfoTelecomTelephoneIntcode(userAttributes.get("user.home-info.telecom.telephone.intcode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.telephone.loccode", null) != null)
+ {
+ page.setUserHomeInfoTelecomTelephoneLoccode(userAttributes.get("user.home-info.telecom.telephone.loccode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.telephone.number", null) != null)
+ {
+ page.setUserHomeInfoTelecomTelephoneNumber(userAttributes.get("user.home-info.telecom.telephone.number", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.telephone.ext", null) != null)
+ {
+ page.setUserHomeInfoTelecomTelephoneExt(userAttributes.get("user.home-info.telecom.telephone.ext", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.telephone.comment", null) != null)
+ {
+ page.setUserHomeInfoTelecomTelephoneComment(userAttributes.get("user.home-info.telecom.telephone.comment", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.fax.intcode", null) != null)
+ {
+ page.setUserHomeInfoTelecomFaxIntcode(userAttributes.get("user.home-info.telecom.fax.intcode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.fax.loccode", null) != null)
+ {
+ page.setUserHomeInfoTelecomFaxLoccode(userAttributes.get("user.home-info.telecom.fax.loccode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.fax.number", null) != null)
+ {
+ page.setUserHomeInfoTelecomFaxNumber(userAttributes.get("user.home-info.telecom.fax.number", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.fax.ext", null) != null)
+ {
+ page.setUserHomeInfoTelecomFaxExt(userAttributes.get("user.home-info.telecom.fax.ext", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.fax.comment", null) != null)
+ {
+ page.setUserHomeInfoTelecomFaxComment(userAttributes.get("user.home-info.telecom.fax.comment", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.mobile.intcode", null) != null)
+ {
+ page.setUserHomeInfoTelecomMobileIntcode(userAttributes.get("user.home-info.telecom.mobile.intcode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.mobile.loccode", null) != null)
+ {
+ page.setUserHomeInfoTelecomMobileLoccode(userAttributes.get("user.home-info.telecom.mobile.loccode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.mobile.number", null) != null)
+ {
+ page.setUserHomeInfoTelecomMobileNumber(userAttributes.get("user.home-info.telecom.mobile.number", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.mobile.ext", null) != null)
+ {
+ page.setUserHomeInfoTelecomMobileExt(userAttributes.get("user.home-info.telecom.mobile.ext", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.mobile.comment", null) != null)
+ {
+ page.setUserHomeInfoTelecomMobileComment(userAttributes.get("user.home-info.telecom.mobile.comment", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.pager.intcode", null) != null)
+ {
+ page.setUserHomeInfoTelecomPagerIntcode(userAttributes.get("user.home-info.telecom.pager.intcode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.pager.loccode", null) != null)
+ {
+ page.setUserHomeInfoTelecomPagerLoccode(userAttributes.get("user.home-info.telecom.pager.loccode", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.pager.number", null) != null)
+ {
+ page.setUserHomeInfoTelecomPagerNumber(userAttributes.get("user.home-info.telecom.pager.number", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.pager.ext", null) != null)
+ {
+ page.setUserHomeInfoTelecomPagerExt(userAttributes.get("user.home-info.telecom.pager.ext", ""));
+ }
+ if (userAttributes.get("user.home-info.telecom.pager.comment", null) != null)
+ {
+ page.setUserHomeInfoTelecomPagerComment(userAttributes.get("user.home-info.telecom.pager.comment", ""));
+ }
+ if (userAttributes.get("user.home-info.online.email", null) != null)
+ {
+ page.setUserHomeInfoOnlineEmail(userAttributes.get("user.home-info.online.email", ""));
+ }
+ if (userAttributes.get("user.home-info.online.uri", null) != null)
+ {
+ page.setUserHomeInfoOnlineUri(userAttributes.get("user.home-info.online.uri", ""));
+ }
+ if (userAttributes.get("user.business-info.postal.name", null) != null)
+ {
+ page.setUserBusinessInfoPostalName(userAttributes.get("user.business-info.postal.name", ""));
+ }
+ if (userAttributes.get("user.business-info.postal.street", null) != null)
+ {
+ page.setUserBusinessInfoPostalStreet(userAttributes.get("user.business-info.postal.street", ""));
+ }
+ if (userAttributes.get("user.business-info.postal.city", null) != null)
+ {
+ page.setUserBusinessInfoPostalCity(userAttributes.get("user.business-info.postal.city", ""));
+ }
+ if (userAttributes.get("user.business-info.postal.stateprov", null) != null)
+ {
+ page.setUserBusinessInfoPostalStateprov(userAttributes.get("user.business-info.postal.stateprov", ""));
+ }
+ if (userAttributes.get("user.business-info.postal.postalcode", null) != null)
+ {
+ page.setUserBusinessInfoPostalPostalcode(userAttributes.get("user.business-info.postal.postalcode", ""));
+ }
+ if (userAttributes.get("user.business-info.postal.country", null) != null)
+ {
+ page.setUserBusinessInfoPostalCountry(userAttributes.get("user.business-info.postal.country", ""));
+ }
+ if (userAttributes.get("user.business-info.postal.organization", null) != null)
+ {
+ page.setUserBusinessInfoPostalOrganization(userAttributes.get("user.business-info.postal.organization", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.telephone.intcode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomTelephoneIntcode(userAttributes.get("user.business-info.telecom.telephone.intcode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.telephone.loccode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomTelephoneLoccode(userAttributes.get("user.business-info.telecom.telephone.loccode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.telephone.number", null) != null)
+ {
+ page.setUserBusinessInfoTelecomTelephoneNumber(userAttributes.get("user.business-info.telecom.telephone.number", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.telephone.ext", null) != null)
+ {
+ page.setUserBusinessInfoTelecomTelephoneExt(userAttributes.get("user.business-info.telecom.telephone.ext", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.telephone.comment", null) != null)
+ {
+ page.setUserBusinessInfoTelecomTelephoneComment(userAttributes.get("user.business-info.telecom.telephone.comment", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.fax.intcode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomFaxIntcode(userAttributes.get("user.business-info.telecom.fax.intcode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.fax.loccode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomFaxLoccode(userAttributes.get("user.business-info.telecom.fax.loccode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.fax.number", null) != null)
+ {
+ page.setUserBusinessInfoTelecomFaxNumber(userAttributes.get("user.business-info.telecom.fax.number", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.fax.ext", null) != null)
+ {
+ page.setUserBusinessInfoTelecomFaxExt(userAttributes.get("user.business-info.telecom.fax.ext", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.fax.comment", null) != null)
+ {
+ page.setUserBusinessInfoTelecomFaxComment(userAttributes.get("user.business-info.telecom.fax.comment", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.mobile.intcode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomMobileIntcode(userAttributes.get("user.business-info.telecom.mobile.intcode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.mobile.loccode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomMobileLoccode(userAttributes.get("user.business-info.telecom.mobile.loccode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.mobile.number", null) != null)
+ {
+ page.setUserBusinessInfoTelecomMobileNumber(userAttributes.get("user.business-info.telecom.mobile.number", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.mobile.ext", null) != null)
+ {
+ page.setUserBusinessInfoTelecomMobileExt(userAttributes.get("user.business-info.telecom.mobile.ext", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.mobile.comment", null) != null)
+ {
+ page.setUserBusinessInfoTelecomMobileComment(userAttributes.get("user.business-info.telecom.mobile.comment", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.pager.intcode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomPagerIntcode(userAttributes.get("user.business-info.telecom.pager.intcode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.pager.loccode", null) != null)
+ {
+ page.setUserBusinessInfoTelecomPagerLoccode(userAttributes.get("user.business-info.telecom.pager.loccode", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.pager.number", null) != null)
+ {
+ page.setUserBusinessInfoTelecomPagerNumber(userAttributes.get("user.business-info.telecom.pager.number", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.pager.ext", null) != null)
+ {
+ page.setUserBusinessInfoTelecomPagerExt(userAttributes.get("user.business-info.telecom.pager.ext", ""));
+ }
+ if (userAttributes.get("user.business-info.telecom.pager.comment", null) != null)
+ {
+ page.setUserBusinessInfoTelecomPagerComment(userAttributes.get("user.business-info.telecom.pager.comment", ""));
+ }
+ if (userAttributes.get("user.business-info.online.uri", null) != null)
+ {
+ page.setUserBusinessInfoOnlineUri(userAttributes.get("user.business-info.online.uri", ""));
+ }
+
+ if (page instanceof PublicPortalRegistrationUpdatePage)
+ {
+ PublicPortalRegistrationUpdatePage p = (PublicPortalRegistrationUpdatePage) page;
+ if (userAttributes.get("user.bdate.year", null) != null)
+ {
+ p.setUserBdateYear(userAttributes.getInt("user.bdate.year", 0));
+ }
+ if (userAttributes.get("user.bdate.month", null) != null)
+ {
+ p.setUserBdateMonth(userAttributes.getInt("user.bdate.month", 0));
+ }
+ if (userAttributes.get("user.bdate.date", null) != null)
+ {
+ p.setUserBdateDate(userAttributes.getInt("user.bdate.date", 0));
+ }
+ if (userAttributes.get("user.industry", null) != null)
+ {
+ p.setUserIndustry(userAttributes.get("user.industry", ""));
+ }
+ if (userAttributes.get("user.secret.question", null) != null)
+ {
+ p.setUserSecretQuestion(userAttributes.get("user.secret.question", ""));
+ }
+ if (userAttributes.get("user.secret.answer", null) != null)
+ {
+ p.setUserSecretAnswer(userAttributes.get("user.secret.answer", ""));
+ }
+ if (userAttributes.get("user.name.given.yomi", null) != null)
+ {
+ p.setUserNameGivenYomi(userAttributes.get("user.name.given.yomi", ""));
+ }
+ if (userAttributes.get("user.name.family.yomi", null) != null)
+ {
+ p.setUserNameFamilyYomi(userAttributes.get("user.name.family.yomi", ""));
+ }
+ }
+ }
+
protected Map<String, String> createUserInfoMap(UserRegistrationPage page)
{
Map<String, String> userInfo = new HashMap<String, String>();
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-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationPage.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -202,7 +202,7 @@
return null;
}
- public String initialize()
+ public Class initialize()
{
String filename = getLabelHelper().getLabelValue("termOfServiceFile");
if (filename == null)
@@ -259,7 +259,7 @@
return null;
}
- public String prerender()
+ public Class prerender()
{
return null;
}
Added: 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-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -0,0 +1,112 @@
+package jp.sf.pal.admin.web.registration;
+
+import java.io.Serializable;
+
+import javax.faces.internal.FacesMessageUtil;
+
+import org.seasar.framework.log.Logger;
+
+import jp.sf.pal.common.CommonException;
+
+public class PublicPortalRegistrationUpdatePage extends PublicPortalRegistrationPage implements Serializable
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2415175365437526156L;
+
+ /**
+ * Logger for this class
+ */
+ private static final Logger logger = Logger.getLogger(PublicPortalRegistrationPage.class);
+
+ public static final String userName_TRequiredValidator = null;
+
+ public static final String userName_lengthValidator = "minimum=6, maximum=32";
+
+ public static final String userNameFamily_TRequiredValidator = null;
+
+ public static final String userNameFamily_lengthValidator = " maximum=30";
+
+ public static final String userNameGiven_TRequiredValidator = null;
+
+ public static final String userNameGiven_lengthValidator = "maximum=30";
+
+ public static final String userNameFamilyYomi_TRequiredValidator = null;
+
+ public static final String userNameFamilyYomi_lengthValidator = " maximum=30";
+
+ public static final String userNameGivenYomi_TRequiredValidator = null;
+
+ public static final String userNameGivenYomi_lengthValidator = "maximum=30";
+
+ public static final String userHomeInfoPostalPostalcode_TRequiredValidator = null;
+
+ public static final String userHomeInfoPostalPostalcode_lengthValidator = "maximum=8";
+
+ public static final String userGender_TRequiredValidator = null;
+
+ public static final String userBdateYear_TRequiredValidator = null;
+
+ public static final String userBdateYear_TNumberLengthValidator = "integralMax=4";
+
+ public static final String userBdateMonth_TRequiredValidator = null;
+
+ public static final String userBdateMonth_TNumberLengthValidator = "integralMax=2";
+
+ public static final String userBdateDate_TRequiredValidator = null;
+
+ public static final String userBdateDate_TNumberLengthValidator = "integralMax=2";
+
+ public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null;
+
+ public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80";
+
+ public static final String userIndustry_TRequiredValidator = null;
+
+ public static final String userJobtitle_TRequiredValidator = null;
+
+ public static final String userSecretQuestion_TRequiredValidator = null;
+
+ public static final String userSecretQuestion_lengthValidator = "maximum=100";
+
+ public static final String userSecretAnswer_TRequiredValidator = null;
+
+ public static final String userSecretAnswer_lengthValidator = "maximum=100";
+
+ public Class doFinish()
+ {
+ try
+ {
+ getUserRegistrationService().update(this);
+ FacesMessageUtil.addInfoMessage("updated.user.info");
+ }
+ catch (CommonException e)
+ {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0001", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
+
+ public Class initialize()
+ {
+ return null;
+ }
+
+ public Class prerender()
+ {
+ try
+ {
+ getUserRegistrationService().loadPage(this);
+ }
+ catch (CommonException e)
+ {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0001", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
+
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java
___________________________________________________________________
Name: svn:eol-style
+ native
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-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2007-07-03 07:28:12 UTC (rev 207)
@@ -1020,12 +1020,12 @@
this.verifyPassword = verifyPassword;
}
- public String initialize()
+ public Class initialize()
{
return null;
}
- public String prerender()
+ public Class prerender()
{
return null;
}
Modified: pal-admin/trunk/src/main/resources/appMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-03 07:28:12 UTC (rev 207)
@@ -88,3 +88,8 @@
could.not.read.term.of.service=Could not read a term of service.
incorrect.scret.answer=Incorrect secret password.
+could.not.find.your.credential=Could not find your credntial. Please login and try again.
+could.not.find.your.account=Could not find your account. Please login and try again.
+could.not.match.passwords=Could not match password and verify passoword.
+could.not.update.password=Could not update a password. Please contact a site administrator.
+updated.user.info=Updated user information
Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-07-03 07:28:12 UTC (rev 207)
@@ -16,3 +16,8 @@
could.not.read.term.of.service=\u5229\u7528\u898f\u7d04\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
incorrect.scret.answer=\u300c\u79d8\u5bc6\u306e\u7b54\u3048\u300d\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
+could.not.find.your.credential=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002
+could.not.find.your.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u60c5\u5831\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002
+could.not.match.passwords=\u78ba\u8a8d\u7528\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5165\u529b\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u5185\u5bb9\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+could.not.update.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u66f4\u65b0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+updated.user.info=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties
===================================================================
Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties 2007-07-03 07:28:12 UTC (rev 207)
@@ -0,0 +1,5 @@
+# portlet info
+javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0
+javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0
+javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u66f4\u65b0,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
+
Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties 2007-07-03 07:28:12 UTC (rev 207)
@@ -1,5 +1,5 @@
# portlet info
-javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332
-javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332
-javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7,\u65b0\u898f\u30e6\u30fc\u30b6\u30fc
+javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0
+javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0
+javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u66f4\u65b0,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
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-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties 2007-07-03 07:28:12 UTC (rev 207)
@@ -169,3 +169,86 @@
publicPortalForgottenPasswordCompleted.forgottenPasswordAgain=\u518d\u5ea6\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c\u3092\u884c\u3046\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
publicPortalForgottenPasswordCompleted.forgottenPasswordLink=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c
+# Public Portal Registration Update
+publicPortalRegistrationUpdate.requiredDescription=\u304c\u3064\u3044\u3066\u3044\u308b\u9805\u76ee\u306f\u304b\u306a\u3089\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+publicPortalRegistrationUpdate.userIdTitle=\u30e6\u30fc\u30b6\u30fc ID \u306e\u5165\u529b
+publicPortalRegistrationUpdate.typeUserId=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fc ID \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+publicPortalRegistrationUpdate.userId=\u30e6\u30fc\u30b6\u30fc ID
+publicPortalRegistrationUpdate.userIdCondition= (6\u301c32\u5b57\u306e\u534a\u89d2\u82f1\u6570\u5b57)
+publicPortalRegistrationUpdate.userIdExample= (\u4f8b\uff1ahoge2000\u3001foo777\u306a\u3069)
+publicPortalRegistrationUpdate.userIdHint=\u30e6\u30fc\u30b6\u30fc ID \u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8
+publicPortalRegistrationUpdate.userIdBeginWithAlphabet=\u6700\u521d\u306e\u6587\u5b57\u306f\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8
+publicPortalRegistrationUpdate.underscoreAvailable=\u8a18\u53f7\u306f\u3001\u30a2\u30f3\u30c0\u30fc\u30d0\u30fc ( _ ) \u306e\u307f\u4f7f\u7528\u53ef\u80fd\u3067\u3059
+publicPortalRegistrationUpdate.userInfoTitle=\u304a\u5ba2\u69d8\u60c5\u5831\u306e\u5165\u529b
+publicPortalRegistrationUpdate.typeUserInfo=\u30e6\u30fc\u30b6\u30fc ID \u3084\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u5834\u5408\u306b\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5143\u306b\u672c\u4eba\u78ba\u8a8d\u3092\u884c\u3044\u307e\u3059\u3002\u6b63\u78ba\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+publicPortalRegistrationUpdate.userHomeInfoPostalPostalcode=\u90f5\u4fbf\u756a\u53f7
+publicPortalRegistrationUpdate.userHomeInfoPostalPostalcodeCondition= (\u534a\u89d2\u6570\u5b57\uff17\u6841)
+publicPortalRegistrationUpdate.userHomeInfoPostalPostalcodeExample= (\u4f8b\uff1a123-0001\u30011230001)
+publicPortalRegistrationUpdate.userGender=\u6027\u5225
+publicPortalRegistrationUpdate.male=\u7537\u6027
+publicPortalRegistrationUpdate.female=\u5973\u6027
+publicPortalRegistrationUpdate.userBdate=\u751f\u5e74\u6708\u65e5
+publicPortalRegistrationUpdate.userBdateYear=\u5e74
+publicPortalRegistrationUpdate.userBdateMonth=\u6708
+publicPortalRegistrationUpdate.userBdateDate=\u65e5
+publicPortalRegistrationUpdate.userBusinessInfoOnlineEmail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9
+publicPortalRegistrationUpdate.userBusinessInfoOnlineEmailCondition= (\u534a\u89d2)
+publicPortalRegistrationUpdate.userIndustry=\u696d\u7a2e
+publicPortalRegistrationUpdate.ComputerInternet=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u7ba1\u7406/\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8)
+publicPortalRegistrationUpdate.ComputerHardware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30cf\u30fc\u30c9\u30a6\u30a8\u30a2)
+publicPortalRegistrationUpdate.ComputerSoftware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30bd\u30d5\u30c8\u30a6\u30a8\u30a2)
+publicPortalRegistrationUpdate.Research=\u6559\u80b2/\u7814\u7a76
+publicPortalRegistrationUpdate.Engineering=\u30a8\u30f3\u30b8\u30cb\u30a2/\u5efa\u7bc9
+publicPortalRegistrationUpdate.Finance=\u9280\u884c/\u91d1\u878d/\u4e0d\u52d5\u7523
+publicPortalRegistrationUpdate.Manufacturing=\u88fd\u9020/\u6d41\u901a
+publicPortalRegistrationUpdate.Service=\u30b5\u30fc\u30d3\u30b9
+publicPortalRegistrationUpdate.Healthcare=\u533b\u85ac/\u5065\u5eb7
+publicPortalRegistrationUpdate.Publication=\u5a2f\u697d/\u30e1\u30c7\u30a3\u30a2/\u51fa\u7248
+publicPortalRegistrationUpdate.Travel=\u65c5\u884c/\u63a5\u5ba2\u696d
+publicPortalRegistrationUpdate.Retail=\u5c0f\u58f2/\u5378\u58f2
+publicPortalRegistrationUpdate.Nonprofit=\u975e\u55b6\u5229\u56e3\u4f53
+publicPortalRegistrationUpdate.Government=\u653f\u5e9c/\u81ea\u6cbb\u4f53
+publicPortalRegistrationUpdate.Law=\u6cd5\u5f8b
+publicPortalRegistrationUpdate.unemployed=\u7121\u8077
+publicPortalRegistrationUpdate.other=\u305d\u306e\u4ed6
+publicPortalRegistrationUpdate.userJobtitle=\u8077\u7a2e
+publicPortalRegistrationUpdate.Officer=\u5f79\u54e1/\u7ba1\u7406\u8077
+publicPortalRegistrationUpdate.Specialist=\u5c02\u9580\u8077 (\u533b\u5e2b\u3001\u5f01\u8b77\u58eb\u7b49)
+publicPortalRegistrationUpdate.Teacher=\u6559\u54e1
+publicPortalRegistrationUpdate.ComputerEngineer=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u9023\u6280\u8853\u8005
+publicPortalRegistrationUpdate.Engineer=\u305d\u306e\u4ed6\u6280\u8853\u8005
+publicPortalRegistrationUpdate.Support=\u30b5\u30fc\u30d3\u30b9/\u30ab\u30b9\u30bf\u30de\u30fc\u30b5\u30dd\u30fc\u30c8
+publicPortalRegistrationUpdate.Administrative=\u4e8b\u52d9\u8077
+publicPortalRegistrationUpdate.Sales=\u55b6\u696d/\u30de\u30fc\u30b1\u30c6\u30a3\u30f3\u30b0
+publicPortalRegistrationUpdate.Salesclerk=\u8ca9\u58f2\u54e1
+publicPortalRegistrationUpdate.Student=\u5927\u5b66\u751f/\u5927\u5b66\u9662\u751f
+publicPortalRegistrationUpdate.Kid=\u5c0f/\u4e2d/\u9ad8\u6821\u751f
+publicPortalRegistrationUpdate.Homemaker=\u4e3b\u5a66
+publicPortalRegistrationUpdate.SelfEmployed=\u81ea\u55b6\u696d
+publicPortalRegistrationUpdate.retirement=\u5b9a\u5e74\u9000\u8077\u8005
+publicPortalRegistrationUpdate.userInfoHint=\u304a\u5ba2\u69d8\u60c5\u5831\u306b\u9593\u3059\u308b\u30d2\u30f3\u30c8
+publicPortalRegistrationUpdate.liveInOversea=\u6d77\u5916\u5728\u4f4f\u306e\u65b9\u306f\u3001000-0000\u3068\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044
+publicPortalRegistrationUpdate.bdataYearDescription=\u751f\u5e74\u6708\u65e5\u306e\u5e74\u306f\u897f\u66a6\u3067\u304a\u9858\u3044\u3057\u307e\u3059
+publicPortalRegistrationUpdate.aboutEmail=\u767b\u9332\u3059\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u3092\u5229\u7528\u3057\u3066\u3044\u305f\u3060\u304f\u4e0a\u3067\u3001\u91cd\u8981\u306a\u304a\u77e5\u3089\u305b\u306a\u3069\u3092\u304a\u9001\u308a\u3059\u308b\u305f\u3081\u306e\u300c\u767b\u9332\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u300d \u306b\u306a\u308a\u307e\u3059\u3002\u9023\u7d61\u53ef\u80fd\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044
+publicPortalRegistrationUpdate.userSecretQATitle=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048
+publicPortalRegistrationUpdate.userSecretQADescription=\u30d1\u30b9\u30ef\u30fc\u30c9\u518d\u767a\u884c\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3067\u3059\u3002\u3042\u306a\u305f\u3057\u304b\u77e5\u3089\u306a\u3044\u8cea\u554f\u3068\u7b54\u3048\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+publicPortalRegistrationUpdate.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f
+publicPortalRegistrationUpdate.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048
+publicPortalRegistrationUpdate.userSecretQAHint=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8
+publicPortalRegistrationUpdate.aboutCharacters=\u79d8\u5bc6\u306e\u7b54\u3048\u306f\u3001\u3072\u3089\u304c\u306a\u3001\u30ab\u30bf\u30ab\u30ca\u3001\u5927\u6587\u5b57\u3001\u5c0f\u6587\u5b57\u3001\u534a\u89d2\u3001\u5168\u89d2\u3067\u533a\u5225\u3055\u308c\u307e\u3059
+publicPortalRegistrationUpdate.SignUp=\u66f4\u65b0
+publicPortalRegistrationUpdate.termOfService=\u5229\u7528\u898f\u7d04
+publicPortalRegistrationUpdate.name=\u6c0f\u540d
+publicPortalRegistrationUpdate.userNameFamily= (\u59d3)
+publicPortalRegistrationUpdate.userNameGiven= (\u540d)
+publicPortalRegistrationUpdate.nameYomi=\u6c0f\u540d(\u3075\u308a\u304c\u306a)
+publicPortalRegistrationUpdate.userNameFamilyYomi= (\u59d3)
+publicPortalRegistrationUpdate.userNameGivenYomi= (\u540d)
+publicPortalRegistrationUpdate.userPasswordTitle=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u66f4\u65b0
+publicPortalRegistrationUpdate.typeUserPassword=\u66f4\u65b0\u3059\u308b\u5834\u5408\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+publicPortalRegistrationUpdate.passowrd=\u30d1\u30b9\u30ef\u30fc\u30c9
+publicPortalRegistrationUpdate.verifyPassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u78ba\u8a8d
+publicPortalRegistrationUpdate.passwordCondition=\uff086\u301c80\u5b57\u306e\u6587\u5b57\uff09
+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
+
Modified: pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-07-03 07:28:12 UTC (rev 207)
@@ -44,6 +44,10 @@
<js:metadata name="merge.portal.parameters.with.portlet.parameters">true</js:metadata>
<js:metadata name="merge.portal.parameters.before.portlet.parameters">true</js:metadata>
</portlet>
+ <portlet>
+ <portlet-name>PublicPortalRegistrationUpdatePortlet</portlet-name>
+ <js:security-constraint-ref>public-view</js:security-constraint-ref>
+ </portlet>
<js:services>
<js:service name="SecurityProvider"/>
<js:service name="UserManager"/>
Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-07-03 07:28:12 UTC (rev 207)
@@ -213,7 +213,7 @@
<description>Provides users with the ability register as a new user with the public portal.</description>
<description xml:lang="ja">ポータルの新規登録する機能を提供します。</description>
<portlet-name>PublicPortalRegistrationPortlet</portlet-name>
- <display-name>Public Portal Registration</display-name>
+ <display-name>Registration For Public Portal</display-name>
<display-name xml:lang="ja">一般公開用ユーザー登録</display-name>
<portlet-class>org.apache.portals.bridges.portletfilter.FilterPortlet</portlet-class>
<init-param>
@@ -286,7 +286,7 @@
<description>Provides users with the ability to request a new password to be sent to their email address.</description>
<description xml:lang="ja">ユーザーに新規パスワードをメールアドレスに送信要求をする機能を提供します。</description>
<portlet-name>PublicPortalForgottenPasswordPortlet</portlet-name>
- <display-name>Public Portal Forgotten Password</display-name>
+ <display-name>Forgotten Password for Public Portal</display-name>
<display-name xml:lang="ja">一般公開用パスワード再発行</display-name>
<portlet-class>org.apache.portals.bridges.portletfilter.FilterPortlet</portlet-class>
<init-param>
@@ -329,4 +329,37 @@
<keywords>tools,users,password,forgotten,lost,passwd</keywords>
</portlet-info>
</portlet>
+ <portlet>
+ <description>Provides features for changing user information of the current, logged on user.</description>
+ <description xml:lang="ja">現在ログインしているユーザーの情報を変更するための機能を提供します。</description>
+ <portlet-name>PublicPortalRegistrationUpdatePortlet</portlet-name>
+ <display-name>Update User Information for Public Portal</display-name>
+ <display-name xml:lang="ja">一般公開用ユーザー更新</display-name>
+ <portlet-class>org.apache.portals.bridges.portletfilter.FilterPortlet</portlet-class>
+ <init-param>
+ <name>portlet-class</name>
+ <value>org.seasar.teeda.core.portlet.FacesPortlet</value>
+ </init-param>
+ <init-param>
+ <name>portlet-filters</name>
+ <value>jp.sf.pal.admin.filter.DefaultUserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter</value>
+ </init-param>
+ <init-param>
+ <name>view-page</name>
+ <value>/view/registration/publicPortalRegistrationUpdate.html</value>
+ </init-param>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>ja</supported-locale>
+ <resource-bundle>jp.sf.pal.admin.web.registration.UserRegistrationUpdate</resource-bundle>
+ <portlet-info>
+ <title>Update User Information</title>
+ <short-title>Information Update</short-title>
+ <keywords>Update</keywords>
+ </portlet-info>
+ </portlet>
</portlet-app>
Added: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html 2007-07-03 02:24:34 UTC (rev 206)
+++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html 2007-07-03 07:28:12 UTC (rev 207)
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:te="http://www.seasar.org/teeda/extension">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link rel="stylesheet" type="text/css" href="../../css/global.css" />
+ </head>
+ <body>
+ <form id="UserRegistrationUpdateForm">
+ <div>
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+ </div>
+ <div class="portlet-form-label">
+ <font color="#FF3F0C">*</font>
+ <label id="requiredDescriptionLabel">がついている項目はかならず入力してください。</label>
+ </div>
+ <div style="margin:10px 0px;" class="portlet-section-header">
+ <label id="userPasswordTitleLabel">ユーザー ID の入力</label>
+ </div>
+ <div style="float:left;width:530px;" class="portlet-form-label">
+ <label id="typeUserPasswordLabel">ご希望のユーザー ID を入力してください。</label>
+ <table>
+ <tbody>
+ <tr>
+ <td align="right" width="25%"><label id="passwordLabel" class="portlet-form-field-label">ユーザー ID</label>:
+ </td>
+ <td width="75%">
+ <input id="password" type="password" class="portlet-form-input-field" size="24" />
+ <label id="passwordConditionLabel" class="portlet-form-label">（6〜32字の半角英数字）</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><label id="verifyPasswordLabel" class="portlet-form-field-label">ユーザー ID</label>:
+ </td>
+ <td width="75%">
+ <input id="verifyPassword" type="password" class="portlet-form-input-field" size="24" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div style="float:right;width:230px;background:#eeeeee;" class="portlet-form-label">
+ <div>
+ <label id="userPasswordHintLabel">ユーザー ID に関するヒント</label>
+ </div>
+ <ul>
+ <li class="portlet-form-label">
+ <label id="charAvailableLabel">文字は半角英数字が利用可能</label>
+ </li>
+ <li class="portlet-form-label">
+ <label id="underscoreAvailableLabel">記号は、アンダーバー（ _ ）のみ使用可能です</label>
+ </li>
+ </ul>
+ </div>
+ <br style="margin:10px;clear:both;" />
+ <div style="margin:10px 0px;" class="portlet-section-header">
+ <label id="userInfoTitleLabel">お客様情報の入力</label>
+ </div>
+ <div style="float:left;width:530px;" class="portlet-form-label">
+ <label id="typeUserInfoLabel">ユーザー ID やパスワードをお忘れの場合に、以下の情報を元に本人確認を行います。正確に入力してください。</label>
+ <table>
+ <tbody>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="nameLabel" class="portlet-form-field-label">氏名</label>:
+ </td>
+ <td width="75%">
+ <label id="userNameFamilyLabel" class="portlet-form-label">（姓）</label>
+ <input id="userNameFamily" type="text" class="portlet-form-input-field" size="10" />
+ <label id="userNameGivenLabel" class="portlet-form-label">（名）</label>
+ <input id="userNameGiven" type="text" class="portlet-form-input-field" size="10" />
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="nameYomiLabel" class="portlet-form-field-label">氏名</label>:
+ </td>
+ <td width="75%">
+ <label id="userNameFamilyYomiLabel" class="portlet-form-label">（姓）</label>
+ <input id="userNameFamilyYomi" type="text" class="portlet-form-input-field" size="10" />
+ <label id="userNameGivenYomiLabel" class="portlet-form-label">（名）</label>
+ <input id="userNameGivenYomi" type="text" class="portlet-form-input-field" size="10" />
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userHomeInfoPostalPostalcodeLabel" class="portlet-form-field-label">郵便番号</label>:
+ </td>
+ <td width="75%">
+ <input id="userHomeInfoPostalPostalcode" type="text" class="portlet-form-input-field" size="8" />
+ <label id="userHomeInfoPostalPostalcodeConditionLabel" class="portlet-form-label">（半角数字７桁）</label>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <label id="userHomeInfoPostalPostalcodeExampleLabel" class="portlet-form-label">（例：123-0001、1230001）</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userGenderLabel" class="portlet-form-field-label">性別</label>:
+ </td>
+ <td width="75%">
+ <span id="userGender">
+ <input type="radio" name="userGender" value="M" />
+ <label id="maleLabel">男性</label>
+ <input type="radio" name="userGender" value="F" />
+ <label id="femaleLabel">女性</label>
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userBdateLabel" class="portlet-form-field-label">生年月日</label>:
+ </td>
+ <td width="75%">
+ <input id="userBdateYear" type="text" class="portlet-form-input-field" size="4" />
+ <label id="userBdateYearLabel" class="portlet-form-field-label">年</label>
+ <input id="userBdateMonth" type="text" class="portlet-form-input-field" size="2" />
+ <label id="userBdateMonthLabel" class="portlet-form-field-label">月</label>
+ <input id="userBdateDate" type="text" class="portlet-form-input-field" size="2" />
+ <label id="userBdateDateLabel" class="portlet-form-field-label">日</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userBusinessInfoOnlineEmailLabel" class="portlet-form-field-label">メールアドレス</label>:
+ </td>
+ <td width="75%">
+ <input id="userBusinessInfoOnlineEmail" type="text" class="portlet-form-input-field" size="24" />
+ <label id="userBusinessInfoOnlineEmailConditionLabel" class="portlet-form-label">（半角）</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userIndustryLabel" class="portlet-form-field-label">業種</label>:
+ </td>
+ <td width="75%">
+ <span id="userIndustry">
+ <input type="radio" name="userIndustry" value="ComputerInternet" />
+ <label id="ComputerInternetLabel">コンピュータ関係（管理/インターネット）</label>
+ <br />
+ <input type="radio" name="userIndustry" value="ComputerHardware" />
+ <label id="ComputerHardwareLabel">コンピュータ関係（ハードウエア）</label>
+ <br />
+ <input type="radio" name="userIndustry" value="ComputerSoftware" />
+ <label id="ComputerSoftwareLabel">コンピュータ関係（ソフトウエア）</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Research" />
+ <label id="ResearchLabel">教育/研究</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Engineering" />
+ <label id="EngineeringLabel">エンジニア/建築</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Finance" />
+ <label id="FinanceLabel">銀行/金融/不動産</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Manufacturing" />
+ <label id="ManufacturingLabel">製造/流通</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Service" />
+ <label id="ServiceLabel">サービス</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Healthcare" />
+ <label id="HealthcareLabel">医薬/健康</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Publication" />
+ <label id="PublicationLabel">娯楽/メディア/出版</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Travel" />
+ <label id="TravelLabel">旅行/接客業</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Retail" />
+ <label id="RetailLabel">小売/卸売</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Nonprofit" />
+ <label id="NonprofitLabel">非営利団体</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Government" />
+ <label id="GovernmentLabel">政府/自治体</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Law" />
+ <label id="LawLabel">法律</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Unemployed" />
+ <label id="unemployedLabel-userIndustry">無職</label>
+ <br />
+ <input type="radio" name="userIndustry" value="Other" />
+ <label id="otherLabel-userIndustry">その他</label>
+ <br />
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userJobtitleLabel" class="portlet-form-field-label">職種</label>:
+ </td>
+ <td width="75%">
+ <span id="userJobtitle">
+ <input type="radio" name="userJobtitle" value="Officer" />
+ <label id="OfficerLabel">役員/管理職</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Specialist" />
+ <label id="SpecialistLabel">専門職（医師、弁護士等）</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Teacher" />
+ <label id="TeacherLabel">教員</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="ComputerEngineer" />
+ <label id="ComputerEngineerLabel">コンピュータ関連技術者</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Engineer" />
+ <label id="EngineerLabel">その他技術者</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Support" />
+ <label id="SupportLabel">サービス/カスタマーサポート</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Administrative" />
+ <label id="AdministrativeLabel">事務職</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Sales" />
+ <label id="SalesLabel">営業/マーケティング</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Salesclerk" />
+ <label id="SalesclerkLabel">販売員</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Student" />
+ <label id="StudentLabel">大学生/大学院生</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Kid" />
+ <label id="KidLabel">小/中/高校生</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Homemaker" />
+ <label id="HomemakerLabel">主婦</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="SelfEmployed" />
+ <label id="SelfEmployedLabel">自営業</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Unemployed" />
+ <label id="unemployedLabel-userJobtitle">無職</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Retirement" />
+ <label id="retirementLabel">定年退職者</label>
+ <br />
+ <input type="radio" name="userJobtitle" value="Other" />
+ <label id="otherLabel-userJobtitle">その他</label>
+ <br />
+ </span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div style="float:right;width:230px;background:#eeeeee;" class="portlet-form-label">
+ <div>
+ <label id="userInfoHintLabel">お客様情報に関するヒント</label>
+ </div>
+ <ul>
+ <li class="portlet-form-label">
+ <label id="liveInOverseaLabel">海外在住の方は、000-0000と入力してください</label>
+ </li>
+ <li class="portlet-form-label">
+ <label id="bdataYearDescriptionLabel">生年月日の年は西暦でお願いします</label>
+ </li>
+ <li class="portlet-form-label">
+ <label id="aboutEmailLabel">登録するメールアドレスは、サービスを利用していただく上で、重要なお知らせなどをお送りするための「登録メールアドレス」になります。連絡可能なメールアドレスを入力してください</label>
+ </li>
+ </ul>
+ </div>
+ <br style="margin:10px;clear:both;" />
+ <div style="margin:10px 0px;" class="portlet-section-header">
+ <label id="userSecretQATitleLabel">秘密の質問と答え</label>
+ </div>
+ <div style="float:left;width:530px;" class="portlet-form-label">
+ <label id="userSecretQADescriptionLabel">パスワード再発行に必要な情報です。あなたしか知らない質問と答えを設定してください。
+一度設定した秘密の質問と答えは変更できませんので、ご注意ください。</label>
+ <table>
+ <tbody>
+ <tr>
+ <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userSecretQuestionLabel" class="portlet-form-field-label">秘密の質問</label>:
+ </td>
+ <td width="75%">
+ <input id="userSecretQuestion" type="text" class="portlet-form-input-field" size="24" />
+ </td>
+ </tr>
+ <tr>
+ <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>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div style="float:right;width:230px;background:#eeeeee;" class="portlet-form-label">
+ <div>
+ <label id="userSecretQAHintLabel">ユーザー ID に関するヒント</label>
+ </div>
+ <ul>
+ <li class="portlet-form-label">
+ <label id="aboutCharactersLabel">秘密の答えは、ひらがな、カタカナ、大文字、小文字、半角、全角で区別されます</label>
+ </li>
+ </ul>
+ </div>
+ <hr style="margin:10px;clear:both;" />
+ <div style="text-align:center;">
+ <input type="button" id="doFinish" value="更新" onclick="location.href='userRegistrationUpdate.html'" class="portlet-form-button" />
+ </div>
+ </form>
+ </body>
+</html>
Property changes on: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html
___________________________________________________________________
Name: svn:eol-style
+ native