Improved Outline view for PHP function names

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPeclipsePlugin.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 6dea6cf..911cceb 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -93,7 +93,6 @@ public class PHPeclipsePlugin extends AbstractUIPlugin {
                                } else if (version == 3.0) {
                                        jvm = MRJ_3_0;
                                } else if (version >= 3.1) {
-                                       // Assume that all 3.1 and later versions of MRJ work the same.
                                        jvm = MRJ_3_1;
                                }
 
@@ -161,13 +160,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin {
                if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
       store.setDefault(DOCUMENTROOT_PREF, "c:\\eclipse\\workspace");
                        store.setDefault(MYSQL_PREF, "c:\\apache\\mysql\\bin\\mysqld.exe --standalone");
-                       store.setDefault(APACHE_START_PREF, "c:\\apache\\apache.exe \"DocumentRoot \"{0}\"\"");
+                       store.setDefault(APACHE_START_PREF, "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\"");
                        store.setDefault(APACHE_STOP_PREF, "c:\\apache\\apache.exe -k shutdown");
                        store.setDefault(APACHE_RESTART_PREF, "c:\\apache\\apache.exe -k restart");
                } else {
       store.setDefault(DOCUMENTROOT_PREF, "/eclipse/workspace");
                        store.setDefault(MYSQL_PREF, "/apache/mysql/bin/mysqld --standalone");
-                       store.setDefault(APACHE_START_PREF, "/apache/apache \"DocumentRoot \"{0}\"\"");
+                       store.setDefault(APACHE_START_PREF, "/apache/apache -c \"DocumentRoot \"{0}\"\"");
                        store.setDefault(APACHE_STOP_PREF, "/apache/apache.exe -k shutdown");
                        store.setDefault(APACHE_RESTART_PREF, "/apache/apache -k restart");
                }