cvs commit: jahia/core/src/java/org/jahia/bin JahiaConfigurationWizard.java

[Xavier Lawrence]

xlawrence    2005/09/01 12:11:41 CEST

  Modified files:
    core/src/java/org/jahia/bin JahiaConfigurationWizard.java 
  Log:
  Added some default values and removed obligation of specifying the email 
adresse of the default site admin
  
  Revision  Changes    Path
  1.26      +6 -10     
jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.25&r2=1.26&f=h
  
  
  
  Index: JahiaConfigurationWizard.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JahiaConfigurationWizard.java     1 Sep 2005 08:39:14 -0000       1.25
  +++ JahiaConfigurationWizard.java     1 Sep 2005 10:11:40 -0000       1.26
  @@ -1,4 +1,4 @@
  -// $Id: JahiaConfigurationWizard.java,v 1.25 2005/09/01 08:39:14 xlawrence 
Exp $
  +// $Id: JahiaConfigurationWizard.java,v 1.26 2005/09/01 10:11:40 xlawrence 
Exp $
   //
   //                                   ____.
   //                       __/\ ______|    |__/\.     _______
  @@ -602,10 +602,6 @@
                       request.setAttribute("focus", "adminLastName");
                       msg = 
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaConfigurationMsg.lastnamemustset.label",
                               newSelectedLocale);
  -                } else if (((String) values.get("adminEmail")).length() == 
0) {                                // check lastname length [minimum 1 char]
  -                    request.setAttribute("focus", "adminEmail");
  -                    msg = 
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaConfigurationMsg.emailmustset.label",
  -                            newSelectedLocale);
                   } else {
                       error = false;                                           
       // everything is okay, continue...
                   }
  @@ -2120,14 +2116,14 @@
               values.put("server_jahiafiles", 
properties.getProperty("jahiaFilesDiskPath").trim());
               values.put("server_jahiafiles_default", 
properties.getProperty("jahiaFilesDiskPath").trim());
   
  -            values.put("sitekey", "");
  -            values.put("sitetitle", "");
  -            values.put("siteservername", "");
  +            values.put("sitekey", "mySite");
  +            values.put("sitetitle", "My Site");
  +            values.put("siteservername", "localhost");
   
  -            values.put("adminUsername", "");
  +            values.put("adminUsername", "siteAdmin");
               values.put("adminFirstName", "Default Virtual Site");
               values.put("adminLastName", "Site Admin");
  -            values.put("adminEmail", "");
  +            values.put("adminEmail", "[EMAIL PROTECTED]");
               values.put("adminOrganization", "");
               values.put("adminPassword", "");
               values.put("adminConfirm", "");