Fixes.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1090 b35dd754-fafc-0310-a699-88a17e54d16e

documentation/docs/install-guide.html

@@ -23,11 +23,11 @@ Run the Jive Messenger installer. The application will be installed to <tt>c:\Pr
  
  Choose either the RPM or tar.gz build. If using the RPM, run it using your package manager to install Jive Messenger to <tt>/opt/jive_messenger</tt>:
 
- <p><tt>rpm -ivh jive_messenger_2_1_1.rpm</tt></p>
+ <p><tt>rpm -ivh jive_messenger_2_1_2.rpm</tt></p>
  
  If using the .tar.gz, extract the archive to <tt>/opt</tt> or <tt>/usr/bin</tt>:
 
- <p><tt>tar -xzvf jive_messenger_2_1_1.tar.gz<br>
+ <p><tt>tar -xzvf jive_messenger_2_1_2.tar.gz<br>
  mv jive_messenger /opt</tt></p>
 
  <p><b>Note:</b> the .tar.gz build does not contain a bundled Java runtime. Therefore, you must have JDK 1.5.0 (Java 5) or later installed on your system. You can check your java version by typing "java -version" at the command line and (if necessary) upgrade your Java installation by visiting http://java.sun.com.</p>

src/i18n/messenger_i18n_en.properties

@@ -911,6 +911,10 @@ session.summary.info=Below is a list of sessions on this server.
 session.summary.not_session=No Sessions
 session.summary.last_update=List last updated
 
+# General Setup
+
+setup.title=Setup
+
 # Setup admin settings Page
 
 setup.admin.settings.account=Administrator Account
@@ -937,11 +941,11 @@ setup.admin.settings.valid_confirm=Please enter a valid new confirmation passwor
 setup.completed.setup=Setup
 setup.completed.jive=Jive Software
 setup.completed.run=Setup Already Run
-setup.completed.run_info=It appears setup has already been run. To administer your community, \
+setup.completed.run_info=It appears setup has already been run. To administer your server, \
         please use the
-setup.completed.run_info1=Admin Tool
+setup.completed.run_info1=Admin Console
 setup.completed.run_info2=To re-run setup, you need to stop your appserver, delete the \
-        "setup" property from the jive-messenger.xml file, restart Messenger then reload \
+        "setup" property from the jive-messenger.xml file, restart Jive Messenger then reload \
         the setup tool.
 
 # Setup datasource jndi Page
@@ -955,7 +959,6 @@ setup.datasource.jndi.custom=Custom:
 setup.datasource.jndi.valid_name=Please enter a valid JNDI name.
 setup.datasource.jndi.note=Note, it might take between 30-60 seconds to connect to your database.
 
-
 # Setup datasource settings Page
 
 setup.datasource.settings.title=Datasource Settings
@@ -1001,22 +1004,6 @@ setup.datasource.standard.timeout_info=The time (in days) before connections in
         pool are recycled.
 setup.datasource.standard.note=Note, it might take between 30-60 seconds to connect to your database.
 
-
-# Setup env check Page
-
-setup.env.check.setup=Setup
-setup.env.check.error=Error: Can not proceed with
-setup.env.check.error_info=Your current installation fails to meet minimum {0} requirements - \
-        please see the checklist below:
-setup.env.check.jdk=At least JDK 1.5
-setup.env.check.servlet=Servlet 2.2 Support
-setup.env.check.jsp=JSP 1.1 Support
-setup.env.check.class=Classes
-setup.env.check.jive=Jive Home Directory
-setup.env.check.not_home=Messenger Home Directory - Not Set
-setup.env.check.doc=Please read the installation documentation and try setting up your environment \
-        again. After making changes, restart your appserver and load this page again.
-
 # Setup finished Page
 
 setup.finished.title=Setup Complete!
@@ -1066,8 +1053,8 @@ setup.index.not_write_permission=Setup was able to find your conf directory but
 
 # Setup pause Page
 
-setup.pause.title=Please restart your server and close this window. Launch the admin using either the \
-        launcher or start as a service to enter the admin tool.
+setup.pause.title=Please restart your server and close this window. Launch the admin console using \
+either the launcher or start as a service to enter the admin console.
 setup.pause.close=Close Window
 
 # Setup sidebar Page

src/i18n/messenger_i18n_zh_CN.properties

@@ -822,6 +822,10 @@ session.summary.info=\u4e0b\u9762\u662f\u6b64\u670d\u52a1\u5668\u4e0a\u7684\u4f1
 session.summary.not_session=\u65e0\u4f1a\u8bdd
 session.summary.last_update=\u4e0a\u6b21\u66f4\u65b0\u5217\u8868\u65f6\u95f4\uff1a
 
+# Setup
+
+setup.title=\u8bbe\u7f6e
+
 # Setup admin settings Page
 
 setup.admin.settings.account=\u7ba1\u7406\u5458\u5e10\u6237
@@ -896,7 +900,6 @@ setup.datasource.standard.note=\u6ce8\uff1a\u8fde\u63a5\u5230\u60a8\u7684\u6570\
 
 # Setup env check Page
 
-setup.env.check.setup=\u8bbe\u7f6e
 setup.env.check.error=\u9519\u8bef\uff1a\u65e0\u6cd5\u7ee7\u7eed
 setup.env.check.error_info=\u60a8\u7684\u5f53\u524d\u5b89\u88c5\u4e0d\u7b26\u5408\u6700\u5c0f {0} \u9700\u6c42 \uff0d \u8bf7\u67e5\u770b\u4e0b\u5217\u6e05\u5355\uff1a
 setup.env.check.jdk=\u81f3\u5c11 JDK 1.5

src/web/setup-env-check.jspf

@@ -68,17 +68,17 @@
 %>
         <html>
         <head>
-            <title><fmt:message key="title" /> <fmt:message key="setup.env.check.setup" /></title>
+            <title><fmt:message key="title" /> <fmt:message key="setup.title" /></title>
             <link rel="stylesheet" type="text/css" href="style.css">
         </head>
         <body>
 
         <p class="jive-setup-page-header">
-        <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />
+        <fmt:message key="title" /> <fmt:message key="setup.title" />
         </p>
 
         <p class="jive-setup-error-text">
-        <fmt:message key="setup.env.check.error" /> <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />.
+        <fmt:message key="setup.env.check.error" /> <fmt:message key="title" /> <fmt:message key="setup.title" />.
         </p>
 
         <p>

src/web/setup-header.jspf

@@ -8,7 +8,7 @@
 
 <html>
 <head>
-	<title><fmt:message key="title" /> <fmt:message key="setup.env.check.setup" /></title>
+	<title><fmt:message key="title" /> <fmt:message key="setup.title" /></title>
 	<link rel="stylesheet" type="text/css" href="setup-style.css">
 </head>
 
@@ -18,7 +18,7 @@
 <table cellpadding="8" cellspacing="0" border="0" width="100%">
 <tr>
     <td>
-        <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />
+        <fmt:message key="title" /> <fmt:message key="setup.title" />
     </td>
 </tr>
 </table>

src/web/setup-index.jsp

@@ -48,23 +48,6 @@
         }
     }
 
-    // Error checking
-    Map messengerHomeErrors = new HashMap();
-    // Get a handle on the messengerHome directory
-    File messengerHomeDir = new File(JiveGlobals.getMessengerHome());
-    // Validate it:
-    if (messengerHomeDir == null || !messengerHomeDir.exists()) {
-        messengerHomeErrors.put("exists","exists");
-    }
-    else {
-        if (!messengerHomeDir.canRead()) {
-            messengerHomeErrors.put("read","read");
-        }
-        if (!messengerHomeDir.canWrite()) {
-            messengerHomeErrors.put("write","write");
-        }
-    }
-
     Locale locale = JiveGlobals.getLocale();
 %>
 

src/web/setup-sidebar.jsp

@@ -26,7 +26,7 @@
 
     String[] items = {step1, step2, step3, step4};
     String[] names = {
-        "Setup Checklist", "Server Settings", "Datasource Settings", "Admin Account"
+        "Language Selection", "Server Settings", "Datasource Settings", "Admin Account"
     };
     String[] links = {
         "setup-index.jsp",