Peter M. Groen / knowledgetree

Commit 4dcb3e555375902b75a6ebbb146c043600037725

Authored by Jarrett Jordaan
1 parent 7c352f41

Daily Commit 

Committed by: Jarrett Jordaan

Reviewed by: Philip Arkcoll
Inline Side-by-side
Showing 13 changed files with 96 additions and 52 deletions
setup/migrate/config/commercial_config.xml
  View file @4dcb3e5
... ... @@ -11,7 +11,7 @@
11 11 <steps>
12 12 <step name="Current Installation">installation</step>
13 13 <step name="Database Export">database</step>
14   - <step name="Pre Migration">services</step>
  14 + <step name="Deactivate Services">services</step>
15 15 <step name="Complete">complete</step>
16 16 </steps>
17 17 </migrate>
18 18 \ No newline at end of file
... ...
setup/migrate/config/community_config.xml
  View file @4dcb3e5
... ... @@ -11,7 +11,7 @@
11 11 <steps>
12 12 <step name="Current Installation">installation</step>
13 13 <step name="Database Export">database</step>
14   - <step name="Pre Migration">services</step>
  14 + <step name="Deactivate Services">services</step>
15 15 <step name="Complete">complete</step>
16 16 </steps>
17 17 </migrate>
18 18 \ No newline at end of file
... ...
setup/migrate/steps/migrateComplete.php
  View file @4dcb3e5
... ... @@ -96,8 +96,8 @@ class migrateComplete extends Step {
96 96 $sqlFile = $database['dumpLocation'];
97 97 if(file_exists($sqlFile)) {
98 98 $this->temp_variables['sql']['class'] = "tick";
99   - $this->temp_variables['sql']['name'] = "dms.sql";
100   - $this->temp_variables['sql']['msg'] = "Data file created";
  99 + $this->temp_variables['sql']['name'] = "";//dms.sql
  100 + $this->temp_variables['sql']['msg'] = $sqlFile;
101 101 return true;
102 102 } else {
103 103 $this->temp_variables['sql']['class'] = "cross";
... ...
setup/migrate/steps/migrateDatabase.php
  View file @4dcb3e5
... ... @@ -168,9 +168,9 @@ class migrateDatabase extends Step
168 168 }
169 169 $cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
170 170 if($noFile) {
171   - $this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database";
  171 + $this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
172 172 $this->error[]['msg'] = "Please ensure that all KnowledgeTree Services are running.";
173   - $this->error[]['cmd'] = "<p class=\"description\">Click <b>Next</b> after resolving the above errors.</p>";
  173 + $this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
174 174 $this->temp_variables['manual_export'] = "";
175 175 } else {
176 176 $this->error[]['error'] = "Could not export database:";
... ...
setup/migrate/steps/migrateServices.php
  View file @4dcb3e5
... ... @@ -291,7 +291,7 @@ class migrateServices extends Step
291 291 $this->temp_variables['services'][$serv->getName()]['msg'] = "Service has been uninstalled";
292 292 }
293 293 $this->temp_variables['services'][$serv->getName()]['class'] = $state;
294   - $this->temp_variables['services'][$serv->getName()]['name'] = $serv->getName();
  294 + $this->temp_variables['services'][$serv->getName()]['name'] = $serv->getHRName();
295 295 }
296 296 if(!$this->checkMysql()) {
297 297 return false;
... ... @@ -326,13 +326,21 @@ class migrateServices extends Step
326 326 }
327 327 if($running) {
328 328 $this->temp_variables['services']['KTMysql']['class'] = "cross";
329   - $this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
  329 + if(WINDOWS_OS) {
  330 + $this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service. (KTMysql)";
  331 + } else {
  332 + $this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service.";
  333 + }
330 334 $this->temp_variables['services']['KTMysql']['msg'] = "Service Running";
331 335 $this->error[] = "Service : KTMysql running.<br/>";
332 336 return false;
333 337 } else {
334 338 $this->temp_variables['services']['KTMysql']['class'] = "tick";
335   - $this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
  339 + if(WINDOWS_OS) {
  340 + $this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service. (KTMysql)";
  341 + } else {
  342 + $this->temp_variables['services']['KTMysql']['name'] = "KnowledgeTree Mysql Service.";
  343 + }
336 344 $this->temp_variables['services']['KTMysql']['msg'] = "Service has been uninstalled";
337 345 return true;
338 346 }
... ...
setup/migrate/templates/complete.tpl
  View file @4dcb3e5
1 1 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post" id="<?php echo $step_name; ?>">
2 2 <p class="title">Migration Completed</p>
3 3  
4   - <p class="description">This allows you to check that your KnowledgeTree configuration is set
5   - up correctly. You can run this at any time after configuration to check
6   - that things are still set up correctly.</p>
  4 + <p class="description">Your database migration was successfully completed. Please check the section below for details of the migration and final instructions</p>
7 5  
8 6 <?php
9 7 if($errors || $warnings){
... ... @@ -13,59 +11,64 @@
13 11 }
14 12 ?>
15 13 <div id="step_content_<?php echo $step_name; ?>" class="step">
  14 +
16 15 <!-- SQL -->
17   - <h3>Exported Database</h3>
18   - <table>
19   - <tr>
20   - <td> <span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
21   - <td style="width:25%;"> <?php echo $sql['name']; ?> </td>
22   - <td style="width:75%;"> <?php echo $sql['msg']; ?> </td>
23   - <tr>
24   - </table>
  16 + <h3>KnowledgeTree database successfully exported</h3>
  17 + <span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><?php echo $sql['msg']; ?>
  18 + <br /><br />
  19 + <h3>Start new MySQL service</h3>
  20 + 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>).
  21 +<!-- <table>-->
  22 +<!-- <tr>-->
  23 +<!-- <td> <span class='<?php //echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>-->
  24 +<!-- <td style="width:25%;"> <?php //echo $sql['name']; ?> </td>-->
  25 +<!-- <td style="width:75%;"> <?php //echo $sql['msg']; ?> </td>-->
  26 +<!-- <tr>-->
  27 +<!-- </table>-->
25 28 <!-- Services -->
26   - <h3>Uninstalled Services</h3>
27   - <table>
  29 +<!-- <h3>Uninstalled Services</h3>-->
  30 +<!-- <table>-->
28 31 <?php
29   - if(isset($step_vars['services'])) {
30   - foreach ($step_vars['services'] as $ser){
  32 +// if(isset($step_vars['services'])) {
  33 +// foreach ($step_vars['services'] as $ser){
31 34 ?>
32   - <tr>
33   - <td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
34   - <td style="width:25%;"> <?php echo $ser['name']; ?> </td>
35   - <td style="width:75%;"> <?php echo $ser['msg']; ?> </td>
36   - <?php if ($ser['class'] != 'tick') {
  35 +<!-- <tr>-->
  36 +<!-- <td> <span class='<?php //echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>-->
  37 +<!-- <td style="width:25%;"> <?php //echo $ser['name']; ?> </td>-->
  38 +<!-- <td style="width:75%;"> <?php //echo $ser['msg']; ?> </td>-->
  39 + <?php //if ($ser['class'] != 'tick') {
37 40 ?>
38 41 <!-- <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
39 42 <?php
40   - } ?>
41   - </tr>
  43 + //} ?>
  44 +<!-- </tr>-->
42 45 <?php
43   - }
44   - }
  46 +// }
  47 +// }
45 48 ?>
46   - </table>
  49 +<!-- </table>-->
47 50 <!-- Paths -->
48   - <h3>System Path</h3>
49   - <table>
  51 +<!-- <h3>System Path</h3>-->
  52 +<!-- <table>-->
50 53 <?php
51   - if(isset($step_vars['paths'])) {
52   - foreach ($step_vars['paths'] as $path){
  54 +// if(isset($step_vars['paths'])) {
  55 +// foreach ($step_vars['paths'] as $path){
53 56 ?>
54   - <tr>
55   - <td> <span class='<?php echo $path['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
56   - <td style="width:25%;"> <?php echo $path['name']; ?> </td>
57   - <td style="width:75%;"> <?php echo $path['msg']; ?> </td>
58   - <?php if ($path['class'] != 'tick') {
  57 +<!-- <tr>-->
  58 +<!-- <td> <span class='<?php //echo $path['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>-->
  59 +<!-- <td style="width:25%;"> <?php //echo $path['name']; ?> </td>-->
  60 +<!-- <td style="width:75%;"> <?php //echo $path['msg']; ?> </td>-->
  61 + <?php //if ($path['class'] != 'tick') {
59 62 ?>
60 63 <!-- <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
61 64 <?php
62   - } ?>
63   - </tr>
  65 +// } ?>
  66 +<!-- </tr>-->
64 67 <?php
65   - }
66   - }
  68 +// }
  69 +// }
67 70 ?>
68   - </table>
  71 +<!-- </table>-->
69 72 </div>
70 73 <input class="button_next" type="submit" value="Continue Installation" name="BInstall"/>
71 74 </form>
... ...
setup/migrate/templates/services.tpl
  View file @4dcb3e5
... ... @@ -2,7 +2,7 @@
2 2 <p class="title">Deactivate Services</p>
3 3  
4 4 <p class="description">
5   - All KnowledgeTree services need to be deactivated before the migration takes place.
  5 + All KnowledgeTree services need to be shutdown before the migration can continue.
6 6 </p>
7 7 <!--Continue Message-->
8 8 <?php
... ... @@ -38,7 +38,7 @@
38 38 <?php } else { ?>
39 39 All services are uninstalled.
40 40 <?php } ?>
41   - <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
  41 + <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Please shutdown the following services</h3>
42 42 <?php if($silent) { ?>
43 43 <?php if($serviceCheck != 'tick') {
44 44 $details = 'Hide Details';
... ... @@ -60,8 +60,8 @@
60 60 ?>
61 61 <tr>
62 62 <td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
63   - <td style="width:20%;"> <?php echo $ser['name']; ?> </td>
64   - <td style="width:75%;"> <?php echo $ser['msg']; ?> </td>
  63 + <td style="width:50%;"> <?php echo $ser['name']; ?> </td>
  64 + <td style="width:50%;"> <?php echo $ser['msg']; ?> </td>
65 65 <?php if ($ser['class'] != 'tick') {
66 66 ?>
67 67 <!-- <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
... ...
setup/wizard/lib/services/unixLucene.php
  View file @4dcb3e5
... ... @@ -50,6 +50,7 @@ class unixLucene extends unixService {
50 50 private $javaXms;
51 51 private $javaXmx;
52 52 public $name = "KTLucene";
  53 + public $hrname = "KnowledgeTree Indexer Service";
53 54  
54 55 /**
55 56 * Load defaults needed by service
... ... @@ -223,6 +224,10 @@ class unixLucene extends unixService {
223 224 return $this->name;
224 225 }
225 226  
  227 + public function getHRName() {
  228 + return $this->hrname;
  229 + }
  230 +
226 231 public function getStopMsg($installDir) {
227 232 return "";//"Execute from terminal : $installDir/dmsctl.sh stop";
228 233 }
... ...
setup/wizard/lib/services/unixOpenOffice.php
  View file @4dcb3e5
... ... @@ -54,6 +54,7 @@ class unixOpenOffice extends unixService {
54 54 // office executable
55 55 private $soffice;
56 56 public $name = "KTOpenOffice";
  57 + public $hrname = "KnowledgeTree OpenOffice.org Service";
57 58  
58 59 /**
59 60 * Load defaults needed by service
... ... @@ -173,6 +174,10 @@ class unixOpenOffice extends unixService {
173 174 return $this->name;
174 175 }
175 176  
  177 + public function getHRName() {
  178 + return $this->hrname;
  179 + }
  180 +
176 181 public function getStopMsg($installDir) {
177 182 return "";//"Execute from terminal : $installDir/dmsctl.sh stop";
178 183 }
... ...
setup/wizard/lib/services/unixScheduler.php
  View file @4dcb3e5
... ... @@ -48,6 +48,7 @@ class unixScheduler extends unixService {
48 48 private $scheduler;
49 49 private $phpCli;
50 50 public $name = "KTScheduler";
  51 + public $hrname = "KnowledgeTree Scheduler Service";
51 52  
52 53 /**
53 54 * Load defaults needed by service
... ... @@ -201,6 +202,10 @@ class unixScheduler extends unixService {
201 202 return $this->name;
202 203 }
203 204  
  205 + public function getHRName() {
  206 + return $this->hrname;
  207 + }
  208 +
204 209 public function getStopMsg($installDir) {
205 210 return "Service Running";//"Execute from terminal : $installDir/dmsctl.sh stop";
206 211 }
... ...
setup/wizard/lib/services/windowsLucene.php
  View file @4dcb3e5
... ... @@ -132,6 +132,8 @@ class windowsLucene extends windowsService {
132 132 */
133 133 public $name = "KTLucene";
134 134  
  135 + public $hrname = "KnowledgeTree Indexer Service. (KTLucene)";
  136 +
135 137 /**
136 138 * Load defaults needed by service
137 139 *
... ... @@ -468,6 +470,10 @@ class windowsLucene extends windowsService {
468 470 return '';
469 471 }
470 472  
  473 + public function getHRName() {
  474 + return $this->hrname;
  475 + }
  476 +
471 477 public function getStopMsg($installDir) {
472 478 return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
473 479 }
... ...
setup/wizard/lib/services/windowsOpenOffice.php
  View file @4dcb3e5
... ... @@ -132,6 +132,8 @@ class windowsOpenOffice extends windowsService {
132 132 */
133 133 public $name = "KTOpenOffice";
134 134  
  135 + public $hrname = "KnowledgeTree OpenOffice.org Service. (KTOpenOffice)";
  136 +
135 137 /**
136 138 * Load defaults needed by service
137 139 *
... ... @@ -257,6 +259,10 @@ class windowsOpenOffice extends windowsService {
257 259 return false;
258 260 }
259 261  
  262 + public function getHRName() {
  263 + return $this->hrname;
  264 + }
  265 +
260 266 public function getStopMsg($installDir) {
261 267 return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
262 268 }
... ...
setup/wizard/lib/services/windowsScheduler.php
  View file @4dcb3e5
... ... @@ -77,6 +77,8 @@ class windowsScheduler extends windowsService {
77 77 */
78 78 public $name = "KTScheduler";
79 79  
  80 + public $hrname = "KnowledgeTree Scheduler Service. (KTScheduler)";
  81 +
80 82 /**
81 83 * Load defaults needed by service
82 84 *
... ... @@ -278,6 +280,10 @@ class windowsScheduler extends windowsService {
278 280 return false;
279 281 }
280 282  
  283 + public function getHRName() {
  284 + return $this->hrname;
  285 + }
  286 +
281 287 public function getStopMsg($installDir) {
282 288 return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
283 289 }
... ...