diff --git a/setup/migrate/config/commercial_config.xml b/setup/migrate/config/commercial_config.xml index 515155a..514ff41 100644 --- a/setup/migrate/config/commercial_config.xml +++ b/setup/migrate/config/commercial_config.xml @@ -11,7 +11,7 @@ installation database - services + services complete \ No newline at end of file diff --git a/setup/migrate/config/community_config.xml b/setup/migrate/config/community_config.xml index cef60c5..01ac9bc 100644 --- a/setup/migrate/config/community_config.xml +++ b/setup/migrate/config/community_config.xml @@ -11,7 +11,7 @@ installation database - services + services complete \ No newline at end of file diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php index 65c20b7..59ecd5c 100644 --- a/setup/migrate/steps/migrateComplete.php +++ b/setup/migrate/steps/migrateComplete.php @@ -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"; diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php index bd6746c..b253da8 100644 --- a/setup/migrate/steps/migrateDatabase.php +++ b/setup/migrate/steps/migrateDatabase.php @@ -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'] = "

Click Next after resolving the above errors.

"; + $this->error[]['cmd'] = "Click Next after resolving the above errors."; $this->temp_variables['manual_export'] = ""; } else { $this->error[]['error'] = "Could not export database:"; diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php index a701639..f30dc1a 100644 --- a/setup/migrate/steps/migrateServices.php +++ b/setup/migrate/steps/migrateServices.php @@ -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.
"; 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; } diff --git a/setup/migrate/templates/complete.tpl b/setup/migrate/templates/complete.tpl index 03f5c92..63a6718 100644 --- a/setup/migrate/templates/complete.tpl +++ b/setup/migrate/templates/complete.tpl @@ -1,9 +1,7 @@

Migration Completed

-

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.

+

Your database migration was successfully completed. Please check the section below for details of the migration and final instructions

+ -

Exported Database

- - - - - - -
'>     
+

KnowledgeTree database successfully exported

+ '>      +

+

Start new MySQL service

+ In order to complete the upgrade process please start the Zend Server MySQL process (Click here for help). + + + + + + + -

Uninstalled Services

- + + - - - - - --> + + + + - + //} ?> + -
'>     
+ -

System Path

- + + - - - - - --> + + + + - +// } ?> + -
'>     
+
diff --git a/setup/migrate/templates/services.tpl b/setup/migrate/templates/services.tpl index 5038d51..f0bcee6 100644 --- a/setup/migrate/templates/services.tpl +++ b/setup/migrate/templates/services.tpl @@ -2,7 +2,7 @@

Deactivate Services

- All KnowledgeTree services need to be deactivated before the migration takes place. + All KnowledgeTree services need to be shutdown before the migration can continue.

All services are uninstalled. -

     "; ?>Services Check

+

     "; ?>Please shutdown the following services

'>      - - + + diff --git a/setup/wizard/lib/services/unixLucene.php b/setup/wizard/lib/services/unixLucene.php index a14062c..b751115 100644 --- a/setup/wizard/lib/services/unixLucene.php +++ b/setup/wizard/lib/services/unixLucene.php @@ -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"; } diff --git a/setup/wizard/lib/services/unixOpenOffice.php b/setup/wizard/lib/services/unixOpenOffice.php index aae0af7..cf4cd9a 100644 --- a/setup/wizard/lib/services/unixOpenOffice.php +++ b/setup/wizard/lib/services/unixOpenOffice.php @@ -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"; } diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php index 73e10fe..deb5c80 100644 --- a/setup/wizard/lib/services/unixScheduler.php +++ b/setup/wizard/lib/services/unixScheduler.php @@ -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"; } diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php index 173d007..ce93e03 100644 --- a/setup/wizard/lib/services/windowsLucene.php +++ b/setup/wizard/lib/services/windowsLucene.php @@ -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"; } diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php index d9591ff..3ce7b23 100644 --- a/setup/wizard/lib/services/windowsOpenOffice.php +++ b/setup/wizard/lib/services/windowsOpenOffice.php @@ -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"; } diff --git a/setup/wizard/lib/services/windowsScheduler.php b/setup/wizard/lib/services/windowsScheduler.php index 786be80..633ca75 100644 --- a/setup/wizard/lib/services/windowsScheduler.php +++ b/setup/wizard/lib/services/windowsScheduler.php @@ -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"; }