Story Id:1166880 Daily Commit

Committed by: Jarrett Jordaan Reviewed by: Paul Barrett

Story Id:1166880 Daily Commit
Committed by: Jarrett Jordaan Reviewed by: Paul Barrett
unknown
1 parent 58108eb8
Showing 5 changed files with 60 additions and 24 deletions
bin/luceneserver/KnowledgeTreeIndexer.properties
setup/wizard/lib/helpers/demo.sh
setup/wizard/lib/helpers/javaVersion.class
setup/wizard/lib/helpers/javaVersion.java
setup/wizard/lib/services/windowsLucene.php
@@ -2,6 +2,6 @@ server.port=8875
 server.paranoid=false
 server.accept=127.0.0.1
 server.deny=
-indexer.directory=../../../var/indexes
+indexer.directory=../../var/indexes
 indexer.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer
+import java.io.*;
+import java.lang.System;
+import java.util.Properties;
+
+public class javaVersion {
+
+	public static void main(String args[]) throws Exception {
+		String outJV = args[0];
+		String outJVHome = args[1];
+		Properties sysProps = new Properties();
+		sysProps = System.getProperties();
+		String sysVersion = sysProps.getProperty("java.version");
+		String javaHome = sysProps.getProperty("java.home");
+		try{
+	    	// Create file
+	    	FileWriter fstream = new FileWriter(outJV);
+	        BufferedWriter out = new BufferedWriter(fstream);
+	    	out.write(sysVersion);
+	    	//Close the output stream
+	    	out.close();
+	    	fstream = new FileWriter(outJVHome);
+	        out = new BufferedWriter(fstream);
+	    	out.write(javaHome);
+	    	//Close the output stream
+	    	out.close();
+    	} catch (Exception e){//Catch exception if any
+      		System.err.println("Error: " + e.getMessage());
+    	}
+	}
+}
 \ No newline at end of file
@@ -140,7 +140,6 @@ class windowsLucene extends windowsService {
 	* @return void
  	*/
 	public function load() {
-//		$this->name = "KTLuceneTest";
 		$this->setJavaBin();
 		$this->setLuceneDIR(SYSTEM_DIR."bin".DS."luceneserver");
 		$this->setLuceneExe("KTLuceneService.exe");
@@ -152,6 +151,25 @@ class windowsLucene extends windowsService {
 	}
 	/**
+	* Retrieve Status Service
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+	* @return string
+ 	*/
+	public function status() {
+		$cmd = "sc query {$this->name}";
+		$response = $this->util->pexec($cmd);
+		if($response['out']) {
+			$state = preg_replace('/^STATE *\: *\d */', '', trim($response['out'][3])); // Status store in third key
+			return $state;
+		}
+		
+		return '';
+	}
+	
+	/**
 	* Set Java Directory path
 	*
 	* @author KnowledgeTree Team
@@ -169,29 +187,12 @@ class windowsLucene extends windowsService {
 			}
 		}
 		// TODO: Will not detect, but a java pre-check is done in services, before this
-		if ($this->util->getJava()) {
-		} else {
-		}
-		$this->javaBin = 'java';
-	}
-	
-	/**
-	* Retrieve Status Service
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @param none
-	* @return string
- 	*/
-	public function status() {
-		$cmd = "sc query {$this->name}";
-		$response = $this->util->pexec($cmd);
-		if($response['out']) {
-			$state = preg_replace('/^STATE *\: *\d */', '', trim($response['out'][3])); // Status store in third key
-			return $state;
+		if(file_exists(SYS_OUT_DIR.'outJVHome')) {
+			$this->javaBin = file_get_contents(SYS_OUT_DIR.'outJVHome');
+			if($this->javaBin != '') return true;
 		}
-		return '';
+		return false;
 	}
 	/**
@@ -369,6 +370,10 @@ class windowsLucene extends windowsService {
 			$this->javaJVM = $this->getJavaBin().DS."client".DS."jvm.dll";
 		} elseif (file_exists($this->getJavaBin().DS."server".DS."jvm.dll")) {
 			$this->javaJVM = $this->getJavaBin().DS."server".DS."jvm.dll";
+		} elseif (file_exists($this->getJavaBin().DS."bin".DS."client".DS."jvm.dll")) {
+			$this->javaJVM = $this->getJavaBin().DS."bin".DS."client".DS."jvm.dll";
+		} 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;
 		}
@@ -397,10 +402,11 @@ class windowsLucene extends windowsService {
 	public function install() {
 		$state = $this->status();
 		if($state == '') {
-			$this->writeLuceneProperties();
+			//$this->writeLuceneProperties();
 			$luceneExe = $this->getLuceneExe();
 			$luceneSource = $this->getLuceneSource();
 			$luceneDir = $this->getluceneDir();
+			$javaJVM = $this->getJavaJVM();
 			if($luceneExe && $luceneSource && $luceneDir) {
 				$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
             	if(DEBUG) {