[Aimmath-commit] AIM/WEB-INF/maple AutoConf.mpl,1.1.1.1.2.2,1.1.1.1.2.3 ManualConfig.dist,1.1.1.1,1.1.1.1.2.1 Servlet.mpl,1.1.1.1.2.1,1.1.1.1.2.2

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

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

Modified Files:
      Tag: develop_2_1
	AutoConf.mpl ManualConfig.dist Servlet.mpl 
Log Message:
streamlined installation which does not overwrite Tomcat's servlet.xml

Index: AutoConf.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/AutoConf.mpl,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** AutoConf.mpl	10 Jul 2003 20:10:03 -0000	1.1.1.1.2.2
--- AutoConf.mpl	14 Jul 2003 22:51:47 -0000	1.1.1.1.2.3
***************
*** 364,367 ****
--- 364,368 ----
    "Def"   = ["C:\\java","jdk"],
    "Def"   = ["C:","jdk"],
+   "Def"   = ["C:","j2sdk1.4.2"],
    "Def"   = ["C:\\Program Files\\java","jdk"],
    "Def"   = ["C:\\Program Files","jdk"],
***************
*** 453,477 ****
  
  if os_os = "Linux" then
!  Config['TtHProgram'] :=
!  look_for_prog(
!   "TtH",
!   "Conf"  = 'TtHProgram',
!   "Path"  = "tth",
!   "Def"   = "/usr/local/bin/tth",
!   "Def"   = "/usr/bin/tth",
!   "Def"   = "/bin/tth",
!   "Check" = ["-r < tthtest.tex","TtH is OK"]
!  ):
  else
!  Config['TtHProgram'] :=
!  osname1(look_for_prog(
!   "TtH",
!   "Conf"  = 'TtHProgram',
!   "Path"  = "tth.exe",
!   "Def"   = "C:\\TtH\\tth.exe",
!   "Def"   = "C:\\Program Files\\tth.exe",
!   "Def"   = "C:\\Program Files\\TtH\\tth.exe",
!   "Check" = ["-r < tthtest.tex","TtH is OK"]
!  )):
  fi:
  
--- 454,460 ----
  
  if os_os = "Linux" then
!  Config['TtHProgram'] := cat(Config['CatalinaHome'],"/bin/tth/tth"):
  else
!  Config['TtHProgram'] := cat(Config['CatalinaHome'],"\\bin\\tth\\tth.exe"):
  fi:
  
***************
*** 495,507 ****
   setconfig('SMTPServer',""):
  else
!  Config['BLATProgram'] :=
!  osname1(look_for_prog(
!   "BLAT",
!   "Conf"  = 'BLATProgram',
!   "Path"  = "blat.exe",
!   "Def"   = "C:\\BLAT\\blat.exe",
!   "Def"   = "C:\\Program Files\\blat.exe",
!   "Def"   = "C:\\Program Files\\BLAT\\blat.exe"
!  )):
   setconfig('SendmailProgram',"");
   setconfig('SMTPServer',""):
--- 478,482 ----
   setconfig('SMTPServer',""):
  else
!  Config['BLATProgram'] := cat(Config['CatalinaHome'],"\\bin\\blat\\blat.exe"):
   setconfig('SendmailProgram',"");
   setconfig('SMTPServer',""):
***************
*** 702,706 ****
  fi:
  
! setconfig('TomcatPort' , "80"):
  
  if (Config['TomcatPort'] = "80") then
--- 677,681 ----
  fi:
  
! setconfig('TomcatPort' , "8080"):
  
  if (Config['TomcatPort'] = "80") then
***************
*** 710,714 ****
  fi:
  
! setconfig('TomcatContext' , "ROOT"):
  
  if Config['TomcatContext'] = "ROOT" then
--- 685,689 ----
  fi:
  
! setconfig('TomcatContext' , "AiM"):
  
  if Config['TomcatContext'] = "ROOT" then

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.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** ManualConfig.dist	20 Apr 2003 23:15:41 -0000	1.1.1.1
--- ManualConfig.dist	14 Jul 2003 22:51:47 -0000	1.1.1.1.2.1
***************
*** 10,26 ****
  
  ######################################################################
! # 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":
--- 10,39 ----
  
  ######################################################################
! # The name of the subdirectory of the Tomcat\webapps directory into 
! # which you have copied the AiM files
! # Config['TomcatContext'] := "AiM":
! 
! ######################################################################
! # The SMTP server that AiM should use for sending mail. This is only
! # used under Windows. You will certainly want to change this setting.
! # Config['SMTPServer'] := "smtp.york.ac.uk":
! 
! # The absolute path to the BLAT program, used for sending email under
! # Windows. 
! # Config['BLATProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\blat\\blat.exe":
! 
! # The absolute path to the sendmail program, used under Linux
! # Config['SendmailProgram'] := "/usr/lib/sendmail":
! 
! 
! ######################################################################
! # The top directory for the Java distribution. The
  # recommended locations are as follows:
  # Config['JavaHome'] := "/usr/java/jdk":
! # Config['JavaHome'] := "C:\\j2sdk1.4.2":
  
  
  ######################################################################
! # The top directory for the Tomcat distribution. The recommended
  # locations are as follows:
  # Config['CatalinaHome'] := "/usr/local/tomcat":
***************
*** 29,62 ****
  
  ######################################################################
! # 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":
  
  
  ######################################################################
  # The absolute path to the tth program (used to convert LaTeX to HTML).
- # 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":
! 
! ######################################################################
! # The absolute path to the BLAT program, used for sending email under
! # 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
- # Config['SendmailProgram'] := "/usr/lib/sendmail":
  
  ######################################################################
--- 42,57 ----
  
  ######################################################################
! # The absolute path to the maple program. 
  # The recommended locations are as follows:
  # Config['MapleProgram']    := "/usr/bin/maple":
! # Config['MapleProgram']    := "C:\\Program Files\\Maple 8\\bin.win\\cmaple8.exe":
  
  
  ######################################################################
  # The absolute path to the tth program (used to convert LaTeX to HTML).
  # The recommended locations are as follows:
! # Config['TtHProgram'] := "/usr/local/tomcat/webapps/aim/bin/tth/tth":
! # Config['TtHProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\tth\\tth.exe":
  
  
  ######################################################################
***************
*** 67,71 ****
  # The recommended locations are as follows
  # Config['TempDir'] := "/tmp":
! # Config['TempDir'] := "C:\\temp":
  
  
--- 62,66 ----
  # The recommended locations are as follows
  # Config['TempDir'] := "/tmp":
! # Config['TempDir'] := "C:\\WINDOWS\\Temp":
  
  
***************
*** 86,97 ****
  ######################################################################
  # 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:
  
  
--- 81,88 ----
  ######################################################################
  # 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']
  
  ######################################################################
--- 129,136 ----
  # Config['DocumentURL']
  # Config['ServletURL']
  # Config['WEBINFDir']
  # Config['WebAppDir']
  # Config['WebDir']
+ 
  
  ######################################################################

Index: Servlet.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Servlet.mpl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Servlet.mpl	8 Jul 2003 06:21:33 -0000	1.1.1.1.2.1
--- Servlet.mpl	14 Jul 2003 22:51:47 -0000	1.1.1.1.2.2
***************
*** 201,280 ****
  
  ######################################################################
! 
! 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:
! 
  ######################################################################
  
--- 201,283 ----
  
  ######################################################################
! # 
! # This section used to create a file server.xml and use it to
! # overwrite Tomcat's server.xml. There is no reason to do this.
! #
! # 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:
! #
  ######################################################################
  
***************
*** 412,414 ****
  else
   printf("com.oreilly.servlet classes are already installed.\n"):
! fi:
\ No newline at end of file
--- 415,417 ----
  else
   printf("com.oreilly.servlet classes are already installed.\n"):
! fi: