[pal-cvs 3155] [891] removed unneeded portlets.

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2008年 4月 27日 (日) 07:50:43 JST


Revision: 891
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=891
Author:   shinsuke
Date:     2008-04-27 07:50:43 +0900 (Sun, 27 Apr 2008)

Log Message:
-----------
removed unneeded portlets.

Modified Paths:
--------------
    pal-admin/trunk/.classpath
    pal-admin/trunk/pom.xml
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java
    pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml
    pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml

Removed Paths:
-------------
    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/PortalRegistrationCompletedPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.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/withdraw/
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties
    pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html
    pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html
    pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html
    pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html
    pal-admin/trunk/src/main/webapp/view/withdraw/


-------------- next part --------------
Modified: pal-admin/trunk/.classpath
===================================================================
--- pal-admin/trunk/.classpath	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/.classpath	2008-04-26 22:50:43 UTC (rev 891)
@@ -16,7 +16,7 @@
   <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.12-sp1/teeda-tiger-1.0.12-sp1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-api/2.1.2_pal-1.0-beta6/jetspeed-api-2.1.2_pal-1.0-beta6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-api/2.1.3_pal-1.0.3/jetspeed-api-2.1.3_pal-1.0.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.20/s2-framework-2.4.20.jar"/>
@@ -26,7 +26,7 @@
   <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.13-rc1/teeda-extension-1.0.13-rc1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-locator/2.1.2_pal-1.0-beta6/jetspeed-locator-2.1.2_pal-1.0-beta6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-locator/2.1.3_pal-1.0.3/jetspeed-locator-2.1.3_pal-1.0.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.13-rc1/teeda-ajax-1.0.13-rc1.jar"/>
   <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070908/ognl-2.6.9-patch-20070908.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar"/>

Modified: pal-admin/trunk/pom.xml
===================================================================
--- pal-admin/trunk/pom.xml	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/pom.xml	2008-04-26 22:50:43 UTC (rev 891)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>jp.sf.pal</groupId>
   <artifactId>pal-admin</artifactId>
-  <version>0.7</version>
+  <version>1.0</version>
   <packaging>war</packaging>
   <name>Administration tools for PAL Portal</name>
   <description/>
@@ -141,12 +141,12 @@
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-core</artifactId>
-      <version>1.0.13-rc4</version>
+      <version>1.0.13</version>
     </dependency>
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-extension</artifactId>
-      <version>1.0.13-rc4</version>
+      <version>1.0.13</version>
       <exclusions>
         <exclusion>
           <groupId>org.seasar.teeda</groupId>
@@ -157,7 +157,7 @@
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-tiger</artifactId>
-      <version>1.0.13-rc4</version>
+      <version>1.0.13</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -243,7 +243,7 @@
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed-api</artifactId>
-      <version>2.1.2_pal-1.0-beta6</version>
+      <version>2.1.3_pal-1.0.3</version>
 <!-- PORTLET DEV: BEGIN -->
       <scope>provided</scope>
 <!-- PORTLET DEV: END -->
@@ -251,7 +251,7 @@
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed-locator</artifactId>
-      <version>2.1.2_pal-1.0-beta6</version>
+      <version>2.1.3_pal-1.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.pluto</groupId>
@@ -264,12 +264,12 @@
     <dependency>
       <groupId>org.seasar.container</groupId>
       <artifactId>s2-framework</artifactId>
-      <version>2.4.23</version>
+      <version>2.4.24</version>
     </dependency>
     <dependency>
       <groupId>org.seasar.container</groupId>
       <artifactId>s2-extension</artifactId>
-      <version>2.4.23</version>
+      <version>2.4.24</version>
       <exclusions>
         <exclusion>
           <groupId>log4j</groupId>
@@ -280,7 +280,7 @@
     <dependency>
       <groupId>org.seasar.container</groupId>
       <artifactId>s2-tiger</artifactId>
-      <version>2.4.23</version>
+      <version>2.4.24</version>
       <exclusions>
         <exclusion>
           <groupId>org.easymock</groupId>

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -59,4 +59,9 @@
         return name;
     }
 
+    public boolean isMapping() {
+        // TODO this method is added in j2 2.1.3. needs to check if true is needed.
+        return false;
+    }
+
 }

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	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -34,25 +34,20 @@
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
-import javax.security.auth.Subject;
 
 import jp.sf.pal.admin.PALAdminConstants;
 import jp.sf.pal.admin.util.PALAdminUtil;
 import jp.sf.pal.admin.util.PortalComponentUtil;
 import jp.sf.pal.admin.util.UserRegistrationUtil;
 import jp.sf.pal.admin.web.registration.AbstractForgottenPasswordPage;
-import jp.sf.pal.admin.web.registration.AbstractPublicPortalRegistrationPage;
 import jp.sf.pal.admin.web.registration.AbstractResetPasswordPage;
 import jp.sf.pal.admin.web.registration.AbstractUserRegistrationPage;
-import jp.sf.pal.admin.web.registration.PublicPortalSecretAnswerPage;
-import jp.sf.pal.admin.web.withdraw.PublicPortalWithdrawalConfirmPage;
 import jp.sf.pal.common.CommonException;
 
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.administration.AdministrationEmailException;
 import org.apache.jetspeed.administration.RegistrationException;
-import org.apache.jetspeed.audit.AuditActivity;
 import org.apache.jetspeed.locator.JetspeedTemplateLocator;
 import org.apache.jetspeed.locator.LocatorDescriptor;
 import org.apache.jetspeed.locator.TemplateDescriptor;
@@ -61,14 +56,12 @@
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.FolderNotFoundException;
 import org.apache.jetspeed.om.folder.InvalidFolderException;
-import org.apache.jetspeed.page.FolderNotRemovedException;
 import org.apache.jetspeed.page.FolderNotUpdatedException;
 import org.apache.jetspeed.page.PageManager;
 import org.apache.jetspeed.page.document.NodeException;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.SecurityException;
 import org.apache.jetspeed.security.User;
-import org.apache.jetspeed.security.UserManager;
 import org.apache.jetspeed.security.UserPrincipal;
 import org.seasar.teeda.extension.util.LabelHelper;
 
@@ -277,45 +270,6 @@
 
     }
 
-    public void setSecretQuestion(PublicPortalSecretAnswerPage page)
-            throws CommonException {
-        User user = null;
-        try {
-            user = PortalComponentUtil.getPortalAdministration()
-                    .lookupUserFromEmail(page.getEmail());
-        } catch (Exception e) {
-            page.setUserSecretQuestion(page.getLabelHelper().getLabelValue(
-                    "secretQuestion.1"));
-            throw new CommonException("forgotten.email_address_not_found",
-                    "The email is not found..", e);
-        }
-
-        page.setUserSecretQuestion(user.getUserAttributes().get(
-                "user.secret.question", "-"));
-    }
-
-    public boolean checkSecretAnswer(PublicPortalSecretAnswerPage page)
-            throws CommonException {
-        User user = null;
-        try {
-            user = PortalComponentUtil.getPortalAdministration()
-                    .lookupUserFromEmail(page.getEmail());
-        } catch (Exception e) {
-            throw new CommonException("forgotten.email_address_not_found",
-                    "The email is not found..", e);
-        }
-
-        String userSecretAnswer = user.getUserAttributes().get(
-                "user.secret.answer", "");
-        if (userSecretAnswer.equals(page.getUserSecretAnswer())) {
-            return true;
-        } else if (page.getUserSecretAnswer() == null
-                && userSecretAnswer.equals("")) {
-            return true;
-        }
-        return false;
-    }
-
     public void sendNewPassword(AbstractForgottenPasswordPage page)
             throws CommonException {
 
@@ -500,92 +454,6 @@
         return url;
     }
 
-    public void loadPage(AbstractPublicPortalRegistrationPage 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(AbstractPublicPortalRegistrationPage 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());
-                    // audit
-                    PortalComponentUtil.getAuditActivity().logUserActivity(
-                            userPrincipal.getName(), getIPAddress(),
-                            AuditActivity.PASSWORD_CHANGE_SUCCESS,
-                            PALAdminConstants.USER_ADMINISTRATION_ACTIVITY);
-                } 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.");
-            }
-
-            // refresh/update Subject in session
-            Subject subject = user.getSubject();
-            RequestContext requestContext = (RequestContext) FacesContext
-                    .getCurrentInstance().getExternalContext().getRequestMap()
-                    .get(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-            requestContext.setSessionAttribute(
-                    PortalReservedParameters.SESSION_KEY_SUBJECT, subject);
-        } 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 String getIPAddress() {
         RequestContext requestContext = (RequestContext) FacesContext
                 .getCurrentInstance().getExternalContext().getRequestMap().get(
@@ -882,38 +750,6 @@
                     "user.business-info.online.uri", ""));
         }
 
-        if (page instanceof AbstractPublicPortalRegistrationPage) {
-            AbstractPublicPortalRegistrationPage p = (AbstractPublicPortalRegistrationPage) 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(
@@ -1189,106 +1025,6 @@
                     .getUserBusinessInfoOnlineUri());
         }
 
-        if (page instanceof AbstractPublicPortalRegistrationPage) {
-            AbstractPublicPortalRegistrationPage p = (AbstractPublicPortalRegistrationPage) page;
-            if (p.getUserBdateYear() != null) {
-                userInfo
-                        .put("user.bdate.year", p.getUserBdateYear().toString());
-            }
-            if (p.getUserBdateMonth() != null) {
-                userInfo.put("user.bdate.month", p.getUserBdateMonth()
-                        .toString());
-            }
-            if (p.getUserBdateDate() != null) {
-                userInfo
-                        .put("user.bdate.date", p.getUserBdateDate().toString());
-            }
-            if (p.getUserIndustry() != null) {
-                userInfo.put("user.industry", p.getUserIndustry());
-            }
-            if (p.getUserSecretQuestion() != null) {
-                userInfo.put("user.secret.question", p.getUserSecretQuestion());
-            }
-            if (p.getUserSecretAnswer() != null) {
-                if (!PALAdminConstants.SECRET_ANSWER_DISPLAY.equals(p
-                        .getUserSecretAnswer())) {
-                    userInfo.put("user.secret.answer", p.getUserSecretAnswer());
-                }
-            }
-            if (p.getUserNameGivenYomi() != null) {
-                userInfo.put("user.name.given.yomi", p.getUserNameGivenYomi());
-            }
-            if (p.getUserNameFamilyYomi() != null) {
-                userInfo
-                        .put("user.name.family.yomi", p.getUserNameFamilyYomi());
-            }
-
-        }
         return userInfo;
     }
-
-    public void withdraw(PublicPortalWithdrawalConfirmPage page)
-            throws CommonException {
-        UserManager userManager = PortalComponentUtil.getUserManager();
-        // check password
-        if (!userManager.authenticate(page.getUsername(), page.getPassword())) {
-            throw new CommonException("invalid.password");
-        }
-
-        // remove user
-        User user;
-        try {
-            user = userManager.getUser(page.getUsername());
-        } catch (SecurityException e) {
-            throw new CommonException("could.not.remove.user", e);
-        }
-        if (user == null) {
-            throw new CommonException("could.not.find.user");
-        }
-        if (PALAdminConstants.TRUE.equals(PALAdminUtil
-                .getConfigInitParameter(PALAdminConstants.REMOVE_USER))) {
-            // remove user
-            try {
-                userManager.removeUser(page.getUsername());
-            } catch (SecurityException e) {
-                throw new CommonException("could.not.remove.user", e);
-            }
-        } else {
-            // disabled email
-            String email = user.getUserAttributes().get(
-                    "user.business-info.online.email", null);
-            if (email != null) {
-                user.getUserAttributes().remove(
-                        "user.business-info.online.email");
-                user.getUserAttributes().put(
-                        "backup." + "user.business-info.online.email", email);
-            }
-
-            // disabled user
-            try {
-                userManager.setPasswordEnabled(page.getUsername(), false);
-            } catch (SecurityException e) {
-                throw new CommonException("could.not.remove.user", e);
-            }
-        }
-
-        if (PALAdminConstants.TRUE.equals(PALAdminUtil
-                .getConfigInitParameter(PALAdminConstants.REMOVE_USER_FOLDER))) {
-            String userhome = Folder.USER_FOLDER + page.getUsername();
-            PageManager pageManager = PortalComponentUtil.getPageManager();
-            try {
-                Folder folder = pageManager.getFolder(userhome);
-                pageManager.removeFolder(folder);
-            } catch (FolderNotFoundException e) {
-            } catch (InvalidFolderException e) {
-            } catch (FolderNotRemovedException e) {
-            } catch (NodeException e) {
-            }
-        }
-
-        PortalComponentUtil.getRequestContext().getRequest().getSession()
-                .invalidate();
-        //TODO destination
-        //PortalComponentUtil.getRequestContext().getResponse().sendRedirect(response.encodeURL(destination));
-    }
 }

Deleted: 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/AbstractPublicPortalRegistrationPage.java	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,125 +0,0 @@
-/*
- * 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;
-    }
-
-}

Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,39 +0,0 @@
-/*
- * 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.common.util.FacesMessageUtil;
-
-public class PortalRegistrationCompletedPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -9086102477020421786L;
-
-    public Class<?> initialize() {
-        return null;
-    }
-
-    public Class<?> prerender() {
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-}

Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,185 +0,0 @@
-/*
- * 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;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.admin.PALAdminConstants;
-import jp.sf.pal.admin.util.PALAdminUtil;
-import jp.sf.pal.admin.util.UserRegistrationUtil;
-import jp.sf.pal.common.CommonException;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
-import org.seasar.framework.log.Logger;
-
-public class PortalRegistrationRegisterPage extends
-        AbstractPublicPortalRegistrationPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -4113768516238946252L;
-
-    /**
-     * Logger for this class
-     */
-    private static final Logger logger = Logger
-            .getLogger(PortalRegistrationRegisterPage.class);
-
-    public static final String userName_TRequiredValidator = null;
-
-    public static final String userName_lengthValidator = "minimum=6, maximum=32";
-
-    public static final String userName_TRegularExpressionValidator = "pattern='[a-zA-Z][0-9a-zA-Z._]+'";
-
-    public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null;
-
-    public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80";
-
-    //    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";
-
-    private String userSecretQuestionSelection;
-
-    private List<Map<String, String>> userSecretQuestionSelectionItems;
-
-    public String getUserSecretQuestionSelection() {
-        return userSecretQuestionSelection;
-    }
-
-    public void setUserSecretQuestionSelection(
-            String userSecretQuestionSelection) {
-        this.userSecretQuestionSelection = userSecretQuestionSelection;
-    }
-
-    public List<Map<String, String>> getUserSecretQuestionSelectionItems() {
-        return userSecretQuestionSelectionItems;
-    }
-
-    public void setUserSecretQuestionSelectionItems(
-            List<Map<String, String>> userSecretQuestionSelectionItems) {
-        this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems;
-    }
-
-    public Class<?> doFinish() {
-        if (getUserBusinessInfoOnlineEmail() != null) {
-            setUserHomeInfoOnlineEmail(getUserBusinessInfoOnlineEmail());
-        }
-
-        if (userSecretQuestionSelection != null) {
-            setUserSecretQuestion(userSecretQuestionSelection);
-        }
-
-        try {
-            setUserSecretAnswer(getUserRegistrationService().getMessageDigest(
-                    getUserSecretAnswer()));
-            getUserRegistrationService().register(this);
-            if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) {
-                FacesMessageUtil.addInfoMessage("success.check_your_email");
-                return PortalRegistrationCompletedPage.class;
-            } else {
-                FacesMessageUtil.addInfoMessage("success.login_above");
-            }
-        } 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() {
-        // Load Term Of Service
-        String filename = getLabelHelper().getLabelValue("termOfServiceFile");
-        if (filename == null) {
-            filename = "/WEB-INF/template/term_of_service.txt";
-        }
-        String encoding = getLabelHelper().getLabelValue(
-                "termOfServiceEncoding");
-        if (encoding == null) {
-            encoding = "UTF-8";
-        }
-        StringBuffer buf = new StringBuffer();
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(
-                    new FileInputStream(PALAdminUtil
-                            .getContextRealPath(filename)), encoding));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                buf.append(line).append("\n");
-            }
-        } catch (UnsupportedEncodingException e) {
-            FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPA0004", new Object[] { this.toString() }, e);
-        } catch (FileNotFoundException e) {
-            FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPA0004", new Object[] { this.toString() }, e);
-        } catch (IOException e) {
-            FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPA0004", new Object[] { this.toString() }, e);
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                }
-            }
-        }
-        setTermOfService(buf.toString());
-
-        // Load Secret Question
-        List<Map<String, String>> questionItems = new ArrayList<Map<String, String>>();
-        int numOfQuestions = Integer.parseInt(getLabelHelper().getLabelValue(
-                "secretQuestion.num"));
-        for (int i = 1; i <= numOfQuestions; i++) {
-            Map<String, String> map = new HashMap<String, String>(2);
-            String value = getLabelHelper()
-                    .getLabelValue("secretQuestion." + i);
-            map.put("label", value);
-            map.put("value", value);
-            questionItems.add(map);
-        }
-        setUserSecretQuestionSelectionItems(questionItems);
-
-        // reset secret answer
-        setUserSecretAnswer("");
-
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-}

Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,86 +0,0 @@
-/*
- * 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.PALAdminConstants;
-import jp.sf.pal.common.CommonException;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
-import org.seasar.framework.log.Logger;
-
-public class PortalRegistrationUpdatePage extends
-        AbstractPublicPortalRegistrationPage implements Serializable {
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -3639991850557070723L;
-
-    /**
-     * Logger for this class
-     */
-    private static final Logger logger = Logger
-            .getLogger(PortalRegistrationUpdatePage.class);
-
-    public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null;
-
-    public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80";
-
-    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 {
-            if (!PALAdminConstants.SECRET_ANSWER_DISPLAY
-                    .equals(getUserSecretAnswer())) {
-                setUserSecretAnswer(getUserRegistrationService()
-                        .getMessageDigest(getUserSecretAnswer()));
-            }
-            getUserRegistrationService().update(this);
-            FacesMessageUtil.addInfoMessage("updated.user.info");
-            return PortalRegistrationUpdatePage.class;
-        } 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);
-            setUserSecretAnswer(PALAdminConstants.SECRET_ANSWER_DISPLAY);
-        } catch (CommonException e) {
-            FacesMessageUtil.addErrorMessage(e.getMessageId());
-            logger.log("EPA0001", new Object[] { this.toString() }, e);
-        }
-
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-}

Deleted: 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	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,60 +0,0 @@
-/*
- * 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 org.seasar.framework.log.Logger;
-
-import jp.sf.pal.common.CommonException;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
-public class PublicPortalForgottenPasswordCompletedPage extends
-        AbstractResetPasswordPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -5203115307227054989L;
-
-    /**
-     * Logger for this class
-     */
-    private static final Logger logger = Logger
-            .getLogger(ResetPasswordPage.class);
-
-    public Class<?> initialize() {
-        return null;
-    }
-
-    public Class<?> 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();
-        return null;
-    }
-
-}

Deleted: 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	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,59 +0,0 @@
-/*
- * 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
-        AbstractForgottenPasswordPage {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 362540675380114688L;
-
-    public static final String email_TRequiredValidator = null;
-
-    public static final String email_lengthValidator = "minimum=5, maximum=80";
-
-    public Class<?> doNext() {
-        //TODO check email
-        return PublicPortalSecretAnswerPage.class;
-    }
-
-    public Class<?> initialize() {
-        return null;
-    }
-
-    public Class<?> prerender() {
-        setGuid((String) FacesContext.getCurrentInstance().getExternalContext()
-                .getRequestParameterMap().get("guid"));
-        if (getGuid() != null) {
-            return PublicPortalForgottenPasswordCompletedPage.class;
-        }
-
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-    public String getDoNextValue() {
-        return getLabelHelper().getLabelValue("Next");
-    }
-
-}

Deleted: 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	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,39 +0,0 @@
-/*
- * 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.common.util.FacesMessageUtil;
-
-public class PublicPortalRegistrationCompletedPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -5112166307058162379L;
-
-    public Class<?> initialize() {
-        return null;
-    }
-
-    public Class<?> prerender() {
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-}

Deleted: 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	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,251 +0,0 @@
-/*
- * 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;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.admin.PALAdminConstants;
-import jp.sf.pal.admin.util.PALAdminUtil;
-import jp.sf.pal.admin.util.UserRegistrationUtil;
-import jp.sf.pal.common.CommonException;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
-import org.seasar.framework.log.Logger;
-
-public class PublicPortalRegistrationRegisterPage extends
-        AbstractPublicPortalRegistrationPage {
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 5818687558352917312L;
-
-    /**
-     * Logger for this class
-     */
-    private static final Logger logger = Logger
-            .getLogger(PublicPortalRegistrationRegisterPage.class);
-
-    public static final String userName_TRequiredValidator = null;
-
-    public static final String userName_lengthValidator = "minimum=6, maximum=32";
-
-    public static final String userName_TRegularExpressionValidator = "pattern='[a-zA-Z][0-9a-zA-Z._]+'";
-
-    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";
-
-    private String userSecretQuestionSelection;
-
-    private List<Map<String, String>> userSecretQuestionSelectionItems;
-
-    private int userSecretQuestionSelectionIndex;
-
-    /**
-     * @return the userSecretQuestionSelection
-     */
-    public String getUserSecretQuestionSelection() {
-        return userSecretQuestionSelection;
-    }
-
-    /**
-     * @param userSecretQuestionSelection the userSecretQuestionSelection to set
-     */
-    public void setUserSecretQuestionSelection(
-            String userSecretQuestionSelection) {
-        this.userSecretQuestionSelection = userSecretQuestionSelection;
-    }
-
-    /**
-     * @return the userSecretQuestionSelectionItems
-     */
-    public List<Map<String, String>> getUserSecretQuestionSelectionItems() {
-        return userSecretQuestionSelectionItems;
-    }
-
-    /**
-     * @param userSecretQuestionSelectionItems the userSecretQuestionSelectionItems to set
-     */
-    public void setUserSecretQuestionSelectionItems(
-            List<Map<String, String>> userSecretQuestionSelectionItems) {
-        this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems;
-    }
-
-    /**
-     * @return the userSecretQuestionSelectionIndex
-     */
-    public int getUserSecretQuestionSelectionIndex() {
-        return userSecretQuestionSelectionIndex;
-    }
-
-    /**
-     * @param userSecretQuestionSelectionIndex the userSecretQuestionSelectionIndex to set
-     */
-    public void setUserSecretQuestionSelectionIndex(
-            int userSecretQuestionSelectionIndex) {
-        this.userSecretQuestionSelectionIndex = userSecretQuestionSelectionIndex;
-    }
-
-    public Class<?> doFinish() {
-        if (getUserBusinessInfoOnlineEmail() != null) {
-            setUserHomeInfoOnlineEmail(getUserBusinessInfoOnlineEmail());
-        }
-
-        if (userSecretQuestionSelection != null) {
-            setUserSecretQuestion(userSecretQuestionSelection);
-        }
-
-        try {
-            setUserSecretAnswer(getUserRegistrationService().getMessageDigest(
-                    getUserSecretAnswer()));
-            getUserRegistrationService().register(this);
-            if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) {
-                FacesMessageUtil.addInfoMessage("success.check_your_email");
-                return PublicPortalRegistrationCompletedPage.class;
-            } else {
-                FacesMessageUtil.addInfoMessage("success.login_above");
-            }
-        } 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() {
-        // Load Term Of Service
-        String filename = getLabelHelper().getLabelValue("termOfServiceFile");
-        if (filename == null) {
-            filename = "/WEB-INF/template/term_of_service.txt";
-        }
-        String encoding = getLabelHelper().getLabelValue(
-                "termOfServiceEncoding");
-        if (encoding == null) {
-            encoding = "UTF-8";
-        }
-        StringBuffer buf = new StringBuffer();
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(
-                    new FileInputStream(PALAdminUtil
-                            .getContextRealPath(filename)), encoding));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                buf.append(line).append("\n");
-            }
-        } catch (UnsupportedEncodingException e) {
-            FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPA0004", new Object[] { this.toString() }, e);
-        } catch (FileNotFoundException e) {
-            FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPA0004", new Object[] { this.toString() }, e);
-        } catch (IOException e) {
-            FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPA0004", new Object[] { this.toString() }, e);
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                }
-            }
-        }
-        setTermOfService(buf.toString());
-
-        // Load Secret Question
-        List<Map<String, String>> questionItems = new ArrayList<Map<String, String>>();
-        int numOfQuestions = Integer.parseInt(getLabelHelper().getLabelValue(
-                "secretQuestion.num"));
-        for (int i = 1; i <= numOfQuestions; i++) {
-            Map<String, String> map = new HashMap<String, String>(2);
-            String value = getLabelHelper()
-                    .getLabelValue("secretQuestion." + i);
-            map.put("label", value);
-            map.put("value", value);
-            questionItems.add(map);
-        }
-        setUserSecretQuestionSelectionItems(questionItems);
-
-        // reset secret answer
-        setUserSecretAnswer("");
-
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-}

Deleted: 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	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,128 +0,0 @@
-/*
- * 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.PALAdminConstants;
-import jp.sf.pal.common.CommonException;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
-import org.seasar.framework.log.Logger;
-
-public class PublicPortalRegistrationUpdatePage extends
-        AbstractPublicPortalRegistrationPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -2415175365437526156L;
-
-    /**
-     * Logger for this class
-     */
-    private static final Logger logger = Logger
-            .getLogger(PublicPortalRegistrationUpdatePage.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 {
-            if (!PALAdminConstants.SECRET_ANSWER_DISPLAY
-                    .equals(getUserSecretAnswer())) {
-                setUserSecretAnswer(getUserRegistrationService()
-                        .getMessageDigest(getUserSecretAnswer()));
-            }
-            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);
-            setUserSecretAnswer(PALAdminConstants.SECRET_ANSWER_DISPLAY);
-        } catch (CommonException e) {
-            FacesMessageUtil.addErrorMessage(e.getMessageId());
-            logger.log("EPA0001", new Object[] { this.toString() }, e);
-        }
-
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-}

Deleted: 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	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,134 +0,0 @@
-/*
- * 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.PALAdminConstants;
-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.takeover.TakeOver;
-import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
-
-public class PublicPortalSecretAnswerPage extends AbstractForgottenPasswordPage
-        implements Serializable {
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -3654426468628202950L;
-
-    /**
-     * Logger for this class
-     */
-    private static final Logger logger = Logger
-            .getLogger(PublicPortalSecretAnswerPage.class);
-
-    private String userSecretAnswer;
-
-    private String userSecretQuestion;
-
-    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;
-    }
-
-    public Class<?> doFinish() {
-        try {
-            if (!PALAdminConstants.SECRET_ANSWER_DISPLAY
-                    .equals(getUserSecretAnswer())) {
-                setUserSecretAnswer(getUserRegistrationService()
-                        .getMessageDigest(getUserSecretAnswer()));
-            }
-            if (getUserRegistrationService().checkSecretAnswer(this)) {
-                try {
-                    getUserRegistrationService().sendNewPassword(this);
-                    FacesMessageUtil.addInfoMessage("an_email_has_been_sent");
-                    return PublicPortalForgottenPasswordCompletedPage.class;
-                } catch (CommonException e) {
-                    FacesMessageUtil.addErrorMessage(e.getMessageId());
-                    logger.log("EPA0002", new Object[] { this.toString() }, e);
-                    setUserSecretAnswer(null);
-                }
-
-            } else {
-                FacesMessageUtil.addInfoMessage("incorrect.scret.answer");
-                setUserSecretAnswer(null);
-            }
-        } catch (CommonException e) {
-            //            FacesMessageUtil.addErrorMessage(e.getMessageId());
-            FacesMessageUtil.addInfoMessage("incorrect.scret.answer");
-            logger.log("EPA0002", new Object[] { this.toString() }, e);
-            setUserSecretAnswer(null);
-        }
-        return null;
-    }
-
-    @TakeOver(type = TakeOverType.NEVER)
-    public Class<?> doBack() {
-        return PublicPortalForgottenPasswordPage.class;
-    }
-
-    public Class<?> initialize() {
-        return null;
-    }
-
-    public Class<?> prerender() {
-        setGuid((String) FacesContext.getCurrentInstance().getExternalContext()
-                .getRequestParameterMap().get("guid"));
-        if (getGuid() != null) {
-            return PublicPortalForgottenPasswordCompletedPage.class;
-        }
-
-        if (getEmail() == null) {
-            return PublicPortalForgottenPasswordPage.class;
-        }
-
-        try {
-            getUserRegistrationService().setSecretQuestion(this);
-        } catch (CommonException e) {
-            logger.log("EPA0005", new Object[] { this.toString() }, e);
-            //            return PublicPortalForgottenPasswordPage.class;
-        }
-
-        // render FacesMessage
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-    public String getDoFinishValue() {
-        return getLabelHelper().getLabelValue("Finish");
-    }
-
-    public String getDoBackValue() {
-        return getLabelHelper().getLabelValue("Back");
-    }
-
-}

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties
===================================================================

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u9000\u4f1a\u7533\u8acb
-javax.portlet.short-title=\u9000\u4f1a
-javax.portlet.keywords=\u9000\u4f1a,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
-

Modified: pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml	2008-04-26 22:50:43 UTC (rev 891)
@@ -26,28 +26,6 @@
     <js:metadata name="merge.portal.parameters.before.portlet.parameters">true</js:metadata>
   </portlet>
   <portlet>
-    <portlet-name>UserRegistrationPortlet</portlet-name>
-    <js:security-constraint-ref>public-view</js:security-constraint-ref>
-    <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>PublicPortalForgottenPasswordPortlet</portlet-name>
-    <js:security-constraint-ref>public-view</js:security-constraint-ref>
-    <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>PublicPortalRegistrationPortlet</portlet-name>
-    <js:security-constraint-ref>public-view</js:security-constraint-ref>
-    <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>
-  <portlet>
     <portlet-name>SiteEditorPortlet</portlet-name>
     <js:security-constraint-ref>AEUV</js:security-constraint-ref>
     <js:metadata name="merge.portal.parameters.with.portlet.parameters">true</js:metadata>

Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml	2008-04-26 22:50:43 UTC (rev 891)
@@ -204,159 +204,6 @@
     </portlet-info>
   </portlet>
   <portlet>
-    <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>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>
-      <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.UserRegistrationFilter,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/publicPortalRegistrationRegister.html</value>
-    </init-param>
-    <init-param>
-      <description>This option will generate a new password for each user registration</description>
-      <name>jp.sf.pal.admin.ForceGeneratedPassword</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <description>This option will force email address to be system wide unique</description>
-      <name>jp.sf.pal.admin.ForceUniqueEmail</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <description>This option will use the email address as the username</description>
-      <name>jp.sf.pal.admin.ForceUseEmailAsUsername</name>
-      <value>false</value>
-    </init-param>
-    <init-param>
-      <description>This is the template in which you setup an email to be sent after user exists</description>
-      <name>jp.sf.pal.admin.EmailTemplateLocation</name>
-      <value>/WEB-INF/template/userreg/</value>
-    </init-param>
-    <init-param>
-      <description>This is the template in which you setup an email to be sent after user exists</description>
-      <name>jp.sf.pal.admin.EmailTemplateName</name>
-      <value>userRegistrationEmail.vm</value>
-    </init-param>
-    <init-param>
-      <description>Profiling rules to be assigned at registration.</description>
-      <name>jp.sf.pal.admin.RuleNames</name>
-      <value>page</value>
-    </init-param>
-    <init-param>
-      <description>Profiling rules to be assigned at registration.</description>
-      <name>jp.sf.pal.admin.RuleValues</name>
-      <value>j2</value>
-    </init-param>
-    <init-param>
-      <description>Profiling rules to be assigned at registration.</description>
-      <name>jp.sf.pal.admin.SendMail</name>
-      <value>true</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.resources.UserRegistration</resource-bundle>
-    <portlet-info>
-      <title>User Registration</title>
-      <short-title>Registration</short-title>
-      <keywords>Registration</keywords>
-    </portlet-info>
-  </portlet>
-  <portlet>
-    <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>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>
-      <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.ForgottenPasswordFilter,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/publicPortalForgottenPassword.html</value>
-    </init-param>
-    <init-param>
-      <description>This is the template in which you setup an email to be sent after user exists</description>
-      <name>jp.sf.pal.admin.EmailTemplateLocation</name>
-      <value>/WEB-INF/template/userreg/</value>
-    </init-param>
-    <init-param>
-      <description>This is the template in which you setup an email to be sent after user exists</description>
-      <name>jp.sf.pal.admin.EmailTemplateName</name>
-      <value>forgottenPasswdEmail.vm</value>
-    </init-param>
-    <init-param>
-      <name>jp.sf.pal.admin.ReturnPath</name>
-      <value>/forgot.psml</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.resources.ForgottenPassword</resource-bundle>
-    <portlet-info>
-      <title>Forgotten Password</title>
-      <short-title>Forgotten Password</short-title>
-      <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.resources.UserRegistrationUpdate</resource-bundle>
-    <portlet-info>
-      <title>Update User Information</title>
-      <short-title>Information Update</short-title>
-      <keywords>Update</keywords>
-    </portlet-info>
-  </portlet>
-  <portlet>
     <description>Provides features for managing a site configuration.</description>
     <description xml:lang="ja">サイトを管理する機能を提供します。</description>
     <portlet-name>SiteEditorPortlet</portlet-name>
@@ -390,153 +237,6 @@
     </portlet-info>
   </portlet>
   <portlet>
-    <description>Provides users with the ability register as a new user with a portal.</description>
-    <description xml:lang="ja">ポータルの新規登録する機能を提供します。</description>
-    <portlet-name>PortalRegistrationPortlet</portlet-name>
-    <display-name>Registration For 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.UserRegistrationFilter,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/portalRegistrationRegister.html</value>
-    </init-param>
-    <init-param>
-      <description>This option will generate a new password for each user registration</description>
-      <name>jp.sf.pal.admin.ForceGeneratedPassword</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <description>This option will force email address to be system wide unique</description>
-      <name>jp.sf.pal.admin.ForceUniqueEmail</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <description>This option will use the email address as the username</description>
-      <name>jp.sf.pal.admin.ForceUseEmailAsUsername</name>
-      <value>false</value>
-    </init-param>
-    <init-param>
-      <description>This is the template in which you setup an email to be sent after user exists</description>
-      <name>jp.sf.pal.admin.EmailTemplateLocation</name>
-      <value>/WEB-INF/template/userreg/</value>
-    </init-param>
-    <init-param>
-      <description>This is the template in which you setup an email to be sent after user exists</description>
-      <name>jp.sf.pal.admin.EmailTemplateName</name>
-      <value>userRegistrationEmail.vm</value>
-    </init-param>
-    <init-param>
-      <description>Profiling rules to be assigned at registration.</description>
-      <name>jp.sf.pal.admin.RuleNames</name>
-      <value>page</value>
-    </init-param>
-    <init-param>
-      <description>Profiling rules to be assigned at registration.</description>
-      <name>jp.sf.pal.admin.RuleValues</name>
-      <value>j2</value>
-    </init-param>
-    <init-param>
-      <description>Profiling rules to be assigned at registration.</description>
-      <name>jp.sf.pal.admin.SendMail</name>
-      <value>true</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.resources.UserRegistration</resource-bundle>
-    <portlet-info>
-      <title>User Registration</title>
-      <short-title>Registration</short-title>
-      <keywords>Registration</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>PortalRegistrationUpdatePortlet</portlet-name>
-    <display-name>Update User Information for 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/portalRegistrationUpdate.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.resources.UserRegistrationUpdate</resource-bundle>
-    <portlet-info>
-      <title>Update User Information</title>
-      <short-title>Information Update</short-title>
-      <keywords>Update</keywords>
-    </portlet-info>
-  </portlet>
-  <portlet>
-    <description>Provides features for a withdrawal from portal.</description>
-    <description xml:lang="ja">ポータル上から退会するための機能を提供します。</description>
-    <portlet-name>PublicPortalWithdrawalPortlet</portlet-name>
-    <display-name>User Withdrawal</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/withdraw/publicPortalWithdrawal.html</value>
-    </init-param>
-    <init-param>
-      <name>jp.sf.pal.admin.withdraw.RemoveUser</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <name>jp.sf.pal.admin.withdraw.RemoveUserFolder</name>
-      <value>true</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.resources.PublicPortalWithdrawal</resource-bundle>
-    <portlet-info>
-      <title>Withdrawal</title>
-      <short-title>Withdrawal</short-title>
-      <keywords>Withdrawal</keywords>
-    </portlet-info>
-  </portlet>
-  <portlet>
     <description>Provides features for managing permissions.</description>
     <description xml:lang="ja">パーミッションを管理する機能を提供します。</description>
     <portlet-name>PermissionEditor</portlet-name>

Deleted: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,23 +0,0 @@
-<?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="UserRegistrationForm">
-<!-- message: BEGIN  -->
-<div class="portlet-msg">
-<span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span>
-</div>
-<!-- message: END  -->
-      <div class="portlet-form-label" style="text-align:center;">
-        <label id="registAgainLabel">再度、ユーザーを登録する場合は、以下のリンクをクリックしてください。</label>
-      </div>
-      <div class="portlet-form-label" style="text-align:center;">
-        <a id="goPortalRegistrationRegister" href="portalRegistrationRegister.html"><span id="registLinkLabel">ユーザー登録</span></a>
-      </div>
-    </form>
-  </body>
-</html>

Deleted: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,148 +0,0 @@
-<?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="UserRegistrationRegisterForm">
-<!-- message: BEGIN  -->
-<div class="portlet-msg">
-<span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span>
-</div>
-<!-- message: END  -->
-      <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="userIdTitleLabel">ユーザー ID の入力</label>
-      </div>
-      <div style="float:left;width:530px;" class="portlet-form-label">
-        <label id="typeUserIdLabel">ご希望のユーザー ID を入力してください。</label>
-        <table>
-          <tbody>
-            <tr>
-              <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userIdLabel" class="portlet-form-field-label">ユーザー ID</label>:
-            </td>
-              <td width="75%">
-                <input id="userName" type="text" class="portlet-form-input-field" size="24" />
-                <label id="userIdConditionLabel" class="portlet-form-label">(6〜32字の半角英数字)</label>
-              </td>
-            </tr>
-            <tr>
-              <td></td>
-              <td>
-                <label id="userIdExampleLabel" class="portlet-form-label">(例:hoge2000、foo777など)</label>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div style="float:right;width:230px;background:#eeeeee;" class="portlet-form-label">
-        <div>
-          <label id="userIdHintLabel">ユーザー ID に関するヒント</label>
-        </div>
-        <ul>
-          <li class="portlet-form-label">
-            <label id="userIdBeginWithAlphabetLabel">最初の文字はアルファベット</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="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>
-          </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="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%">
-                <select id="userSecretQuestionSelection">
-                  <option>ほげ</option>
-                </select>
-              </td>
-            </tr>
-            <tr>
-              <td align="right" width="25%">
-              </td>
-              <td width="75%">
-                <label id="otherUserSecretQuestionLabel">上記以外の質問を登録することもできます。</label>
-                <input id="userSecretQuestion" type="text" class="portlet-form-input-field" size="24" />
-                <br/>
-              </td>
-            </tr>
-            <tr>
-              <td align="right" width="25%">
-                <font color="#FF3F0C">*</font><label id="userSecretAnswerLabel" class="portlet-form-field-label">秘密の答え</label>:
-              </td>
-              <td 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>
-      <br style="margin:10px;clear:both;" />
-      <div style="margin:10px 0px;" class="portlet-section-header">
-        <label id="termOfServiceLabel">利用規約</label>
-      </div>
-      <div class="portlet-form-label" style="text-align:center;">
-        <textarea id="termOfService" wrap="off" cols="80" rows="20" readonly="readonly"> </textarea>
-      </div>
-      <br />
-      <hr style="margin:10px;clear:both;" />
-      <div style="text-align:center;">
-        <input type="button" id="doFinish" value="利用規約に同意して登録" onclick="location.href='userRegistrationRegister.html'" class="portlet-form-button" />
-      </div>
-    </form>
-  </body>
-</html>

Deleted: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,128 +0,0 @@
-<?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">
-<!-- message: BEGIN  -->
-<div class="portlet-msg">
-<span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span>
-</div>
-<!-- message: END  -->
-      <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">パスワード</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">パスワード</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="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>
-          </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="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>

Deleted: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html	2008-04-25 22:13:49 UTC (rev 890)
+++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html	2008-04-26 22:50:43 UTC (rev 891)
@@ -1,327 +0,0 @@
-<?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="UserRegistrationRegisterForm">
-<!-- message: BEGIN  -->
-<div class="portlet-msg">
-<span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span>
-</div>
-<!-- message: END  -->
-      <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="userIdTitleLabel">ユーザー ID の入力</label>
-      </div>
-      <div style="float:left;width:530px;" class="portlet-form-label">
-        <label id="typeUserIdLabel">ご希望のユーザー ID を入力してください。</label>
-        <table>
-          <tbody>
-            <tr>
-              <td align="right" width="25%"><font color="#FF3F0C">*</font><label id="userIdLabel" class="portlet-form-field-label">ユーザー ID</label>:
-            </td>
-              <td width="75%">
-                <input id="userName" type="text" class="portlet-form-input-field" size="24" />
-                <label id="userIdConditionLabel" class="portlet-form-label">(6〜32字の半角英数字)</label>
-              </td>
-            </tr>
-            <tr>
-              <td></td>
-              <td>
-                <label id="userIdExampleLabel" class="portlet-form-label">(例:hoge2000、foo777など)</label>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div style="float:right;width:230px;background:#eeeeee;" class="portlet-form-label">
-        <div>
-          <label id="userIdHintLabel">ユーザー ID に関するヒント</label>
-        </div>
-        <ul>
-          <li class="portlet-form-label">
-            <label id="userIdBeginWithAlphabetLabel">最初の文字はアルファベット</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">(半角数字7桁)</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%">
-                <select id="userSecretQuestionSelection">
-                  <option>ほげ</option>
-                </select>
-              </td>
-            </tr>
-            <tr>
-              <td align="right" width="25%">
-              </td>
-              <td width="75%">
-                <label id="otherUserSecretQuestionLabel">上記以外の質問を登録することもできます。</label>
-                <input id="userSecretQuestion" type="text" class="portlet-form-input-field" size="24" />
-                <br/>
-              </td>
-            </tr>
-            <tr>
-              <td align="right" width="25%">
-                <font color="#FF3F0C">*</font><label id="userSecretAnswerLabel" class="portlet-form-field-label">秘密の答え</label>:
-              </td>
-              <td 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>
-      <br style="margin:10px;clear:both;" />
-      <div style="margin:10px 0px;" class="portlet-section-header">
-        <label id="termOfServiceLabel">利用規約</label>
-      </div>
-      <div class="portlet-form-label" style="text-align:center;">
-        <textarea id="termOfService" wrap="off" cols="80" rows="20" readonly="readonly"> </textarea>
-      </div>
-      <br />
-      <hr style="margin:10px;clear:both;" />
-      <div style="text-align:center;">
-        <input type="button" id="doFinish" value="利用規約に同意して登録" onclick="location.href='userRegistrationRegister.html'" class="portlet-form-button" />
-      </div>
-    </form>
-  </body>
-</html>


pal-cvs メーリングリストの案内
Back to archive index