Lock Files moved to central location, Service validation removed, Service auto start removed

Committed by: Jarrett Jordaan Reviewed by: Paul Barrett

Lock Files moved to central location, Service validation removed, Service auto start removed
Committed by: Jarrett Jordaan Reviewed by: Paul Barrett
Jarrett Jordaan
1 parent 4c2facdd
Showing 21 changed files with 444 additions and 82 deletions
dmsctl.sh
setup/migrate/steps/migrateDatabase.php
setup/upgrade/upgrade.lock
setup/upgrade/upgradeUtil.php
setup/upgrade/upgradeWizard.php
setup/wizard/iniUtilities.php
setup/wizard/installUtil.php
setup/wizard/installWizard.php
setup/wizard/installer.php
setup/wizard/lib/services/unixLucene.php
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/lib/services/unixScheduler.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/lib/validation/luceneValidation.php
setup/wizard/steps/configuration.php
setup/wizard/steps/database.php
setup/wizard/steps/dependencies.php
setup/wizard/steps/registration.php
setup/wizard/steps/services.php
setup/wizard/templates/installtype.tpl
+#!/bin/sh
+
+# Boot KnowledgeTree services
+# chkconfig: 2345 55 25
+# description: KnowledgeTree Services
+#
+# processname: ktdms 
+
+HOSTNAME=`hostname`
+RETVAL=0
+PID=""
+ERROR=0
+SERVER=all
+VDISPLAY="99"
+INSTALL_PATH=`pwd`
+JAVABIN=/usr/bin/java
+ZEND_DIR=/usr/local/zend
+
+# OpenOffice
+SOFFICEFILE=soffice
+SOFFICE_PIDFILE=$INSTALL_PATH/var/log/soffice.bin.pid
+SOFFICE_PID=""
+SOFFICE_PORT="8100"
+SOFFICEBIN=/usr/bin/soffice
+SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager"
+SOFFICE_STATUS=""
+
+# Lucene
+LUCENE_PIDFILE=$INSTALL_PATH/var/log/lucene.pid
+LUCENE_PID=""
+LUCENE="$JAVABIN -Xms512M -Xmx512M -jar ktlucene.jar"
+LUCENE_STATUS=""
+
+# Scheduler
+SCHEDULER_PATH="$INSTALL_PATH/bin/"
+SCHEDULER_PIDFILE=$INSTALL_PATH/var/log/scheduler.pid
+SCHEDULER_PID=""
+SCHEDULERBIN="$INSTALL_PATH/var/bin/schedulerTask.sh"
+SCHEDULER="$SCHEDULERBIN"
+SCHEDULER_STATUS=""
+
+get_pid() {
+    PID=""
+    PIDFILE=$1
+    # check for pidfile
+    if [ -f $PIDFILE ] ; then
+        exec 6<&0
+        exec < $PIDFILE
+        read pid
+        PID=$pid
+        exec 0<&6 6<&-
+    fi
+}
+
+get_soffice_pid() {
+    get_pid $SOFFICE_PIDFILE
+    if [ ! $PID ]; then
+        return 
+    fi
+    if [ $PID -gt 0 ]; then
+        SOFFICE_PID=$PID
+    fi
+}
+
+get_lucene_pid() {
+    get_pid $LUCENE_PIDFILE
+    if [ ! $PID ]; then
+        return 
+    fi
+    if [ $PID -gt 0 ]; then
+        LUCENE_PID=$PID
+    fi
+}
+
+get_scheduler_pid() {
+    get_pid $SCHEDULER_PIDFILE
+    if [ ! $PID ]; then
+        return 
+    fi
+    if [ $PID -gt 0 ]; then
+        SCHEDULER_PID=$PID
+    fi
+}
+
+is_service_running() {
+    PID=$1
+    if [ "x$PID" != "x" ] && kill -0 $PID 2>/dev/null ; then
+        RUNNING=1
+    else
+        RUNNING=0
+    fi
+    return $RUNNING
+}
+
+is_soffice_running() {
+    get_soffice_pid
+    is_service_running $SOFFICE_PID
+    RUNNING=$?
+    if [ $RUNNING -eq 0 ]; then
+        SOFFICE_STATUS="openoffice not running"
+    else
+        SOFFICE_STATUS="openoffice already running"
+    fi
+    return $RUNNING
+}
+
+is_lucene_running() {
+    get_lucene_pid
+    is_service_running $LUCENE_PID
+    RUNNING=$?
+    if [ $RUNNING -eq 0 ]; then
+        LUCENE_STATUS="lucene not running"
+    else
+        LUCENE_STATUS="lucene already running"
+    fi
+    return $RUNNING
+}
+
+is_scheduler_running() {
+    get_scheduler_pid
+    is_service_running $SCHEDULER_PID
+    RUNNING=$?
+    if [ $RUNNING -eq 0 ]; then
+        SCHEDULER_STATUS="scheduler not running"
+    else
+        SCHEDULER_STATUS="scheduler already running"
+    fi
+    return $RUNNING
+}
+
+start_soffice() {
+    is_soffice_running
+    RUNNING=$?
+
+    if [ $RUNNING -eq 1 ]; then
+        echo "$0 $ARG: openoffice (pid $SOFFICE_PID) already running"
+    else
+        nohup $SOFFICE &> $INSTALL_PATH/var/log/dmsctl.log &
+        if [ $? -eq 0 ]; then
+            echo "$0 $ARG: openoffice started at port $SOFFICE_PORT"
+            ps ax | grep $SOFFICEBIN | awk {'print $1'} > $SOFFICE_PIDFILE
+            sleep 2
+        else
+            echo "$0 $ARG: openoffice could not be started"
+            ERROR=3
+        fi
+fi
+}
+
+stop_soffice() {
+    NO_EXIT_ON_ERROR=$1
+    is_soffice_running
+    RUNNING=$?
+
+    if [ $RUNNING -eq 0 ]; then
+        echo "$0 $ARG: $SOFFICE_STATUS"
+        if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then
+            exit
+        else
+            return
+        fi
+    fi
+    get_soffice_pid
+	if killall $SOFFICEFILE; then
+	    echo "$0 $ARG: openoffice stopped"
+	else
+	    echo "$0 $ARG: openoffice could not be stopped"
+	    ERROR=4
+	fi
+}
+
+start_lucene() {
+    is_lucene_running
+    RUNNING=$?
+
+    if [ $RUNNING -eq 1 ]; then
+        echo "$0 $ARG: lucene (pid $LUCENE_PID) already running"
+    else
+        cd $INSTALL_PATH/bin/luceneserver
+        nohup $LUCENE  &> $INSTALL_PATH/var/log/dmsctl.log &
+        if [ $? -eq 0 ]; then
+            echo "$0 $ARG: lucene started"
+            ps ax | grep ktlucene.jar | awk {'print $1'} > $LUCENE_PIDFILE
+            sleep 2
+        else
+            echo "$0 $ARG: lucene could not be started"
+            ERROR=3
+        fi
+        cd $INSTALL_PATH
+fi
+}
+
+stop_lucene() {
+    NO_EXIT_ON_ERROR=$1
+    is_lucene_running
+    RUNNING=$?
+
+    if [ $RUNNING -eq 0 ]; then
+        echo "$0 $ARG: $LUCENE_STATUS"
+        if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then
+            exit
+        else
+            return
+        fi
+	fi
+    get_lucene_pid
+    cd $INSTALL_PATH/search2/indexing/bin
+    $ZEND_DIR/bin/php shutdown.php positive &> $INSTALL_PATH/var/log/dmsctl.log
+    sleep 5
+    if [ $? -eq 0 ]; then
+	    echo "$0 $ARG: lucene stopped"
+	else
+	    echo "$0 $ARG: lucene could not be stopped"
+	    ERROR=4
+	fi
+}
+
+start_scheduler() {
+    is_scheduler_running
+    RUNNING=$?
+
+    if [ $RUNNING -eq 1 ]; then
+        echo "$0 $ARG: scheduler (pid $SCHEDULER_PID) already running"
+    else
+        cd $SCHEDULER_PATH
+        nohup $SCHEDULER  &> $INSTALL_PATH/var/log/dmsctl.log &
+        if [ $? -eq 0 ]; then
+            echo "$0 $ARG: scheduler started"
+            ps ax | grep $SCHEDULERBIN | awk {'print $1'} > $SCHEDULER_PIDFILE
+            sleep 2
+        else
+            echo "$0 $ARG: scheduler could not be started"
+            ERROR=3
+        fi
+    fi
+}
+
+stop_scheduler() {
+    NO_EXIT_ON_ERROR=$1
+    is_scheduler_running
+    RUNNING=$?
+
+    if [ $RUNNING -eq 0 ]; then
+        echo "$0 $ARG: $SCHEDULER_STATUS"
+        if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then
+            exit
+        else
+            return
+        fi
+	fi
+    get_scheduler_pid
+	if kill $SCHEDULER_PID ; then
+	    echo "$0 $ARG: scheduler stopped"
+	else
+	    echo "$0 $ARG: scheduler could not be stopped"
+	    ERROR=4
+	fi
+}
+
+help() {
+	echo "usage: $0 help"
+	echo "       $0 (start|stop|restart)"
+	echo "       $0 (start|stop|restart) scheduler"
+	echo "       $0 (start|stop|restart) soffice"
+	echo "       $0 (start|stop|restart) lucene"
+	cat <<EOF
+
+help       - this screen
+start      - start the service(s)
+stop       - stop  the service(s)
+restart    - restart or start the service(s)
+
+EOF
+exit 0
+}
+
+noserver() {
+       echo -e "ERROR: $1 is not a valid server. Please, select 'scheduler', 'soffice' or 'lucene'\n"
+       help
+}
+
+[ $# -lt 1 ] && help
+
+if [ ! -z ${2} ]; then
+       [ "${2}" != "mysql" ] && [ "${2}" != "apache" ] && [ "${2}" != "agent" ] && [ "${2}" != "scheduler" ] && [ "${2}" != "soffice" ] && [ "${2}" != "lucene" ] && noserver $2
+       SERVER=$2
+fi
+       
+
+if [ "x$3" != "x" ]; then
+    MYSQL_PASSWORD=$3
+fi
+
+
+case $1 in
+       help)   help
+               ;;
+       start)
+               if [ "${SERVER}" != "all" ]; then
+                       start_${2}
+               else
+                       start_soffice
+                       start_lucene
+                       start_scheduler
+               fi
+               ;;
+       stop)   if [ "${SERVER}" != "all" ]; then
+                       stop_${2}
+               else
+                       stop_scheduler "no_exit"
+                       stop_lucene "no_exit"
+                       stop_soffice "no_exit"
+               fi
+               ;;
+       restart)        if [ "${SERVER}" != "all" ]; then
+                               stop_${2} "no_exit"
+                               sleep 2
+                               start_${2}
+                       else
+                               stop_scheduler "no_exit"
+                               stop_lucene "no_exit"
+                               stop_soffice "no_exit"
+                               start_soffice
+                               start_lucene
+                               start_scheduler
+                       fi
+               ;;
+esac
+
+exit $ERROR
 \ No newline at end of file
@@ -206,7 +206,7 @@ class migrateDatabase extends Step
      * @return void
      */
     private function createMigrateFile() {
-        @touch($this->wizardLocation . DIRECTORY_SEPARATOR . "migrate.lock");
+        @touch(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock");
     }
 	/**
@@ -52,7 +52,7 @@ class UpgradeUtil extends InstallUtil {
 	* @return boolean
  	*/
 	public function isSystemUpgraded() {
-		if (file_exists(dirname(__FILE__)."/upgrade.lock")) {
+		if (file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock")) {
 			return true;
 		}
@@ -68,7 +68,7 @@ class UpgradeUtil extends InstallUtil {
      * @return boolean
      */
     public function isMigration() {
-    	if(file_exists("../wizard/migrate.lock"))
+    	if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock"))
     		return true;
     	return false;
     }
@@ -155,7 +155,7 @@ class UpgradeWizard {
 	* @return void
  	*/
 	private function createUpgradeFile() {
-		@touch("upgrade.lock");
+		@touch(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock");
 	}
 	/**
@@ -167,7 +167,7 @@ class UpgradeWizard {
 	* @return void
  	*/
 	private function removeUpgradeFile() {
-		@unlink("upgrade.lock");
+		@unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock");
 	}
 	/**
@@ -136,14 +136,14 @@ class iniUtilities {
         $fileHandle = fopen($iniFile, 'wb');
         foreach ($this->cleanArray as $section => $items) {
             if (substr($section, 0, strlen('_blankline_')) === '_blankline_' ) {
-                fwrite ($fileHandle, "\r\n");
+                @fwrite ($fileHandle, "\r\n");
                 continue;
             }
             if (substr($section, 0, strlen('_comment_')) === '_comment_' ) {
-                fwrite ($fileHandle, "$items\r\n");
+                @fwrite ($fileHandle, "$items\r\n");
                 continue;
             }
-            fwrite ($fileHandle, "[".$section."]\r\n");
+            @fwrite ($fileHandle, "[".$section."]\r\n");
             foreach ($items as $key => $value) {
                 if (substr($key, 0, strlen('_blankline_')) === '_blankline_' ) {
                     fwrite ($fileHandle, "\r\n");
@@ -156,10 +156,10 @@ class iniUtilities {
                 $value = addcslashes($value,'');
                 //fwrite ($fileHandle, $key.' = "'.$value."\"\r\n");
-                fwrite ($fileHandle, $key.' = '.$value."\r\n");
+                @fwrite ($fileHandle, $key.' = '.$value."\r\n");
             }
         }
-        fclose($fileHandle);
+        @fclose($fileHandle);
     }
     function itemExists($checkSection, $checkItem) {
@@ -179,7 +179,6 @@ class iniUtilities {
     }
     function addItem($addSection, $addItem, $value, $itemComment = '', $sectionComment = '') {
-
         if($this->itemExists($addSection, $addItem)) {
             $this->delItem($addSection, $addItem);
         }
@@ -67,7 +67,7 @@ class InstallUtil {
 	* @return boolean
  	*/
 	public function isSystemInstalled() {
-		if (file_exists(dirname(__FILE__)."/install.lock")) {
+		if (file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock")) {
 			return true;
 		}
 		return false;
@@ -363,13 +363,13 @@ class InstallUtil {
      * @return boolean
      */
     public function canWriteFile($filename) {
-    	$fh = fopen($filename, "w+");
-    	$fr = fwrite($fh, 'test');
+    	$fh = @fopen($filename, "w+");
+    	$fr = @fwrite($fh, 'test');
     	if($fr === false) {
     		return false;
     	}
-    	fclose($fh);
+    	@fclose($fh);
     	return true;
     }
@@ -714,8 +714,8 @@ class InstallUtil {
      * @return void
      */
     function deleteMigrateFile() {
-    	if(file_exists("migrate.lock"))
-    		@unlink("migrate.lock");
+    	if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock"))
+    		@unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock");
     }
     /**
@@ -726,7 +726,7 @@ class InstallUtil {
      * @return boolean
      */
     public function isMigration() {
-    	if(file_exists("migrate.lock"))
+    	if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock"))
     		return true;
     	return false;
     }
@@ -203,7 +203,7 @@ class InstallWizard {
 	* @return void
  	*/
 	private function createInstallFile() {
-		@touch("install.lock");
+		@touch(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
 	}
 	/**
@@ -215,8 +215,8 @@ class InstallWizard {
 	* @return void
  	*/
 	private function removeInstallFile() {
-		if(file_exists("install.lock"))
-			unlink("install.lock");
+		if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock"))
+			@unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
 	}
 	/**
@@ -413,7 +413,7 @@ class Installer {
 	* @return void
 	*/
     private function _completeInstall() {
-    	@touch("install.lock");
+    	@touch(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
     }
 	/**
@@ -210,9 +210,10 @@ class unixLucene extends unixService {
 	    		echo "$cmd<br/>";
 	    		return false;
 	    	}
-	    	$response = $this->util->pexec($cmd);
+	    	//$response = $this->util->pexec($cmd);
-	    	return $response;
+//	    	return $response;
+			return false;
     	}
     	return true;
@@ -144,7 +144,8 @@ class unixOpenOffice extends unixService {
 	    		return false;
 	    	}
-	    	return $this->util->pexec($cmd);
+	    	//return $this->util->pexec($cmd);
+	    	return false;
     	}
     	return true;
@@ -181,7 +181,6 @@ class unixScheduler extends unixService {
 		// TODO : Write sh on the fly? Not sure the reasoning here
 		$source = $this->getSchedulerSourceLoc();
 		$this->writeSchedulerTask();
-//		$logFile = $this->outputDir."scheduler.log";
 		$logFile = "/dev/null";
 		@unlink($logFile);
 		if($source) { // Source
@@ -194,9 +193,10 @@ class unixScheduler extends unixService {
     		echo "$cmd<br/>";
     		return ;
     	}
-    	$response = $this->util->pexec($cmd);
+    	//$response = $this->util->pexec($cmd);
-		return $response;
+//		return $response;
+		return false;
 	}
 	public function getName() {
@@ -249,11 +249,11 @@ class windowsScheduler extends windowsService {
 			echo "Attempt to Create {$this->getSchedulerDir()}\\taskrunner.bat<br>";
 		}
 		if(is_readable($this->varDir."bin") && is_writable($this->varDir."bin")) {
-			$fp = fopen($this->getSchedulerDir().""."\taskrunner.bat", "w+");
+			$fp = @fopen($this->getSchedulerDir().""."\taskrunner.bat", "w+");
 			$content = "@echo off \n";
 			$content .= "\"".$this->util->useZendPhp()."php.exe\" "."\"{$this->getSchedulerSource()}\"";
-			fwrite($fp, $content);
-			fclose($fp);
+			@fwrite($fp, $content);
+			@fclose($fp);
 		} else {
 			echo 'Could not write task runner<br>'; // TODO: Should not reach this point
 		}
@@ -114,10 +114,15 @@ class luceneValidation extends serviceValidation {
     private $javaExtCheck = 'cross_orange';
     public function preset() {
-		$this->zendBridgeNotInstalled(); // Set bridge not installed
-		$this->javaVersionInCorrect(); // Set version to incorrect
-		$this->javaNotInstalled(); // Set java to not installed
-		$this->setJava(); // Check if java has been auto detected
+    	/* Rely on Script */
+    	$this->zendBridgeInstalled();
+    	$this->javaVersionCorrect();
+    	$this->javaInstalled();
+    	$this->installed();
+//		$this->zendBridgeNotInstalled(); // Set bridge not installed
+//		$this->javaVersionInCorrect(); // Set version to incorrect
+//		$this->javaNotInstalled(); // Set java to not installed
+//		$this->setJava(); // Check if java has been auto detected
     }
     /**
@@ -668,16 +668,16 @@ class configuration extends Step
      * @return boolean 
      */
     private function writeConfigPath($configPath, $configContent) {
-        $fp = fopen($configPath, 'w+');
-        if(fwrite($fp, $configContent))
+        $fp = @fopen($configPath, 'w+');
+        if(@fwrite($fp, $configContent))
         	return true;
     	return false;
     }
     private function writeCachePath($cachePath, $cacheContent) {
-        $fp = fopen($cachePath, 'w+');
+        $fp = @fopen($cachePath, 'w+');
         if($cacheContent != '') {
-	        if(fwrite($fp, $cacheContent))
+	        if(@fwrite($fp, $cacheContent))
 	        	return true;
         }
     	return false;
@@ -734,7 +734,7 @@ class database extends Step
     }
 	private function parse_mysql_dump($url) {
-	    $handle = fopen($url, "r");
+	    $handle = @fopen($url, "r");
 	    $query = "";
 		if ($handle) {
 			while (!feof($handle)) {
@@ -744,7 +744,7 @@ class database extends Step
      					$query = '';
     				}
 			}
-			fclose($handle);
+			@fclose($handle);
 		}
 		return true;
@@ -778,11 +778,13 @@ class database extends Step
     private function writeBinaries() {
     	$services = $this->util->getDataFromSession('services');
     	$binaries = $services['binaries'];
-    	foreach ($binaries as $k=>$bin) {
-    		if($k != 1) {
-    			$updateBin = 'UPDATE config_settings c SET c.value = "'.$bin.'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
-				$this->util->dbUtilities->query($updateBin);
-    		}
+    	if($binaries) {
+	    	foreach ($binaries as $k=>$bin) {
+	    		if($k != 1) {
+	    			$updateBin = 'UPDATE config_settings c SET c.value = "'.$bin.'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
+					$this->util->dbUtilities->query($updateBin);
+	    		}
+	    	}
     	}
     	// if Windows, hard code (relative to SYSTEM_ROOT) where we expect the Zend MSI installer to have placed them
@@ -333,7 +333,7 @@ class dependencies extends Step
      */
     private function getRequiredExtensions() {
     	$ext = array(
-	            array('extension' => 'fileinfo', 'required' => 'no', 'name' => 'Fileinfo', 'details' => 'Provides better file identification support - not necessary if you use file extensions.'),
+//	            array('extension' => 'fileinfo', 'required' => 'no', 'name' => 'Fileinfo', 'details' => 'Provides better file identification support - not necessary if you use file extensions.'),
 	            array('extension' => 'iconv', 'required' => 'no', 'name' => 'IconV', 'details' => 'Used for conversion between character sets.'),
 	            array('extension' => 'mysql', 'required' => 'yes', 'name' => 'MySQL', 'details' => 'Used for accessing a MySQL database.'),
 	            array('extension' => 'curl', 'required' => 'yes', 'name' => 'cURL', 'details' => 'Allows the connection and communication between different servers types using various protocols.'),
@@ -183,7 +183,7 @@ class registration extends Step
             $params['http']['header'] = $optional_headers;
         }
         $ctx = stream_context_create($params);
-        $fp = fopen($url, 'r', false, $ctx);
+        $fp = @fopen($url, 'r', false, $ctx);
         if (!$fp) {
             throw new Exception("Problem with $url, $php_errormsg");
         }
@@ -192,7 +192,7 @@ class registration extends Step
             fclose($fp);
             throw new Exception("Problem reading data from $url, $php_errormsg");
         }
-        fclose($fp);
+        @fclose($fp);
         return $response;
     }
@@ -143,8 +143,27 @@ class services extends Step
 	* @return object
  	*/
 	public $schedulerValidation;
-   
+
+	/**
+	* List of binaries needed to start service
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+	* @return object
+ 	*/
 	public $binaries = array();
+	
+	/**
+	* List of binaries needed to start service
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+	* @return object
+ 	*/
+	public $validation = false;
+	
 	/**
 	* Main control of services setup
 	*
@@ -203,6 +222,8 @@ class services extends Step
     		$this->alreadyInstalled = true;
     		$this->serviceCheck = 'tick';
     	} else {
+//    		$cmd = SYSTEM_DIR."dmsctl.sh start  > /dev/null 2>&1 & echo $!";
+//    		$this->util->pexec($cmd); // First Attempt to start all using bash script
 	    	foreach ($this->getServices() as $bin=>$service) {
 	    		$class = strtolower($service)."Validation";
 				$this->$class->preset(); // Sets defaults
@@ -523,6 +544,7 @@ class services extends Step
     	$this->temp_variables['alreadyInstalled'] = $this->alreadyInstalled;
     	$this->temp_variables['serviceCheck'] = $this->serviceCheck;
     	$this->temp_variables['binaries'] = $this->binaries;
+    	$this->temp_variables['validation'] = $this->validation;
     }
@@ -9,14 +9,14 @@
 				<td> <input type="radio" name="installtype" value="Clean Install" checked id="clean" /> </td>
 				<td> <label for="clean"><b>Default Install</b> <br/>Install a new copy of KnowledgeTree</label> </td>
 			</tr>
-			<tr>
+<!--			<tr>
 				<td> <input type="radio" name="installtype" value="Upgrade Installation" id="migrate" /> </td>
 				<td> <label for="migrate"><b>Upgrade - KnowledgeTree Stack</b> <br/> Upgrade from a previous version of the KnowledgeTree Stack</label></td>
 			</tr>
 			<tr>
 				<td> <input type="radio" name="installtype" value="Upgrade Only" id="upgrade" /> </td>
 				<td> <label for="upgrade"><b>Upgrade - Source Only</b> <br/> Upgrade from a Source Only Installation of KnowledgeTree</label></td>
-			</tr>
+			</tr>-->
 		</table>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
@@ -40,37 +40,38 @@
 <!--Content-->
 	<div id="step_content_configuration" class="step">
 		<?php if(!$alreadyInstalled) { ?>
-			<?php if($javaExeError) { ?>
-				Specify the location of your Java executable
-				&nbsp;&nbsp;&nbsp;
-				<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>' style="float:none;"/>
-				&nbsp;&nbsp;&nbsp;
-				<a href="javascript:{w.sendJavaLocation();}" class="specify">Submit</a>
-				<br/>
-				<?php if($javaExeError != '') { ?><span class="error"><?php echo $javaExeMessage; ?></span><?php } ?>
-				<br/>
-			<?php } ?>
-			<?php if($phpExeError != '') { ?>
-				<br />
-				Specify the location of your PHP executable
-				<br />
-				<?php if($php['location'] == '') { ?>
-					<input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
-				<?php } else { ?>
-					<input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+			<?php if($validation) { ?>
+				<?php if($javaExeError) { ?>
+					Specify the location of your Java executable
+					&nbsp;&nbsp;&nbsp;
+					<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>' style="float:none;"/>
+					&nbsp;&nbsp;&nbsp;
+					<a href="javascript:{w.sendJavaLocation();}" class="specify">Submit</a>
+					<br/>
+					<?php if($javaExeError != '') { ?><span class="error"><?php echo $javaExeMessage; ?></span><?php } ?>
+					<br/>
+				<?php } ?>
+				<?php if($phpExeError != '') { ?>
+					<br />
+					Specify the location of your PHP executable
+					<br />
+					<?php if($php['location'] == '') { ?>
+						<input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+					<?php } else { ?>
+						<input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+					<?php } ?>
+					&nbsp;&nbsp;&nbsp;
+					<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
+				<?php } ?>
+				<?php if($openOfficeExeError) { ?>
+					Specify the location of your Open Office executable
+					&nbsp;&nbsp;&nbsp;
+					<input name='soffice' id='port' size='25' value='<?php if(isset($soffice['location'])) echo $soffice['location']; ?>' style="float:none;"/>
+					&nbsp;&nbsp;&nbsp;
+					<a href="javascript:{w.sendJavaLocation();}" class="specify">Submit</a>
+					<br/>
+					<?php if($openOfficeExeError != '') { ?><span class="error"><?php echo $openOfficeExeMessage; ?></span><?php } ?>
 				<?php } ?>
-				&nbsp;&nbsp;&nbsp;
-				<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
-			<?php } ?>
-			<?php if($openOfficeExeError) { ?>
-				Specify the location of your Open Office executable
-				&nbsp;&nbsp;&nbsp;
-				<input name='soffice' id='port' size='25' value='<?php if(isset($soffice['location'])) echo $soffice['location']; ?>' style="float:none;"/>
-				&nbsp;&nbsp;&nbsp;
-				<a href="javascript:{w.sendJavaLocation();}" class="specify">Submit</a>
-				<br/>
-				<?php if($openOfficeExeError != '') { ?><span class="error"><?php echo $openOfficeExeMessage; ?></span><?php } ?>
-			<?php } ?>
 			<h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
 			<?php if($silent) { ?>
 				<?php if($javaExeError) {
@@ -163,6 +164,7 @@
 					</div>
 				<?php } ?>
 			<?php } ?>
+			<?php } ?>
 		<?php } else { ?>
 <!--			<p class="description">-->
 			All services are already installed.