KTS-4438: Updated Services

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

KTS-4438: Updated Services
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 68cc1b4b
Showing 6 changed files with 90 additions and 9 deletions
setup/wizard/installUtil.php
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/lib/validation/luceneValidation.php
setup/wizard/lib/validation/openofficeValidation.php
@@ -748,17 +748,17 @@ class InstallUtil {
      */
     public function useZendPhp() {
 	    if($this->installEnvironment() == 'Zend') {
-	    	if(WINDOWS_OS) {
+	    	if(WINDOWS_OS) { // For Zend Installation only
 				$sysdir = explode(DS, SYSTEM_DIR);
 				array_pop($sysdir);
 				array_pop($sysdir);
-				array_pop($sysdir);
-				array_pop($sysdir);
 				$zendsys = '';
 				foreach ($sysdir as $k=>$v) {
 					$zendsys .= $v.DS;
 				}
-				return $zendsys."ZendServer".DS."bin".DS;
+				$bin = $zendsys."ZendServer".DS."bin".DS;
+				if(file_exists($bin))
+					return $bin;
 	    	} else {
 	    		return DS."usr".DS."local".DS."zend".DS."bin".DS;
 	    	}
@@ -377,10 +377,32 @@ class windowsLucene extends windowsService {
 		} elseif (file_exists($this->getJavaBin().DS."bin".DS."server".DS."jvm.dll")) {
 			$this->javaJVM = $this->getJavaBin().DS."bin".DS."server".DS."jvm.dll";
 		} else {
-			return false;
+			$javaJVM = $this->useZendJVM();
+			if(file_exists($javaJVM)) {
+				$this->javaJVM = $javaJVM;
+			}
 		}
 	}
+    public function useZendJVM() {
+	    if($this->util->installEnvironment() == 'Zend') {
+	    	if(WINDOWS_OS) { // For Zend Installation only
+				$sysdir = explode(DS, SYSTEM_DIR);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				$zendsys = '';
+				foreach ($sysdir as $k=>$v) {
+					$zendsys .= $v.DS;
+				}
+				$jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll";
+				if(file_exists($jvm))
+					return $jvm;
+	    	}
+	    }
+	    
+	    return false;
+    }
+	
 	/**
 	* Get Java JVM path
 	*
@@ -203,7 +203,7 @@ class windowsOpenOffice extends windowsService {
     		//$binary = $this->util->openOfficeSpecified();
     		$binary = $this->getBin();
     		if($binary != '') {
-            	$cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
+            	$cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
 	        	if(DEBUG) {
 	        		echo "Command : $cmd<br/>";
 	        		return ;
@@ -209,6 +209,9 @@ class windowsScheduler extends windowsService {
             		echo '<pre>';
             		print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
     	            echo '</pre>';
+    	            echo '<pre>';
+    	            print_r(file_get_contents($this->getSchedulerScriptPath()));
+    	            echo '</pre>';
             		return ;
             	}
     			$response = win32_create_service(array(
@@ -355,6 +355,25 @@ class luceneValidation extends serviceValidation {
     	}    	
     }
+    public function useZendJava() {
+	    if($this->util->installEnvironment() == 'Zend') {
+	    	if(WINDOWS_OS) { // For Zend Installation only
+				$sysdir = explode(DS, SYSTEM_DIR);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				$zendsys = '';
+				foreach ($sysdir as $k=>$v) {
+					$zendsys .= $v.DS;
+				}
+				$java = $zendsys."jre".DS."bin".DS."java.exe";
+				if(file_exists($java))
+					return $java;
+	    	}
+	    }
+	    
+	    return false;
+    }
+    
    	/**
 	* Attempts to use user input and configure java settings
 	*
@@ -374,11 +393,24 @@ class luceneValidation extends serviceValidation {
     	if(WINDOWS_OS) { 
     		$cmd = "\"$javaExecutable\" -cp \"".SYS_DIR.";\" javaVersion \"".$this->outputDir."outJV\""." \"".$this->outputDir."outJVHome\"";
     		$func = OS."ReadJVFromFile";
-    		if($this->$func($cmd)) return true;
+    		if($this->$func($cmd)) {
+    			return true;
+    		} else {
+    			$this->java = $this->useZendJava(); // Java not installed
+    			$javaExecutable = $this->java;
+    			$cmd = "\"$javaExecutable\" -cp \"".SYS_DIR.";\" javaVersion \"".$this->outputDir."outJV\""." \"".$this->outputDir."outJVHome\"";
+    			if($this->$func($cmd)) {
+    				return true;
+    			}
+    		}
     	} else {
     		$cmd = "\"$javaExecutable\" -version > ".$this->outputDir."outJV 2>&1 echo $!";
     		$func = OS."ReadJVFromFile";
-    		if($this->$func($cmd)) return true;
+    		if($this->$func($cmd)) {
+    			return true; 
+    		} else {
+				// TODO: Not sure
+    		}
     	}
 		$this->javaVersionInCorrect();
@@ -159,9 +159,33 @@ class openofficeValidation extends serviceValidation {
 				return $pathToBinary;
 			}
 		}
-		
+		$pathToBinary = $this->useZendOffice(); // Check for openoffice in zend
+		if(file_exists($pathToBinary)) {
+			return $pathToBinary;
+		}
+			
 		return false;
 	}
+	
+	public function useZendOffice() {
+	    if($this->util->installEnvironment() == 'Zend') {
+	    	if(WINDOWS_OS) { // For Zend Installation only
+				$sysdir = explode(DS, SYSTEM_DIR);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				$zendsys = '';
+				foreach ($sysdir as $k=>$v) {
+					$zendsys .= $v.DS;
+				}
+				$soffice = $zendsys."openoffice".DS."program".DS."soffice.exe";
+				if(file_exists($soffice))
+					return $soffice;
+	    	}
+	    }
+	    
+	    return false;
+	}
+	
    	/**
     * Set all silent mode varibles
     *