? cnu.diff
Index: CreateNewUserAndConfirm.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v
retrieving revision 1.19
diff -u -r1.19 CreateNewUserAndConfirm.java
--- CreateNewUserAndConfirm.java	2001/07/02 07:33:38	1.19
+++ CreateNewUserAndConfirm.java	2001/07/03 12:44:18
@@ -124,7 +124,7 @@
             || ! pass1.equals ( pass2 ) )
         {
             data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
-            data.setScreenTemplate("NewAccount.vm");
+            data.setScreenTemplate("NewAccount");
             return;
         }
         
@@ -133,7 +133,7 @@
         if ( username.length() == 0 )
         {
             data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOUSERNAME"));
-            data.setScreenTemplate("NewAccount.vm");
+            data.setScreenTemplate("NewAccount");
             return;
         }            
         String email = data.getParameters().getString("email", "");
@@ -141,7 +141,7 @@
         if ( email.length() == 0 )
         {
             data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOEMAIL"));
-            data.setScreenTemplate("NewAccount.vm");
+            data.setScreenTemplate("NewAccount");
             return;
         }
 
@@ -183,7 +183,7 @@
                 if (enableMail)
                 {
                     ActionLoader.getInstance().exec(data, "SendConfirmationEmail");
-                    data.setScreenTemplate("ConfirmRegistration.vm");
+                    data.setScreenTemplate("ConfirmRegistration");
                 }
                 else
                 {
@@ -194,7 +194,7 @@
             else // username exists. show the screen again.
             {
                 data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_CHOOSENEWNAME"));
-                data.setScreenTemplate("NewAccount.vm");
+                data.setScreenTemplate("NewAccount");
                 // set the username to be the CHNAME string so that it is 
                 // clear that this needs to be replaced
                 data.getParameters().add("username", CHNAME);
@@ -204,7 +204,7 @@
         {
           data.setMessage(e.toString());
           data.setStackTrace(StringUtils.stackTrace(e), e);
-          data.setScreenTemplate("Error.vm");
+          data.setScreenTemplate("Error");
         }
     }
 
@@ -245,9 +245,9 @@
 
           // bring logged on user to homepage with internal redirect
           //data.setScreenTemplate(TurbineTemplate.getDefaultScreen());
-          //data.setScreenTemplate("Home.vm");
+          //data.setScreenTemplate("Home");
           DynamicURI duri = new DynamicURI (data);
-          duri.addPathInfo(JetspeedResources.PATH_TEMPLATE_KEY, "Home.vm");
+          duri.addPathInfo(JetspeedResources.PATH_TEMPLATE_KEY, "Home");
           data.getResponse().sendRedirect(duri.toString());
 
         }
@@ -255,7 +255,7 @@
         {
             data.setMessage(e.toString());
             data.setStackTrace(StringUtils.stackTrace(e), e);
-            data.setScreenTemplate("Error.vm");
+            data.setScreenTemplate("Error");
         }
       }