Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Mark Holtzhausen
2 parents 43f1be01 945a4790
Showing 25 changed files with 33 additions and 506 deletions
setup/migrate/steps/migrateDatabase.php
setup/wizard/batches/lucene_install.bat
setup/wizard/batches/lucene_start.bat
setup/wizard/batches/lucene_uninstall.bat
setup/wizard/batches/scheduler_install.bat
setup/wizard/batches/scheduler_start.bat
setup/wizard/batches/scheduler_uninstall.bat
setup/wizard/lib/system/config-path-mock
setup/wizard/lib/system/config-path-mock-windows
setup/wizard/lib/system/demo.sh
setup/wizard/lib/system/executeCommand.class
setup/wizard/lib/system/executeCommand.java
setup/wizard/lib/system/javaVersion.class
setup/wizard/lib/system/javaVersion.java
setup/wizard/lib/system/openOffice.class
setup/wizard/lib/system/openOffice.java
setup/wizard/lib/system/perms.sh
setup/wizard/lib/system/phpinfo.php
setup/wizard/lib/system/soffice.php
setup/wizard/lib/system/start.sh
@@ -122,6 +122,7 @@ class migrateDatabase extends Step
     	$dbSettings = $installation['dbSettings'];
     	$location = $installation['location'];
 		$port = $this->util->getPort($location);
+		$socket = $this->getSocket($location);
 		$tmpFolder = $this->resolveTempDir();
     	if(WINDOWS_OS) {
     		$termOrBash = "command prompt window";
@@ -143,7 +144,11 @@ class migrateDatabase extends Step
 		$dbName = $dbSettings['dbName'];
     	if(!$manual) { // Try to export database
 			$sqlFile = $tmpFolder."/kt-backup-$date.sql";
-			$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
+			if($socket != "")
+				$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.' --socket="'.$socket.'" '.$dbName.' > '.$sqlFile;
+			else 
+				$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
+			echo $cmd;
 			$response = $this->util->pexec($cmd);
     	}
 		if(file_exists($sqlFile)) {
@@ -162,7 +167,10 @@ class migrateDatabase extends Step
 		} else {
 			$sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
 		}
-		$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
+		if($socket != "")
+			$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.' --socket="'.$socket.'" '.$dbName.' > '.$sqlFile;
+		else 
+			$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
 		$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
 		$this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
 		$this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
@@ -269,5 +277,27 @@ class migrateDatabase extends Step
     	$this->temp_variables['dumpLocation'] = $this->sqlDumpFile;
     }
+    /**
+     * Return socket of the old installation
+     *
+     * @param location
+     * @return string
+     */
+    public function getSocket($location) {
+    	if(WINDOWS_OS) {
+    		$myIni = "my.ini";
+    	} else {
+    		$myIni = "my.cnf";
+    	}
+    	$dbConfigPath = $location.DS."mysql".DS."$myIni";
+	
+    	if(file_exists($dbConfigPath)) {
+			$this->util->iniUtilities->load($dbConfigPath);
+			$dbSettings = $this->util->iniUtilities->getSection('mysqladmin');
+    		return $dbSettings['socket'];
+    	}
+
+    	return '';
+    }
 }
-?>
 \ No newline at end of file
+?>
-"C:\Program Files\Zend\Apache2\htdocs\knowledgetree\bin\luceneserver\KTLuceneService.exe" -install "KTLuceneTest" "C:\Program Files\Java\jre6\bin\client\jvm.dll" -Djava.class.path="C:\Program Files\Zend\Apache2\htdocs\knowledgetree\bin\luceneserver\ktlucene.jar" -start com.knowledgetree.lucene.KTLuceneServer -out "C:\Program Files\Zend\Apache2\htdocs\knowledgetree\var\log\lucene-out.txt" -err "C:\Program Files\Zend\Apache2\htdocs\knowledgetree\var\log\lucene-err.txt" -current "C:\Program Files\Zend\Apache2\htdocs\knowledgetree\bin\luceneserver" -auto
 \ No newline at end of file
-sc start KTLuceneTest
 \ No newline at end of file
-sc delete KTLuceneTest
 \ No newline at end of file
-sc start KTSchedulerTest
 \ No newline at end of file
-sc delete KTSchedulerTest
 \ No newline at end of file
-/var/lib/knowledgetree
-/var/lib/knowledgetree/Documents
-/var/lib/knowledgetree/indexes
-/etc/knowledgetree/config.ini
-/var/log/knowledgetree
-/var/tmp/knowledgetree
-/var/tmp/knowledgetree/proxies
-/var/tmp/knowledgetree/uploads
-/var/tmp/knowledgetree/cache
 \ No newline at end of file
-C:\ktdms\var
-C:\ktdms\config\config.ini
-C:\ktdms\log
-C:\ktdms\tmp
-C:\ktdms\var\Documents
-C:\ktdms\var\indexes
-C:\ktdms\var\proxies
-C:\ktdms\var\uploads
-C:\ktdms\var\cache
 \ No newline at end of file
-#!/bin/bash
-rm ../../../../var/log/lucene.log;
-rm ../../../../var/log/scheduler.log;
-rm ../../../../var/log/openoffice.log;
-rm ../../../../setup/wizard/output/outJV;
-chmod 777 -R /var/lib/knowledgetree
-chmod 777 -R /var/log/knowledgetree
-chmod 777 -R /var/tmp/knowledgetree
-chmod 777 -R /var/lib/knowledgetree/Documents
-chmod 777 -R /var/lib/knowledgetree/indexes
-chmod 777 -R /var/lib/knowledgetree/proxies
-chmod 777 -R /var/lib/knowledgetree/uploads
-import java.io.*;
-import java.lang.System;
-import java.util.Properties;
-
-public class executeCommand {
-
-	public static void main(String args[]) throws Exception {
-		String command = args[0];
-		try {
-        	// Execute a command without arguments
-        	Process child = Runtime.getRuntime().exec(command);
-    	} catch (IOException e) {
-    		System.err.println("Error: " + e.getMessage());
-    	}
-	}
-}
-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
-import java.io.*;
-import java.lang.System;
-import java.util.Properties;
-
-public class openOffice {
-
-	public static void main(String args[]) throws Exception {
-		String openoffice = args[0];
-		try {
-        	// Execute a command without arguments
-        	String command = ""+openoffice+" -nofirststartwizard -nologo -headless -accept=\"socket,host=localhost,port=8100;urp;StarOffice.ServiceManager\"";
-        	Process child = Runtime.getRuntime().exec(command);
-        	System.out.println(command);
-    	} catch (IOException e) {
-    		System.err.println("Error: " + e.getMessage());
-    	}
-	}
-}
-sudo chown -R www-data:www-data /var/lib/knowledgetree-ce /var/lib/knowledgetree-ce/Documents /var/lib/knowledgetree-ce/indexes /etc/knowledgetree-ce/config.ini /var/log/knowledgetree-ce /var/tmp/knowledgetree-ce /var/tmp/knowledgetree-ce/proxies /var/tmp/knowledgetree-ce/uploads /var/tmp/knowledgetree-ce/cache /usr/share/knowledgetree-ce/var/ /usr/share/knowledgetree-ce/config/
 \ No newline at end of file
-<?php echo phpinfo(); ?>
 \ No newline at end of file
-<?php
-	$cmd = "nohup /usr/bin/soffice -nofirststartwizard -nologo -headless -accept=\"socket,host=localhost,port=8100;urp;StarOffice.ServiceManager\" &1> /dev/null &";
-	$res = pexec($cmd);
-	print_r($res);
-/**
-     * Portably execute a command on any of the supported platforms.
-     *
-	 * @author KnowledgeTree Team
-     * @access public
-     * @param string $aCmd
-     * @param array $aOptions
-     * @return array
-     */
-    function pexec($aCmd, $aOptions = null) {
-    	if (is_array($aCmd)) {
-    		$sCmd = safeShellString($aCmd);
-    	} else {
-    		$sCmd = $aCmd;
-    	}
-    	$sAppend = arrayGet($aOptions, 'append');
-    	if ($sAppend) {
-    		$sCmd .= " >> " . escapeshellarg($sAppend);
-    	}
-    	$sPopen = arrayGet($aOptions, 'popen');
-    	if ($sPopen) {
-    	    if (WINDOWS_OS) {
-                $sCmd = "start /b \"kt\" " . $sCmd;
-    	    }
-    		return popen($sCmd, $sPopen);
-    	}
-    	// for exec, check return code and output...
-    	$aRet = array();
-    	$aOutput = array();
-    	$iRet = '';
-    	//if(WINDOWS_OS) {
-    	//    $sCmd = 'call '.$sCmd;
-    //	}
-
-    	exec($sCmd, $aOutput, $iRet);
-    	$aRet['ret'] = $iRet;
-    	$aRet['out'] = $aOutput;
-
-    	return $aRet;
-    }
-
-	/**
-	*
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @return string
-	*/
- 	function arrayGet($aArray, $sKey, $mDefault = null, $bDefaultIfEmpty = true) {
-        if (!is_array($aArray)) {
-            $aArray = (array) $aArray;
-        }
-
-        if ($aArray !== 0 && $aArray !== '0' && empty($aArray)) {
-            return $mDefault;
-        }
-        if (array_key_exists($sKey, $aArray)) {
-            $mVal =& $aArray[$sKey];
-            if (empty($mVal) && $bDefaultIfEmpty) {
-                return $mDefault;
-            }
-            return $mVal;
-        }
-        return $mDefault;
-    }
-
-	/**
-	*
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @return string
-	*/
-	function safeShellString () {
-        $aArgs = func_get_args();
-        $aSafeArgs = array();
-        if (is_array($aArgs[0])) {
-            $aArgs = $aArgs[0];
-        }
-        $aSafeArgs[] = escapeshellarg(array_shift($aArgs));
-        if (is_array($aArgs[0])) {
-            $aArgs = $aArgs;
-        }
-        foreach ($aArgs as $sArg) {
-            if (empty($sArg)) {
-                $aSafeArgs[] = "''";
-            } else {
-                $aSafeArgs[] = escapeshellarg($sArg);
-            }
-        }
-        return join(" ", $aSafeArgs);
-    }
-?>
-#!/bin/sh
-/usr/bin/soffice -nofirststartwizard -nologo -headless -accept="socket,host=localhost,port=8100;urp;StarOffice.ServiceManager" &> /dev/null &
-<?php
-	include("../../path.php");
-
-?>
 \ No newline at end of file
-<?php
-/**
-* Configuration Step Tests.
-*
-* KnowledgeTree Community Edition
-* Document Management Made Simple
-* Copyright(C) 2008,2009 KnowledgeTree Inc.
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License version 3 as published by the
-* Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
-* California 94120-7775, or email info@knowledgetree.com.
-*
-* The interactive user interfaces in modified source and object code versions
-* of this program must display Appropriate Legal Notices, as required under
-* Section 5 of the GNU General Public License version 3.
-*
-* In accordance with Section 7(b) of the GNU General Public License version 3,
-* these Appropriate Legal Notices must retain the display of the "Powered by
-* KnowledgeTree" logo and retain the original copyright notice. If the display of the
-* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
-* must display the words "Powered by KnowledgeTree" and retain the original
-* copyright notice.
-*
-* @copyright 2008-2009, KnowledgeTree Inc.
-* @license GNU General Public License version 3
-* @author KnowledgeTree Team
-* @package Installer
-* @version Version 0.1
-*/
-if(isset($_GET['action'])) {
-	$func = $_GET['action'];
-	if($func != '' && $func != 'installer') {
-		require_once("../iniUtilities.php");
-		require_once("../step.php");
-		require_once("../path.php");
-		require_once("../dbUtilities.php");
-		require_once("../installUtil.php");
-	}
-}
-
-class configurationStep {
-	
-}
-
-if(isset($_GET['action'])) {
-	$func = $_GET['action'];
-	if($func != '' && $func != 'installer') {
-		$serv = new configuration();
-		$func_call = strtoupper(substr($func,0,1)).substr($func,1);
-		$method = "do$func_call";
-		$serv->$method();
-	}
-}
-?>
 \ No newline at end of file
-<?php
-/**
-* Database Step Tests.
-*
-* KnowledgeTree Community Edition
-* Document Management Made Simple
-* Copyright(C) 2008,2009 KnowledgeTree Inc.
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License version 3 as published by the
-* Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
-* California 94120-7775, or email info@knowledgetree.com.
-*
-* The interactive user interfaces in modified source and object code versions
-* of this program must display Appropriate Legal Notices, as required under
-* Section 5 of the GNU General Public License version 3.
-*
-* In accordance with Section 7(b) of the GNU General Public License version 3,
-* these Appropriate Legal Notices must retain the display of the "Powered by
-* KnowledgeTree" logo and retain the original copyright notice. If the display of the
-* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
-* must display the words "Powered by KnowledgeTree" and retain the original
-* copyright notice.
-*
-* @copyright 2008-2009, KnowledgeTree Inc.
-* @license GNU General Public License version 3
-* @author KnowledgeTree Team
-* @package Installer
-* @version Version 0.1
-*/
-
-if(isset($_GET['action'])) {
-	$func = $_GET['action'];
-	if($func != '') {
-		require_once("../step.php");
-		require_once("../installUtil.php");
-		require_once("../path.php");
-		require_once("../dbUtilities.php");
-	}
-}
-
-class databaseStep {
-	
-    public function doCreateSchema() {
-    	$this->dhost = '127.0.0.1';
-    	$this->duname = 'root';
-    	$this->dpassword = 'root';
-    	$this->dname = 'dms_install';
-    	$this->dbbinary = 'mysql';
-    	$this->util->dbUtilities->load($this->dhost, '', $this->duname, $this->dpassword, $this->dname);
-    	$this->createSchema();
-    	echo 'Schema loaded<br>';
-    }	
-}
-
-if(isset($_GET['action'])) {
-	$func = $_GET['action'];
-	if($func != '') {
-		$serv = new database();
-		$func_call = strtoupper(substr($func,0,1)).substr($func,1);
-		$method = "do$func_call";
-		$serv->$method();
-	}
-}
-?>
 \ No newline at end of file
-<?php
-/**
-* Services Step Tests.
-*
-* KnowledgeTree Community Edition
-* Document Management Made Simple
-* Copyright(C) 2008,2009 KnowledgeTree Inc.
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License version 3 as published by the
-* Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
-* California 94120-7775, or email info@knowledgetree.com.
-*
-* The interactive user interfaces in modified source and object code versions
-* of this program must display Appropriate Legal Notices, as required under
-* Section 5 of the GNU General Public License version 3.
-*
-* In accordance with Section 7(b) of the GNU General Public License version 3,
-* these Appropriate Legal Notices must retain the display of the "Powered by
-* KnowledgeTree" logo and retain the original copyright notice. If the display of the
-* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
-* must display the words "Powered by KnowledgeTree" and retain the original
-* copyright notice.
-*
-* @copyright 2008-2009, KnowledgeTree Inc.
-* @license GNU General Public License version 3
-* @author KnowledgeTree Team
-* @package Installer
-* @version Version 0.1
-*/
-if(isset($_GET['action'])) {
-	$func = $_GET['action'];
-	if($func != '') {
-		require_once(WIZARD_DIR. "step.php");
-		require_once(WIZARD_DIR. "installUtil.php");
-		require_once(WIZARD_DIR. "path.php");
-		require_once(WIZARD_DIR. "dbUtilities.php");
-	}
-}
-
-class servicesStep {
-	/** External Access **/
-	public function doDeleteAll() {
-    	$serverDetails = $this->getServices();
-		foreach ($serverDetails as $serviceName) {
-			$className = OS.$serviceName;
-			require_once("../lib/services/service.php");
-			require_once("../lib/services/".OS."Service.php");
-			require_once("../lib/services/$className.php");
-			$service = new $className();
-			$service->uninstall();
-			echo "Delete Service {$service->getName()}<br/>";
-			echo "Status of service ".$service->status()."<br/>";
-		}
-	}
-	
-	public function doInstallAll() {
-    	$serverDetails = $this->getServices();
-    	if(!empty($serverDetails)) {
-			require_once("../lib/validation/serviceValidation.php");
-			require_once("../lib/services/service.php");
-    	}
-		foreach ($serverDetails as $serviceName) {
-			$className = OS.$serviceName;
-			$serv = strtolower($serviceName); // Linux Systems.
-			require_once("../lib/services/".OS."Service.php");
-			require_once("../lib/validation/$serv"."Validation.php");
-			require_once("../lib/services/$className.php");
-			$service = new $className();
-			$class = strtolower($serviceName)."Validation";
-			$vClass = new $class();
-			$passed = $vClass->binaryChecks(); // Run Binary Pre Checks
-			$service->load(array('binary'=>$passed));
-			$service->install();
-			echo "Install Service {$service->getName()}<br/>";
-			echo "Status of service ".$service->status()."<br/>";
-		}
-	}
-	
-	public function doStatusAll() {
-    	$serverDetails = $this->getServices();
-		foreach ($serverDetails as $serviceName) {
-			$className = OS.$serviceName;
-			require_once("../lib/services/service.php");
-			require_once("../lib/services/".OS."Service.php");
-			require_once("../lib/services/$className.php");
-			$service = new $className();
-			$service->load();
-			echo "{$service->getName()} : Status of service = ".$service->status()."<br/>";
-		}
-	}
-}
-
-if(isset($_GET['action'])) {
-	$func = $_GET['action'];
-	if(isset($_GET['debug'])) {
-		define('DEBUG', $_GET['debug']);
-	} else {
-		define('DEBUG', 0);
-	}
-	if($func != '') {
-		$serv = new services();
-		$func_call = strtoupper(substr($func,0,1)).substr($func,1);
-		$method = "do$func_call";
-		$serv->$method();
-	}
-}
-?>
 \ No newline at end of file
-<?php
-/**
-* Step Tests.
-*
-* KnowledgeTree Community Edition
-* Document Management Made Simple
-* Copyright(C) 2008,2009 KnowledgeTree Inc.
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License version 3 as published by the
-* Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
-* California 94120-7775, or email info@knowledgetree.com.
-*
-* The interactive user interfaces in modified source and object code versions
-* of this program must display Appropriate Legal Notices, as required under
-* Section 5 of the GNU General Public License version 3.
-*
-* In accordance with Section 7(b) of the GNU General Public License version 3,
-* these Appropriate Legal Notices must retain the display of the "Powered by
-* KnowledgeTree" logo and retain the original copyright notice. If the display of the
-* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
-* must display the words "Powered by KnowledgeTree" and retain the original
-* copyright notice.
-*
-* @copyright 2008-2009, KnowledgeTree Inc.
-* @license GNU General Public License version 3
-* @author KnowledgeTree Team
-* @package Installer
-* @version Version 0.1
-*/
-
-?>
 \ No newline at end of file