portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions CreateNewUserAndConfirm.java
Date Mon, 04 Jun 2001 07:21:11 GMT
taylor      01/06/04 00:21:11

  Modified:    src/java/org/apache/jetspeed/modules/actions
                        CreateNewUserAndConfirm.java
  Log:
  updated CreateNewUserAndConfirm to use full-template extensions on setScreenTemplate().
this problem will be fixed soon in tdk, and I can back out the changes then.
  
  Revision  Changes    Path
  1.15      +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java
  
  Index: CreateNewUserAndConfirm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- CreateNewUserAndConfirm.java	2001/05/09 06:35:57	1.14
  +++ CreateNewUserAndConfirm.java	2001/06/04 07:21:10	1.15
  @@ -124,7 +124,7 @@
               || ! pass1.equals ( pass2 ) )
           {
               data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
  -            data.setScreenTemplate("NewAccount");
  +            data.setScreenTemplate("NewAccount.vm");
               return;
           }
           
  @@ -133,7 +133,7 @@
           if ( username.length() == 0 )
           {
               data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOUSERNAME"));
  -            data.setScreenTemplate("NewAccount");
  +            data.setScreenTemplate("NewAccount.vm");
               return;
           }            
           String email = data.getParameters().getString("email", "");
  @@ -141,7 +141,7 @@
           if ( email.length() == 0 )
           {
               data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOEMAIL"));
  -            data.setScreenTemplate("NewAccount");
  +            data.setScreenTemplate("NewAccount.vm");
               return;
           }
   
  @@ -190,7 +190,7 @@
                   if (enableMail)
                   {
                       ActionLoader.getInstance().exec(data, "SendConfirmationEmail");
  -                    data.setScreenTemplate("ConfirmRegistration");
  +                    data.setScreenTemplate("ConfirmRegistration.vm");
                   }
                   else
                   {
  @@ -202,7 +202,7 @@
               {
                 data.setMessage(e.toString());
                 data.setStackTrace(StringUtils.stackTrace(e), e);
  -              data.setScreenTemplate("Error");
  +              data.setScreenTemplate("Error.vm");
               }
               finally
               {
  @@ -213,7 +213,7 @@
           else // username exists. show the screen again.
           {
               data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_CHOOSENEWNAME"));
  -            data.setScreenTemplate("NewAccount");
  +            data.setScreenTemplate("NewAccount.vm");
               // set the username to be the CHNAME string so that it is 
               // clear that this needs to be replaced
               data.getParameters().add("username", CHNAME);
  @@ -274,7 +274,7 @@
           {
               data.setMessage(e.toString());
               data.setStackTrace(StringUtils.stackTrace(e), e);
  -            data.setScreenTemplate("Error");
  +            data.setScreenTemplate("Error.vm");
           }
         }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message