[Aimmath-commit] AIM/WEB-INF/maple Servlet.mpl,1.5,1.6

[<bre...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1:/tmp/cvs-serv6865

Modified Files:
	Servlet.mpl 
Log Message:
Commented out the startup and shutdown routines for Tomcat as suggested by Neil and Gustav.

Index: Servlet.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Servlet.mpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Servlet.mpl	26 Aug 2003 20:34:59 -0000	1.5
--- Servlet.mpl	15 Sep 2003 03:54:29 -0000	1.6
***************
*** 4,10 ****
  # Distributed without warranty under the GPL - see README for details
  
! # This script creates the servlet configuration file web.xml,
! # and the scripts startaim.sh and stopaim.sh that start and
! # stop the server.
  
  read("OS0.mpl"):
--- 4,10 ----
  # Distributed without warranty under the GPL - see README for details
  
! # This script creates the servlet configuration file web.xml. We have commented out
! # the portion which generates the startaim.sh and stopaim.sh scripts as well as the
! # corresponding .bat scripts.
  
  read("OS0.mpl"):
***************
*** 201,298 ****
  
  ######################################################################
! 
! if os_os = "Linux" then
!  file := cat(webinf,"/startaim.sh"):
!  fd := traperror(fopen(file,WRITE)):
!  if fd = lasterror then
!   printf("Cannot open startaim.sh for writing:\n%a\n\n",fd):
!   `quit`(1):
!  fi:
! 
!  fprintf(fd,
!  "#!/bin/sh
!  JAVA_HOME=%s
!  export JAVA_HOME
!  CATALINA_HOME=%s
!  export CATALINA_HOME
!  %s/bin/startup.sh
!  ",
!  ServletConfig['JavaHome'],
!  ServletConfig['CatalinaHome'],
!  ServletConfig['CatalinaHome']
!  ):
! 
!  fclose(fd):
! 
!  system(sprintf("chown nobody:aim %s",file)):
!  system(sprintf("chmod 774 %s",file)):
! 
!  file := cat(webinf,"/stopaim.sh"):
!  fd := traperror(fopen(file,WRITE)):
!  if fd = lasterror then
!   printf("Cannot open stopaim.sh for writing:\n%a\n\n",fd):
!   `quit`(1):
!  fi:
! 
!  fprintf(fd,
!  "#!/bin/sh
!  JAVA_HOME=%s
!  export JAVA_HOME
!  CATALINA_HOME=%s
!  export CATALINA_HOME
!  %s/bin/shutdown.sh
!  ",
!  ServletConfig['JavaHome'],
!  ServletConfig['CatalinaHome'],
!  ServletConfig['CatalinaHome']
!  ):
! 
!  fclose(fd):
! 
!  system(sprintf("chown nobody:aim %s",file)):
!  system(sprintf("chmod 774 %s",file)):
! elif os_os = "DOS" then
!  file := cat(webinf,"/startaim.bat"):
!  fd := traperror(fopen(file,WRITE)):
!  if fd = lasterror then
!   printf("Cannot open startaim.bat for writing:\n%a\n\n",fd):
!   `quit`(1):
!  fi:
! 
!  fprintf(fd,
!  "@echo off
! SET JAVA_HOME=%s
! SET CATALINA_HOME=%s
! call %s\\bin\\startup.bat
!  ",
!  ServletConfig['JavaHome'],
!  ServletConfig['CatalinaHome'],
!  ServletConfig['CatalinaHome']
!  ):
! 
!  fclose(fd):
! 
!  file := cat(webinf,"/stopaim.bat"):
!  fd := traperror(fopen(file,WRITE)):
!  if fd = lasterror then
!   printf("Cannot open stopaim.bat for writing:\n%a\n\n",fd):
!   `quit`(1):
!  fi:
! 
!  fprintf(fd,
!  "@echo off
! SET JAVA_HOME=%s
! SET CATALINA_HOME=%s
! call %s\\bin\\shutdown.bat
!  ",
!  ServletConfig['JavaHome'],
!  ServletConfig['CatalinaHome'],
!  ServletConfig['CatalinaHome']
!  ):
! 
!  fclose(fd):
! 
! fi:
! 
  
  read("Make.mpl");
--- 201,299 ----
  
  ######################################################################
! # start JB
! #if os_os = "Linux" or os_os = "OS X" then
! # file := cat(webinf,"/startaim.sh"):
! # fd := traperror(fopen(file,WRITE)):
! # if fd = lasterror then
! #  printf("Cannot open startaim.sh for writing:\n%a\n\n",fd):
! #  `quit`(1):
! # fi:
! #
! # fprintf(fd,
! # "#!/bin/sh
! # JAVA_HOME=%s
! # export JAVA_HOME
! # CATALINA_HOME=%s
! # export CATALINA_HOME
! # %s/bin/startup.sh
! # ",
! # ServletConfig['JavaHome'],
! # ServletConfig['CatalinaHome'],
! # ServletConfig['CatalinaHome']
! # ):
! #
! # fclose(fd):
! #
! # system(sprintf("chown nobody:aim %s",file)):
! # system(sprintf("chmod 774 %s",file)):
! #
! # file := cat(webinf,"/stopaim.sh"):
! # fd := traperror(fopen(file,WRITE)):
! # if fd = lasterror then
! #  printf("Cannot open stopaim.sh for writing:\n%a\n\n",fd):
! #  `quit`(1):
! # fi:
! #
! # fprintf(fd,
! # "#!/bin/sh
! # JAVA_HOME=%s
! # export JAVA_HOME
! # CATALINA_HOME=%s
! # export CATALINA_HOME
! # %s/bin/shutdown.sh
! # ",
! # ServletConfig['JavaHome'],
! # ServletConfig['CatalinaHome'],
! # ServletConfig['CatalinaHome']
! # ):
! #
! # fclose(fd):
! #
! # system(sprintf("chown nobody:aim %s",file)):
! # system(sprintf("chmod 774 %s",file)):
! # 
! #elif os_os = "DOS" then
! # file := cat(webinf,"/startaim.bat"):
! # fd := traperror(fopen(file,WRITE)):
! # if fd = lasterror then
! #  printf("Cannot open startaim.bat for writing:\n%a\n\n",fd):
! #  `quit`(1):
! # fi:
! #
! # fprintf(fd,
! # "@echo off
! #SET JAVA_HOME=%s
! #SET CATALINA_HOME=%s
! #call %s\\bin\\startup.bat
! # ",
! # ServletConfig['JavaHome'],
! # ServletConfig['CatalinaHome'],
! # ServletConfig['CatalinaHome']
! # ):
! #
! # fclose(fd):
! #
! # file := cat(webinf,"/stopaim.bat"):
! # fd := traperror(fopen(file,WRITE)):
! # if fd = lasterror then
! #  printf("Cannot open stopaim.bat for writing:\n%a\n\n",fd):
! #  `quit`(1):
! # fi:
! #
! # fprintf(fd,
! # "@echo off
! #SET JAVA_HOME=%s
! #SET CATALINA_HOME=%s
! #call %s\\bin\\shutdown.bat
! # ",
! # ServletConfig['JavaHome'],
! # ServletConfig['CatalinaHome'],
! # ServletConfig['CatalinaHome']
! # ):
! #
! # fclose(fd):
! #
! #fi:
! #end JB
  
  read("Make.mpl");