Compile fixes

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

src/web/setup-admin-settings.jsp

@@ -30,7 +30,7 @@
     }
 %>
 
-<%@ include file="setup-global.jsp" %>
+<%@ include file="setup-global.jspf" %>
 <jsp:useBean id="adminManager" class="org.jivesoftware.util.WebManager" />
 
 <%  // Get parameters

src/web/setup-datasource-jndi.jsp

@@ -17,7 +17,7 @@
                  org.jivesoftware.database.DbConnectionManager,
                  org.jivesoftware.database.JNDIDataSourceProvider" %>
 
-<%@ include file="setup-global.jsp" %>
+<%@ include file="setup-global.jspf" %>
 
 <%  // check for embedded mode:
     if (embeddedMode) {

src/web/setup-datasource-settings.jsp

@@ -22,7 +22,7 @@
     static final String EMBEDDED = "embedded";
 %>
 
-<%@ include file="setup-global.jsp" %>
+<%@ include file="setup-global.jspf" %>
 
 <%  // Get parameters
     String mode = ParamUtils.getParameter(request,"mode");

src/web/setup-datasource-standard.jsp

@@ -23,7 +23,7 @@
                  org.jivesoftware.database.DefaultConnectionProvider"
 %>
 
-<%@ include file="setup-global.jsp" %>
+<%@ include file="setup-global.jspf" %>
 
 <%  // Get parameters
     String driver = ParamUtils.getParameter(request,"driver");

src/web/setup-env-check.jspf

@@ -9,7 +9,7 @@
 <%@ page import="java.lang.reflect.Method,
                  java.io.File" %>
 
-<%-- note, the loadClass method is defined in setup-global.jsp --%>
+<%-- note, the loadClass method is defined in setup-global.jspf --%>
 
 <%  // Check the user's environment for minimum requirements.
 
@@ -20,47 +20,47 @@
     boolean jiveHomeExists = false;
     File jiveHome = null;
 
-    // Check for JDK 1.3
-//    try {
-//        loadClass("java.util.concurrent.ConcurrentHashMap");
-//        jdk13Installed = true;
-//    }
-//    catch (ClassNotFoundException cnfe) {}
-//    // Check for Servlet 2.3:
-//    try {
-//        Class c = loadClass("javax.servlet.http.HttpSession");
-//        Method m = c.getMethod("getAttribute",new Class[]{String.class});
-//        servlet22Installed = true;
-//    }
-//    catch (ClassNotFoundException cnfe) {}
-//    // Check for JSP 1.1:
-//    try {
-//        loadClass("javax.servlet.jsp.tagext.Tag");
-//        jsp11Installed = true;
-//    }
-//    catch (ClassNotFoundException cnfe) {}
-//    // Check that the Messenger jar are installed:
-//    try {
-//        loadClass("org.jivesoftware.xmpp.XMPPServer");
-//        jiveJarsInstalled = true;
-//    }
-//    catch (ClassNotFoundException cnfe) {}
+    // Check for JDK 1.5
+    try {
+        loadClass("java.util.concurrent.ConcurrentHashMap");
+        jdk13Installed = true;
+    }
+    catch (ClassNotFoundException cnfe) {}
+    // Check for Servlet 2.3:
+    try {
+        Class c = loadClass("javax.servlet.http.HttpSession");
+        Method m = c.getMethod("getAttribute",new Class[]{String.class});
+        servlet22Installed = true;
+    }
+    catch (ClassNotFoundException cnfe) {}
+    // Check for JSP 1.1:
+    try {
+        loadClass("javax.servlet.jsp.tagext.Tag");
+        jsp11Installed = true;
+    }
+    catch (ClassNotFoundException cnfe) {}
+    // Check that the Messenger jar are installed:
+    try {
+        loadClass("org.jivesoftware.xmpp.XMPPServer");
+        jiveJarsInstalled = true;
+    }
+    catch (ClassNotFoundException cnfe) {}
 
     // Try to determine what the jiveHome directory is:
-//    try {
-//        Class jiveGlobalsClass = loadClass("org.jivesoftware.xmpp.JiveGlobals");
-//        Method getJiveHomeMethod = jiveGlobalsClass.getMethod("getJiveHome", null);
-//        String jiveHomeProp = (String)getJiveHomeMethod.invoke(jiveGlobalsClass, null);
-//        if (jiveHomeProp != null) {
-//            jiveHome = new File(jiveHomeProp);
-//            if (jiveHome.exists()) {
-//                jiveHomeExists = true;
-//            }
-//        }
-//    }
-//    catch (Exception e) {
-//        e.printStackTrace();
-//    }
+    try {
+        Class jiveGlobalsClass = loadClass("org.jivesoftware.xmpp.JiveGlobals");
+        Method getJiveHomeMethod = jiveGlobalsClass.getMethod("getJiveHome", (Class[])null);
+        String jiveHomeProp = (String)getJiveHomeMethod.invoke(jiveGlobalsClass, (Object[])null);
+        if (jiveHomeProp != null) {
+            jiveHome = new File(jiveHomeProp);
+            if (jiveHome.exists()) {
+                jiveHomeExists = true;
+            }
+        }
+    }
+    catch (Exception e) {
+        e.printStackTrace();
+    }
 
     // If there were no errors, redirect to the main setup page
     if (!jdk13Installed || !servlet22Installed || !jsp11Installed || !jiveJarsInstalled

src/web/setup-host-settings.jsp

@@ -11,7 +11,7 @@
                  java.util.HashMap,
                  java.net.InetAddress" %>
 
-<%@ include file="setup-global.jsp" %>
+<%@ include file="setup-global.jspf" %>
 
 <%  // Get parameters
     String domain = ParamUtils.getParameter(request,"domain");

src/web/setup-index.jsp

@@ -22,7 +22,7 @@
     static final String JIVE_CONFIG_FILE = "jive_config_file";
 %>
 
-<%@ include file="setup-global.jsp" %>
+<%@ include file="setup-global.jspf" %>
 
 <%@ include file="setup-env-check.jspf" %>