Daily Commit

Committed by: Jarrett Jordaan Reviewed by: Philip Arkcoll

Daily Commit
Committed by: Jarrett Jordaan Reviewed by: Philip Arkcoll
Jarrett Jordaan
1 parent 7c352f41
Showing 13 changed files with 96 additions and 52 deletions
setup/migrate/config/commercial_config.xml
setup/migrate/config/community_config.xml
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/complete.tpl
setup/migrate/templates/services.tpl
setup/wizard/lib/services/unixLucene.php
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/lib/services/unixScheduler.php
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
@@ -11,7 +11,7 @@
     <steps>
         <step name="Current Installation">installation</step>
         <step name="Database Export">database</step>
-       	<step name="Pre Migration">services</step>
+       	<step name="Deactivate Services">services</step>
         <step name="Complete">complete</step>
     </steps>
  </migrate>
 \ No newline at end of file
@@ -11,7 +11,7 @@
     <steps>
         <step name="Current Installation">installation</step>
         <step name="Database Export">database</step>
-       	<step name="Pre Migration">services</step>
+       	<step name="Deactivate Services">services</step>
         <step name="Complete">complete</step>
     </steps>
  </migrate>
 \ No newline at end of file
@@ -96,8 +96,8 @@ class migrateComplete extends Step {
     	$sqlFile = $database['dumpLocation'];
 		if(file_exists($sqlFile)) {
 			$this->temp_variables['sql']['class'] = "tick";
-			$this->temp_variables['sql']['name'] = "dms.sql";
-			$this->temp_variables['sql']['msg'] = "Data file created";
+			$this->temp_variables['sql']['name'] = "";//dms.sql
+			$this->temp_variables['sql']['msg'] = $sqlFile;
 			return true;
 		} else {
 			$this->temp_variables['sql']['class'] = "cross";
@@ -168,9 +168,9 @@ class migrateDatabase extends Step
 		}
 		$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
 		if($noFile) {
-			$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database";
+			$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
 			$this->error[]['msg'] = "Please ensure that all KnowledgeTree Services are running.";
-			$this->error[]['cmd'] = "<p class=\"description\">Click <b>Next</b> after resolving the above errors.</p>";
+			$this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
 			$this->temp_variables['manual_export'] = "";
 		} else {
 	    	$this->error[]['error'] = "Could not export database:";
@@ -291,7 +291,7 @@ class migrateServices extends Step
     			$this->temp_variables['services'][$serv->getName()]['msg'] = "Service has been uninstalled";
     		}
     		$this->temp_variables['services'][$serv->getName()]['class'] = $state;
-    		$this->temp_variables['services'][$serv->getName()]['name'] = $serv->getName();
+    		$this->temp_variables['services'][$serv->getName()]['name'] = $serv->getHRName();
     	}
     	if(!$this->checkMysql()) {
     		return false;
@@ -326,13 +326,21 @@ class migrateServices extends Step
     	}
     	if($running) {
     		$this->temp_variables['services']['KTMysql']['class'] = "cross";
-    		$this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
+    		if(WINDOWS_OS) {
+    			$this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service. (KTMysql)";
+    		} else {
+    			$this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service.";
+    		}
     		$this->temp_variables['services']['KTMysql']['msg'] = "Service Running";
     		$this->error[] = "Service : KTMysql running.<br/>";
     		return false;
     	} else {
     		$this->temp_variables['services']['KTMysql']['class'] = "tick";
-    		$this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
+    		if(WINDOWS_OS) {
+    			$this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service. (KTMysql)";
+    		} else {
+    			$this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service.";
+    		}
     		$this->temp_variables['services']['KTMysql']['msg'] = "Service has been uninstalled";
     		return true;
     	}
 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post" id="<?php echo $step_name; ?>">
 	<p class="title">Migration Completed</p>
-	<p class="description">This allows you to check that your KnowledgeTree configuration is set
-	up correctly.  You can run this at any time after configuration to check
-	that things are still set up correctly.</p>
+	<p class="description">Your database migration was successfully completed. Please check the section below for details of the migration and final instructions</p>
 	<?php
 	if($errors || $warnings){
@@ -13,59 +11,64 @@
 	}
 	?>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
+	
 <!--	SQL	-->
-		<h3>Exported Database</h3>
-		<table>
-	    	<tr>
-	    		<td> <span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-	    		<td style="width:25%;"> <?php echo $sql['name']; ?> </td>
-	    		<td style="width:75%;"> <?php echo $sql['msg']; ?> </td>
-	    	<tr>
-	    </table>
+		<h3>KnowledgeTree database successfully exported</h3>
+		<span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><?php echo $sql['msg']; ?>
+		<br /><br />
+		<h3>Start new MySQL service</h3>
+		In order to complete the upgrade process please start the Zend Server MySQL process (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Post_Migrate" target="_blank">Click here for help</a>). 
+<!--		<table>-->
+<!--	    	<tr>-->
+<!--	    		<td> <span class='<?php //echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>-->
+<!--	    		<td style="width:25%;"> <?php //echo $sql['name']; ?> </td>-->
+<!--	    		<td style="width:75%;"> <?php //echo $sql['msg']; ?> </td>-->
+<!--	    	<tr>-->
+<!--	    </table>-->
 <!--	Services	-->
-		<h3>Uninstalled Services</h3>
-		<table>
+<!--		<h3>Uninstalled Services</h3>-->
+<!--		<table>-->
 		<?php
-			if(isset($step_vars['services'])) {
-			    foreach ($step_vars['services'] as $ser){
+//			if(isset($step_vars['services'])) {
+//			    foreach ($step_vars['services'] as $ser){
 			    	?>
-			    	<tr>
-			    		<td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-			    		<td style="width:25%;"> <?php echo $ser['name']; ?> </td>
-			    		<td style="width:75%;"> <?php echo $ser['msg']; ?> </td>
-			    		<?php if ($ser['class'] != 'tick') {
+<!--			    	<tr>-->
+<!--			    		<td> <span class='<?php //echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>-->
+<!--			    		<td style="width:25%;"> <?php //echo $ser['name']; ?> </td>-->
+<!--			    		<td style="width:75%;"> <?php //echo $ser['msg']; ?> </td>-->
+			    		<?php //if ($ser['class'] != 'tick') {
 			    			?>
 <!--			    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
 			    			<?php
-			    		} ?>
-			    	</tr>
+			    		//} ?>
+<!--			    	</tr>-->
 			    	<?php
-			    }
-			}
+//			    }
+//			}
 		?>
-		</table>
+<!--		</table>-->
 <!--	Paths		-->
-		<h3>System Path</h3>
-		<table>
+<!--		<h3>System Path</h3>-->
+<!--		<table>-->
 		<?php
-		if(isset($step_vars['paths'])) {
-			    foreach ($step_vars['paths'] as $path){
+//		if(isset($step_vars['paths'])) {
+//			    foreach ($step_vars['paths'] as $path){
 			    	?>
-			    	<tr>
-			    		<td> <span class='<?php echo $path['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-			    		<td style="width:25%;"> <?php echo $path['name']; ?> </td>
-			    		<td style="width:75%;"> <?php echo $path['msg']; ?> </td>
-			    		<?php if ($path['class'] != 'tick') {
+<!--			    	<tr>-->
+<!--			    		<td> <span class='<?php //echo $path['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>-->
+<!--			    		<td style="width:25%;"> <?php //echo $path['name']; ?> </td>-->
+<!--			    		<td style="width:75%;"> <?php //echo $path['msg']; ?> </td>-->
+			    		<?php //if ($path['class'] != 'tick') {
 			    			?>
 <!--			    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
 			    			<?php
-			    		} ?>
-			    	</tr>
+//			    		} ?>
+<!--			    	</tr>-->
 			    	<?php
-			    }
-			}
+//			    }
+//			}
 		?>
-		</table>
+<!--		</table>-->
 	</div>
     <input class="button_next" type="submit" value="Continue Installation" name="BInstall"/>
 </form>
@@ -2,7 +2,7 @@
 	<p class="title">Deactivate Services</p>
 	<p class="description">
-	All KnowledgeTree services need to be deactivated before the migration takes place.
+	All KnowledgeTree services need to be shutdown before the migration can continue.
 	</p>
 <!--Continue Message-->
 	<?php
@@ -38,7 +38,7 @@
 		<?php } else { ?>
 			All services are uninstalled.
 		<?php } ?>
-		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
+		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Please shutdown the following services</h3>
 		<?php if($silent) { ?>
 		<?php if($serviceCheck != 'tick') {
 			$details = 'Hide Details';
@@ -60,8 +60,8 @@
 			    	?>
 			    	<tr>
 			    		<td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-			    		<td style="width:20%;"> <?php echo $ser['name']; ?> </td>
-			    		<td style="width:75%;"> <?php echo $ser['msg']; ?> </td>
+			    		<td style="width:50%;"> <?php echo $ser['name']; ?> </td>
+			    		<td style="width:50%;"> <?php echo $ser['msg']; ?> </td>
 			    		<?php if ($ser['class'] != 'tick') {
 			    			?>
 <!--			    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
@@ -50,6 +50,7 @@ class unixLucene extends unixService {
 	private $javaXms;
 	private $javaXmx;
 	public $name = "KTLucene";
+	public $hrname = "KnowledgeTree Indexer Service";
 	/**
 	* Load defaults needed by service
@@ -223,6 +224,10 @@ class unixLucene extends unixService {
 		return $this->name;
 	}
+	public function getHRName() {
+		return $this->hrname;
+	}
+	
 	public function getStopMsg($installDir) {
 		return "";//"Execute from terminal : $installDir/dmsctl.sh stop";
 	}
@@ -54,6 +54,7 @@ class unixOpenOffice extends unixService {
 	// office executable
 	private $soffice;
 	public $name = "KTOpenOffice";
+	public $hrname = "KnowledgeTree OpenOffice.org Service";
 	/**
 	* Load defaults needed by service
@@ -173,6 +174,10 @@ class unixOpenOffice extends unixService {
 		return $this->name;
 	}
+	public function getHRName() {
+		return $this->hrname;
+	}
+	
 	public function getStopMsg($installDir) {
 		return "";//"Execute from terminal : $installDir/dmsctl.sh stop";
 	}
@@ -48,6 +48,7 @@ class unixScheduler extends unixService {
 	private $scheduler;
 	private $phpCli;
 	public $name = "KTScheduler";
+	public $hrname = "KnowledgeTree Scheduler Service";
 	/**
 	* Load defaults needed by service
@@ -201,6 +202,10 @@ class unixScheduler extends unixService {
 		return $this->name;
 	}
+	public function getHRName() {
+		return $this->hrname;
+	}
+	
 	public function getStopMsg($installDir) {
 		return "Service Running";//"Execute from terminal : $installDir/dmsctl.sh stop";
 	}
@@ -132,6 +132,8 @@ class windowsLucene extends windowsService {
  	*/
 	public $name = "KTLucene";
+	public $hrname = "KnowledgeTree Indexer Service. (KTLucene)";
+	
 	/**
 	* Load defaults needed by service
 	*
@@ -468,6 +470,10 @@ class windowsLucene extends windowsService {
 		return '';
 	}
+	public function getHRName() {
+		return $this->hrname;
+	}
+	
 	public function getStopMsg($installDir) {
 		return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
 	}
@@ -132,6 +132,8 @@ class windowsOpenOffice extends windowsService {
  	*/
     public $name = "KTOpenOffice";
+    public $hrname = "KnowledgeTree OpenOffice.org Service. (KTOpenOffice)";
+    
 	/**
 	* Load defaults needed by service
 	*
@@ -257,6 +259,10 @@ class windowsOpenOffice extends windowsService {
 		return false;
 	}
+	public function getHRName() {
+		return $this->hrname;
+	}
+	
 	public function getStopMsg($installDir) {
 		return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
 	}
@@ -77,6 +77,8 @@ class windowsScheduler extends windowsService {
  	*/	
 	public $name = "KTScheduler";
+	public $hrname = "KnowledgeTree Scheduler Service. (KTScheduler)";
+	
 	/**
 	* Load defaults needed by service
 	*
@@ -278,6 +280,10 @@ class windowsScheduler extends windowsService {
 		return false;
 	}
+	public function getHRName() {
+		return $this->hrname;
+	}
+	
 	public function getStopMsg($installDir) {
 		return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
 	}