[Aimmath-commit] AIM/WEB-INF/maple ManualConfig.dist,1.1.1.1,1.1.1.1.4.1 Servlet.mpl,1.1.1.1,1.1.1.1.4.1

[<gus...@us...>]

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

Modified Files:
      Tag: gustav_2_1
	ManualConfig.dist Servlet.mpl 
Log Message:
Simplified installation procedure

Index: ManualConfig.dist
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/ManualConfig.dist,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.4.1
*** ManualConfig.dist	20 Apr 2003 23:15:41 -0000	1.1.1.1
--- ManualConfig.dist	7 Jul 2003 23:47:54 -0000	1.1.1.1.4.1
***************
*** 10,39 ****
  
  ######################################################################
! # The top directory for the Java distribution.  This is used to set the
! # environment variable JAVA_HOME in the script (startaim.sh or 
! # startaim.bat) that is used to start the server.  This variable must
! # be set to tell Tomcat where to find its basic java class files.  The
  # recommended locations are as follows:
  # Config['JavaHome'] := "/usr/java/jdk":
! # Config['JavaHome'] := "C:\\JDK":
  
  
  ######################################################################
! # The top directory for the Tomcat distribution.  This is used to set the
! # environment variable CATALINA_HOME in the script (startaim.sh or 
! # startaim.bat) that is used to start the server.  The recommended
  # locations are as follows:
  # Config['CatalinaHome'] := "/usr/local/tomcat":
! # Config['CatalinaHome'] := "C:\\Tomcat":
  
  
  ######################################################################
  # The absolute path to the maple program.  Under Windows, the path
! # should use backslashes as separators, and should not contain any
! # spaces; in particular, 'Program Files' is disallowed.
! # Also under windows the file extension .exe is required.  
  # The recommended locations are as follows:
  # Config['MapleProgram']    := "/usr/bin/maple":
! # Config['MapleProgram']    := "C:\\Maple\\bin.wnt\\cmaple.exe":
  
  
--- 10,41 ----
  
  ######################################################################
! # In the following three lines you should replace dev by the name
! # of the subdirectory of the Tomcat\webapps directory into which
! # you have copied the AiM files
! Config['TomcatContext'] := "dev":
! Config['WebAppDir'] := "C:\\Tomcat\\webapps\\dev":
! Config['WebDir'] := "C:\\Tomcat\\webapps\\dev":
! 
! ######################################################################
! # The top directory for the Java distribution. The
  # recommended locations are as follows:
  # Config['JavaHome'] := "/usr/java/jdk":
! Config['JavaHome'] := "C:\\Program Files\\Java\\j2re1.4.0_03":
  
  
  ######################################################################
! # The top directory for the Tomcat distribution. The recommended
  # locations are as follows:
  # Config['CatalinaHome'] := "/usr/local/tomcat":
! Config['CatalinaHome'] := "C:\\Tomcat":
  
  
  ######################################################################
  # The absolute path to the maple program.  Under Windows, the path
! # should use backslashes as separators, and 
! # the file extension .exe is required.  
  # The recommended locations are as follows:
  # Config['MapleProgram']    := "/usr/bin/maple":
! Config['MapleProgram']    := "C:\\Program Files\\Maple 8\\bin.win\\cmaple8.exe":
  
  
***************
*** 42,50 ****
  # The command used by the server to start the TeX-to-HTML converter tth.
  # Under Windows, the path should use backslashes as separators, and
! # should not contain any spaces; in particular, 'Program Files' is
! # disallowed. Also under windows the file extension .exe is required.  
  # The recommended locations are as follows:
  # Config['TtHProgram'] := "/usr/bin/tth":
! # Config['TtHProgram'] := "C:\\TtH\\tth.exe":
  
  ######################################################################
--- 44,51 ----
  # The command used by the server to start the TeX-to-HTML converter tth.
  # Under Windows, the path should use backslashes as separators, and
! # the file extension .exe is required.  
  # The recommended locations are as follows:
  # Config['TtHProgram'] := "/usr/bin/tth":
! Config['TtHProgram'] := "C:\\TtH\\tth.exe":
  
  ######################################################################
***************
*** 52,59 ****
  # Windows.  The file extension .exe is required.
  
! # Config['BLATProgram'] := "C:\\BLAT\\blat.exe:
  
  # The SMTP server that BLAT should use for sending mail
! # Config['SMTPServer'] := "":
  
  # The absolute path to the sendmail program, used under Linux
--- 53,60 ----
  # Windows.  The file extension .exe is required.
  
! Config['BLATProgram'] := "C:\\Program Files\\BLAT\\blat.exe":
  
  # The SMTP server that BLAT should use for sending mail
! Config['SMTPServer'] := "smtp.york.ac.uk":
  
  # The absolute path to the sendmail program, used under Linux
***************
*** 67,71 ****
  # The recommended locations are as follows
  # Config['TempDir'] := "/tmp":
! # Config['TempDir'] := "C:\\temp":
  
  
--- 68,72 ----
  # The recommended locations are as follows
  # Config['TempDir'] := "/tmp":
! Config['TempDir'] := "C:\\WINDOWS\\Temp":
  
  
***************
*** 81,97 ****
  # will allow you to access AIM that it is running on, but not from any
  # other machine.  
! # Config['HostName'] := "localhost":
  
  
  ######################################################################
  # The number of the port on which Tomcat should listen.  By default
! # this is 80, which is the standard port for web servers; other
! # common values are 8000 and 8080.  For any port other than 80, the
  # number must be included explicitly in URL's (for example, 
! # http://allserv.rug.ac.be:8081).  The disadvantages of port 80 are
! # (a) you will need superuser privileges to start the server, and
! # (b) you may already have a webserver (such as Apache or IIS)
! # listening on that port.
! # Config['TomcatPort'] := 80:
  
  
--- 82,94 ----
  # will allow you to access AIM that it is running on, but not from any
  # other machine.  
! Config['HostName'] := "maths-physics.org.uk":
  
  
  ######################################################################
  # The number of the port on which Tomcat should listen.  By default
! # this is 8080. For any port other than 80, the
  # number must be included explicitly in URL's (for example, 
! # http://allserv.rug.ac.be:8080). 
! Config['TomcatPort'] := 8080:
  
  
***************
*** 138,145 ****
  # Config['DocumentURL']
  # Config['ServletURL']
- # Config['TomcatContext']
  # Config['WEBINFDir']
! # Config['WebAppDir']
! # Config['WebDir']
  
  ######################################################################
--- 135,140 ----
  # Config['DocumentURL']
  # Config['ServletURL']
  # Config['WEBINFDir']
! 
  
  ######################################################################

Index: Servlet.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Servlet.mpl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.4.1
*** Servlet.mpl	20 Apr 2003 23:15:46 -0000	1.1.1.1
--- Servlet.mpl	7 Jul 2003 23:47:54 -0000	1.1.1.1.4.1
***************
*** 2,8 ****
  # 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"):
--- 2,8 ----
  # Distributed without warranty under the GPL - see README for details
  
! # This script creates the servlet configuration file web.xml
! # It no longer creates servlet.xml and startaim,bat and stopaim.bat
! # because they are not needed (GWD)
  
  read("OS0.mpl"):
***************
*** 199,412 ****
  
  ######################################################################
- 
- file := cat(webinf,"/server.xml"):
- 
- fd := traperror(fopen(file,'WRITE')):
- 
- if fd = lasterror then
-  printf("Cannot open web.xml for writing:\n%a\n\n",fd):
-  `quit`(1):
- fi:
- 
- port := ServletConfig['TomcatPort']:
- ctxt := ServletConfig['TomcatContext']:
- path := `if`(ctxt = "ROOT","",ctxt):
- 
- fprintf(fd,"
- <!-- AIM Server Configuration File -->
- 
- <!-- This is automatically generated from data in ServletConfig.mpl
-      by running Servlet.mpl.  The file ServletConfig.mpl is in turn
-      automatically generated by AutoConf.mpl, using values supplied
-      in ManualConfig.mpl if necessary.
-  -->
- 
- <Server port=\"8005\" shutdown=\"SHUTDOWN\" debug=\"0\">
-   <Service name=\"Tomcat-Standalone\">
-     <Connector className=\"org.apache.catalina.connector.http.HttpConnector\"
-                port=\"%s\" minProcessors=\"5\" maxProcessors=\"75\"
-                enableLookups=\"true\" redirectPort=\"8443\"
-                acceptCount=\"10\" debug=\"0\" connectionTimeout=\"60000\"/>
-     <Engine name=\"Standalone\" defaultHost=\"localhost\" debug=\"0\">
-       <Logger className=\"org.apache.catalina.logger.FileLogger\"
-               prefix=\"catalina_log.\" suffix=\".txt\"
-               timestamp=\"true\"/>
-       <Realm className=\"org.apache.catalina.realm.MemoryRealm\" />
-       <Host name=\"localhost\" debug=\"0\"
-              appBase=\"webapps\" unpackWARs=\"true\">
-         <Valve className=\"org.apache.catalina.valves.AccessLogValve\"
-                  directory=\"logs\"  prefix=\"access.\" suffix=\".txt\"
-                  pattern=\"common\"/>
-         <Logger className=\"org.apache.catalina.logger.FileLogger\"
-                  directory=\"logs\"  prefix=\"log.\" suffix=\".txt\"
- 	        timestamp=\"true\"/>
-         <Context path=\"%s\" docBase=\"%s\" debug=\"0\" reloadable=\"true\"/>
-       </Host>
-     </Engine>
-   </Service>
- </Server>
- 
- ",port,path,ctxt
- 
- ):
- 
- unassign('port','ctxt','dbse'):
- fclose(fd):
- 
- file1 := 
-  os_maplename(cat(ServletConfig['CatalinaHome'],"/conf/server.xml")):
- file2 := 
-  os_maplename(cat(ServletConfig['CatalinaHome'],"/conf/server.bak")):
- 
- if os_fileexists(file1) then
-  printf("Backing up %s\n",file1):
-  err := traperror(os_copy(file1,file2)):
-  if err = lasterror then
-   printf("Failed: %s\n\n",err):
-   `quit`(1):
-  fi:
- fi: 
- 
- printf("Copying %s to %s\n", file, file1):
- err := traperror(os_copy(file,file1)):
- if err = lasterror then
-  printf("Failed: %s\n\n",err):
-  `quit`(1):
- fi:
- 
- ######################################################################
- 
- 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:
- 
- ######################################################################
- 
- # Copy the com.oreilly.servlet classes
- 
- cosdir    := "com/oreilly/servlet/":
- cossource := cat("../cos/",cosdir):
- 
- # Of the three lines below, the first is approved for Tomcat 4.0 but
- # fails for Tomcat 4.1, and the reverse is true of the second.  The
- # third option is not really the approved place for general purpose
- # classes, but it works with all versions of Tomcat.
- #cosdest   := cat(ServletConfig['CatalinaHome'],"/classes/",cosdir):
- #cosdest   := cat(ServletConfig['CatalinaHome'],"/shared/classes/",cosdir):
- cosdest   := cat(webinf,"/classes/",cosdir):
- 
- if not(os_fileexists(cat(cosdest,"/multipart/Part.class"))) then
-  err := traperror(os_makedirectory(cat(cosdest,"/multipart"))):
- 
-  if err = lasterror then
-   printf("Could not create directory for com.oreilly.servlet classes\n"):
-   `quit`(1):
-  fi:
- 
-  for f in os_listfiles(cossource) do
-   if f <> "multipart" then
-    os_copy(cat(cossource,"/",f),cat(cosdest,"/",f)):
-   fi:
-  od:
- 
-  for f in os_listfiles(cat(cossource,"/multipart")) do
-   os_copy(cat(cossource,"/multipart/",f),
- 	  cat(cosdest,"/multipart/",f)):
-  od:
- 
-  if not(os_fileexists(cat(cosdest,"/multipart/Part.class"))) then
-   printf("Could not copy com.oreilly.servlet classes\n"):
-   `quit`(1):
-  fi:
- else
-  printf("com.oreilly.servlet classes are already installed.\n"):
- fi:
\ No newline at end of file
--- 199,200 ----