Peter M. Groen / knowledgetree

Commit 8d9332ac3734901274e3862d80aee592cbe92baa

Authored by kevin_fourie
1 parent bcedc04f

KTS-3532 

"AJAX info box to be added to Community Edition"
Updated. Fixed CSS path.

Committed By: Kevin Fourie
Reviewed By: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@8903 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 40 additions and 22 deletions
examples/linux/init/dmsctl.sh
  View file @8d9332a
... ... @@ -14,8 +14,9 @@ SERVER=all
14 14 USEXVFB=0
15 15 VDISPLAY="99"
16 16 INSTALL_PATH=@@BITROCK_INSTALLDIR@@
17   -JAVABIN=$INSTALL_PATH/j2re/bin/java
18   -export LD_LIBRARY_PATH="$INSTALL_PATH/apache2/lib:$INSTALL_PATH/common/lib:$LD_LIBRARY_PATH"
  17 +JAVABIN=$INSTALL_PATH/java/jre/bin/java
  18 +export MAGICK_HOME=$INSTALL_PATH/common
  19 +export LD_LIBRARY_PATH="$INSTALL_PATH/apache2/lib:$INSTALL_PATH/common/lib:$INSTALL_PATH/mysql/lib:$LD_LIBRARY_PATH"
19 20 export PATH=$PATH:$INSTALL_PATH/php/bin
20 21 export PHPRC=$INSTALL_PATH/php/etc
21 22  
... ... @@ -28,7 +29,8 @@ HTTPD_STATUS=""
28 29 # MySQL
29 30 MYSQL_PIDFILE=$INSTALL_PATH/mysql/data/mysqld.pid
30 31 MYSQL_PID=""
31   -MYSQL_START="$INSTALL_PATH/mysql/bin/safe_mysqld --port=3306 --socket=$INSTALL_PATH/mysql/tmp/mysql.sock --old-passwords --datadir=$INSTALL_PATH/mysql/data --log-error=$INSTALL_PATH/mysql/data/mysqld.log --pid-file=$INSTALL_PATH/mysql/data/mysqld.pid"
  32 +#MYSQL_START="$INSTALL_PATH/mysql/bin/safe_mysqld --port=@@BITROCK_MYSQL_PORT@@ --socket=$INSTALL_PATH/mysql/tmp/mysql.sock --old-passwords --datadir=$INSTALL_PATH/mysql/data --pid-file=$INSTALL_PATH/mysql/data/mysqld.pid"
  33 +MYSQL_START="$INSTALL_PATH/mysql/bin/safe_mysqld --port=@@BITROCK_MYSQL_PORT@@ --socket=$INSTALL_PATH/mysql/tmp/mysql.sock --old-passwords --datadir=$INSTALL_PATH/mysql/data --log-error=$INSTALL_PATH/mysql/data/mysqld.log --pid-file=$INSTALL_PATH/mysql/data/mysqld.pid"
32 34 MYSQL_STOP="$INSTALL_PATH/mysql/bin/mysqladmin --socket=$INSTALL_PATH/mysql/tmp/mysql.sock -u root -p shutdown"
33 35 MYSQL_STATUS=""
34 36 MYSQL_PASSWORD=""
... ... @@ -37,7 +39,7 @@ MYSQL_PASSWORD=""
37 39 XVFB_PIDFILE=$INSTALL_PATH/Xvfb/xvfb.pid
38 40 XVFB_PID=""
39 41 XVFBBIN=$INSTALL_PATH/Xvfb/bin/Xvfb
40   -XVFB="$XVFBBIN :$VDISPLAY -screen 0 800x600x8 -fbdir $INSTALL_PATH/Xvfb/var/run"
  42 +XVFB="$XVFBBIN :$VDISPLAY -screen 0 800x600x8 -fbdir $INSTALL_PATH/Xvfb/var/run -fp $INSTALL_PATH/Xvfb/misc"
41 43 XVFB_STATUS=""
42 44  
43 45 # OpenOffice
... ... @@ -47,9 +49,9 @@ SOFFICE_PID=""
47 49 SOFFICE_PORT="8100"
48 50 SOFFICEBIN=$INSTALL_PATH/openoffice/program/soffice.bin
49 51 if [ $USEXVFB -eq 1 ]; then
50   - SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -display :$VDISPLAY -accept=socket,host=localhost,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager"
  52 + SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -display :$VDISPLAY -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager"
51 53 else
52   - SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=localhost,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager"
  54 + SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager"
53 55 fi
54 56 SOFFICE_STATUS=""
55 57  
... ... @@ -238,9 +240,9 @@ start_mysql() {
238 240 if [ $RUNNING -eq 1 ]; then
239 241 echo "$0 $ARG: mysql (pid $MYSQL_PID) already running"
240 242 else
241   - $MYSQL_START &
  243 + $MYSQL_START &> $INSTALL_PATH/var/log/dmsctl.log &
242 244 if [ $? -eq 0 ]; then
243   - echo "$0 $ARG: mysql started at port 3306"
  245 + echo "$0 $ARG: mysql started at port @@BITROCK_MYSQL_PORT@@"
244 246 sleep 2
245 247 else
246 248 echo "$0 $ARG: mysql could not be started"
... ... @@ -261,11 +263,8 @@ stop_mysql() {
261 263 return
262 264 fi
263 265 fi
264   - echo "MySQL will prompt you for the root password."
265   - if [ "x$MYSQL_PASSWORD" != "x" ]; then
266   - MYSQL_STOP="$MYSQL_STOP --password=$MYSQL_PASSWORD"
267   - fi
268   - $MYSQL_STOP
  266 + kill -15 $MYSQL_PID
  267 + sleep 5
269 268  
270 269 is_mysql_running
271 270 RUNNING=$?
... ... @@ -285,8 +284,8 @@ start_apache() {
285 284 if [ $RUNNING -eq 1 ]; then
286 285 echo "$0 $ARG: httpd (pid $HTTPD_PID) already running"
287 286 else
288   - if $HTTPD ; then
289   - echo "$0 $ARG: httpd started at port 8080"
  287 + if $HTTPD &> $INSTALL_PATH/var/log/dmsctl.log; then
  288 + echo "$0 $ARG: httpd started at port @@BITROCK_APACHE_PORT@@"
290 289 else
291 290 echo "$0 $ARG: httpd could not be started"
292 291 ERROR=3
... ... @@ -325,7 +324,7 @@ if [ $USEXVFB -eq 1 ]; then
325 324 if [ $RUNNING -eq 1 ]; then
326 325 echo "$0 $ARG: Xvfb (pid $XVFB_PID) already running"
327 326 else
328   - $XVFB >/dev/null 2>&1 &
  327 + nohup $XVFB &> $INSTALL_PATH/var/log/dmsctl.log &
329 328 if [ $? -eq 0 ]; then
330 329 echo "$0 $ARG: Xvfb started on display $VDISPLAY"
331 330 ps ax | grep $XVFBBIN | awk {'print $1'} > $XVFB_PIDFILE
... ... @@ -369,7 +368,11 @@ start_soffice() {
369 368 if [ $RUNNING -eq 1 ]; then
370 369 echo "$0 $ARG: openoffice (pid $SOFFICE_PID) already running"
371 370 else
372   - $SOFFICE >/dev/null 2>&1 &
  371 + if [ $USEXVFB -eq 1 ]; then
  372 + start_xvfb
  373 + sleep 2
  374 + fi
  375 + nohup $SOFFICE &> $INSTALL_PATH/var/log/dmsctl.log &
373 376 if [ $? -eq 0 ]; then
374 377 echo "$0 $ARG: openoffice started at port $SOFFICE_PORT"
375 378 ps ax | grep $SOFFICEBIN | awk {'print $1'} > $SOFFICE_PIDFILE
... ... @@ -393,7 +396,10 @@ stop_soffice() {
393 396 else
394 397 return
395 398 fi
396   - fi
  399 + fi
  400 + if [ $USEXVFB -eq 1 ]; then
  401 + stop_xvfb
  402 + fi
397 403 get_soffice_pid
398 404 if killall $SOFFICEBIN ; then
399 405 echo "$0 $ARG: openoffice stopped"
... ... @@ -411,7 +417,7 @@ start_lucene() {
411 417 echo "$0 $ARG: lucene (pid $LUCENE_PID) already running"
412 418 else
413 419 cd $INSTALL_PATH/knowledgeTree/bin/luceneserver
414   - $LUCENE >/dev/null 2>&1 &
  420 + nohup $LUCENE &> $INSTALL_PATH/var/log/dmsctl.log &
415 421 if [ $? -eq 0 ]; then
416 422 echo "$0 $ARG: lucene started"
417 423 ps ax | grep ktlucene.jar | awk {'print $1'} > $LUCENE_PIDFILE
... ... @@ -439,7 +445,7 @@ stop_lucene() {
439 445 fi
440 446 get_lucene_pid
441 447 cd $INSTALL_PATH/knowledgeTree/search2/indexing/bin
442   - $INSTALL_PATH/php/bin/php shutdown.php positive >/dev/null 2>&1 &
  448 + $INSTALL_PATH/php/bin/php shutdown.php positive &> $INSTALL_PATH/var/log/dmsctl.log
443 449 if [ $? -eq 0 ]; then
444 450 echo "$0 $ARG: lucene stopped"
445 451 else
... ... @@ -456,7 +462,7 @@ start_scheduler() {
456 462 echo "$0 $ARG: scheduler (pid $SCHEDULER_PID) already running"
457 463 else
458 464 cd $SCHEDULER_PATH
459   - $SCHEDULER >/dev/null 2>&1 &
  465 + nohup $SCHEDULER &> $INSTALL_PATH/var/log/dmsctl.log &
460 466 if [ $? -eq 0 ]; then
461 467 echo "$0 $ARG: scheduler started"
462 468 ps ax | grep $SCHEDULERBIN | awk {'print $1'} > $SCHEDULER_PIDFILE
... ... @@ -483,7 +489,7 @@ stop_scheduler() {
483 489 fi
484 490 get_scheduler_pid
485 491 if kill $SCHEDULER_PID ; then
486   - echo "$0 $ARG: schedulerstopped"
  492 + echo "$0 $ARG: scheduler stopped"
487 493 else
488 494 echo "$0 $ARG: scheduler could not be stopped"
489 495 ERROR=4
... ... @@ -537,6 +543,9 @@ case $1 in
537 543 else
538 544 start_mysql
539 545 start_apache
  546 + if [ -x $INSTALL_PATH/bin/networkservice.sh ]; then
  547 + $INSTALL_PATH/bin/networkservice.sh start
  548 + fi
540 549 start_xvfb
541 550 sleep 2
542 551 start_soffice
... ... @@ -552,6 +561,9 @@ case $1 in
552 561 stop_soffice "no_exit"
553 562 stop_xvfb "no_exit"
554 563 stop_apache "no_exit"
  564 + if [ -x $INSTALL_PATH/bin/networkservice.sh ]; then
  565 + $INSTALL_PATH/bin/networkservice.sh stop
  566 + fi
555 567 stop_mysql
556 568 fi
557 569 ;;
... ... @@ -565,9 +577,15 @@ case $1 in
565 577 stop_soffice "no_exit"
566 578 stop_xvfb "no_exit"
567 579 stop_apache "no_exit"
  580 + if [ -x $INSTALL_PATH/bin/networkservice.sh ]; then
  581 + $INSTALL_PATH/bin/networkservice.sh stop
  582 + fi
568 583 stop_mysql "no_exit"
569 584 start_mysql
570 585 start_apache
  586 + if [ -x $INSTALL_PATH/bin/networkservice.sh ]; then
  587 + $INSTALL_PATH/bin/networkservice.sh start
  588 + fi
571 589 start_xvfb
572 590 sleep 2
573 591 start_soffice
... ...