Updated install docs after running through process.

Adjusted fastpath startup routine to refuse startup if enterprise is installed.


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10273 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_5_1/src/plugins/fastpath/readme.html

@@ -95,11 +95,12 @@ we need to clean up the old database a bit and change the names of a couple of
 things.  So the steps you will need to perform are as follows: 
 <ol>
 <li>Shut down your server.</li>
+<li>Remove <b>enterprise.jar</b> and the directory <b>enterprise</b>.</li>
 <li>Log into your database, you can use the embedded-db-viewer scripts in bin/extra to access the Embedded database.</li>
-<li>Execute the following SQL: <tt>DELETE FROM jiveVersion WHERE name = "fastpath"</tt></li>
+<li>Execute the following SQL: <tt>DELETE FROM jiveVersion WHERE name = 'fastpath'</tt></li>
 <li>Execute the following SQL (this may fail if you never had enterprise instaled, that is ok): <tt>UPDATE fpWorkgroupProp SET propValue = REPLACE(propValue, 'com.jivesoftware.openfire.fastpath','org.jivesoftware.openfire.fastpath')</tt></li>
 <li>Execute the following SQL (this may fail if you never had enterprise installed, that is ok): <tt>UPDATE fpAgentProp SET propValue = REPLACE(propValue, 'com.jivesoftware.openfire.fastpath','org.jivesoftware.openfire.fastpath')</tt></li>
-<li>Start up your server.  If you had enterprise installed, you -will- see an SQL error show up, but it should only show up once and is ok.  (it is an attempt to recreate a table that already exists)</li>
+<li>Start up your server.  If you had enterprise installed, you -will- see an SQL error show up, but it should only show up once and is ok.  (it is an attempt to recreate a table that already exists)  The error will look like: <tt>fastpath - Database update failed. Please manually upgrade your database.</tt></li>
 </ol>
 
 <b>You only need to do these steps once when moving to this Fastpath plugin.

openfire_3_5_1/src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/FastpathPlugin.java

@@ -28,6 +28,7 @@ import org.xmpp.component.ComponentException;
 import org.xmpp.packet.JID;
 
 import java.io.File;
+import java.io.FileFilter;
 
 /**
  * Openfire Fastpath plugin.
@@ -44,7 +45,21 @@ public class FastpathPlugin implements Plugin, ClusterEventListener {
     public void initializePlugin(PluginManager manager, File pluginDirectory) {
         System.out.println("Starting Fastpath Server");
 
-        // Make sure that the enteprise folder exists under the home directory
+        // Check if we Enterprise is installed and stop loading this plugin if found
+        File pluginDir = new File(JiveGlobals.getHomeDirectory(), "plugins");
+        File[] jars = pluginDir.listFiles(new FileFilter() {
+            public boolean accept(File pathname) {
+                String fileName = pathname.getName().toLowerCase();
+                return (fileName.equalsIgnoreCase("enterprise.jar"));
+            }
+        });
+        if (jars.length > 0) {
+            // Do not load this plugin since Enterprise is still installed
+            System.out.println("Enterprise plugin found. Stopping Fastpath Plugin");
+            throw new IllegalStateException("This plugin cannot run next to the Enterprise plugin");
+        }
+
+        // Make sure that the fastpath folder exists under the home directory
         File fastpathDir = new File(JiveGlobals.getHomeDirectory() +
             File.separator + "fastpath");
         if (!fastpathDir.exists()) {