Develop and Download Open Source Software

Portal Application Laboratory

Browse CVS Repository

/[OSDN]/pal/pal-portal/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java

Diff of /pal/pal-portal/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.2 by shinsuke, Wed Sep 27 12:56:39 2006 UTC revision 1.3 by shinsuke, Wed Mar 7 22:13:49 2007 UTC
# Line 1  Line 1 
1  Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java  Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java
2  ===================================================================  ===================================================================
3  --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java       (リビジョン 450196)  --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java       (リビジョン 514361)
4  +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java       (作業コピー)  +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java       (作業コピー)
5  @@ -348,8 +348,8 @@  @@ -349,8 +349,8 @@
6                    
7           // These last two are special cases you must have them           // These last two are special cases you must have them
8           // comment them out here if you use the generated password option           // comment them out here if you use the generated password option
# Line 13  Index: applications/j2-admin/src/java/or Line 13  Index: applications/j2-admin/src/java/or
13            
14           // the following can be placed in any order, and will appear in that order on the page           // the following can be placed in any order, and will appear in that order on the page
15                    
16  @@ -361,13 +361,13 @@  @@ -362,13 +362,13 @@
17           {"user.employer",         optional ,      new Integer(80),        IS_STRING},           {"user.employer",         optional ,      new Integer(80),        IS_STRING},
18           */           */
19                    
# Line 23  Index: applications/j2-admin/src/java/or Line 23  Index: applications/j2-admin/src/java/or
23           {"user.jobtitle",         optional ,      new Integer(80),        IS_STRING},           {"user.jobtitle",         optional ,      new Integer(80),        IS_STRING},
24           {"user.name.prefix",         optional ,      new Integer(10),        IS_STRING},           {"user.name.prefix",         optional ,      new Integer(10),        IS_STRING},
25           */           */
26  -        {"user.name.given",         optional ,      new Integer(30),        IS_STRING},  +        {"user.name.family",         optional ,      new Integer(30),        IS_STRING},
27           {"user.name.family",         optional ,      new Integer(30),        IS_STRING},           {"user.name.given",         optional ,      new Integer(30),        IS_STRING},
28  +        {"user.name.given",         optional ,      new Integer(30),        IS_STRING},  -        {"user.name.family",         optional ,      new Integer(30),        IS_STRING},
29           /*           /*
30           {"user.name.middle",         optional ,      new Integer(30),        IS_STRING},           {"user.name.middle",         optional ,      new Integer(30),        IS_STRING},
31           {"user.name.suffix",         optional ,      new Integer(10),        IS_STRING},           {"user.name.suffix",         optional ,      new Integer(10),        IS_STRING},
32  @@ -402,13 +402,13 @@  @@ -403,13 +403,13 @@
33           {"user.home-info.online.email",         optional ,      new Integer(80),        IS_EMAIL},           {"user.home-info.online.email",         optional ,      new Integer(80),        IS_EMAIL},
34           {"user.home-info.online.uri",         optional ,      new Integer(80),        IS_URL},           {"user.home-info.online.uri",         optional ,      new Integer(80),        IS_URL},
35           */           */
# Line 50  Index: applications/j2-admin/src/java/or Line 50  Index: applications/j2-admin/src/java/or
50           /*           /*
51           {"user.business-info.telecom.telephone.intcode",         optional ,      new Integer(80),        IS_STRING},           {"user.business-info.telecom.telephone.intcode",         optional ,      new Integer(80),        IS_STRING},
52           {"user.business-info.telecom.telephone.loccode",         optional ,      new Integer(80),        IS_STRING},           {"user.business-info.telecom.telephone.loccode",         optional ,      new Integer(80),        IS_STRING},
 @@ -673,7 +673,6 @@  
                  admin.sendEmail(getPortletConfig(), (String) userInfo  
                          .get(USER_ATTRIBUTE_EMAIL),  
                          getEmailSubject(actionRequest), templ, userInfo);  
 -  
                  if ((this.optionForceEmailAsUsername)  
                          || (this.optionForceGeneratedPasswords))  
                  {  
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help