|
From: <gus...@us...> - 2003-08-26 08:27:53
|
Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1:/tmp/cvs-serv5333/WEB-INF/maple
Modified Files:
Tag: windows
AutoConf.mpl ManualConfig.dist Servlet.mpl
Log Message:
special to windows installation
Index: AutoConf.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/AutoConf.mpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** AutoConf.mpl 25 Aug 2003 21:47:18 -0000 1.3
--- AutoConf.mpl 26 Aug 2003 08:27:43 -0000 1.3.2.1
***************
*** 4,7 ****
--- 4,8 ----
# Distributed without warranty under the GPL - see README for details
+
printf("AIM will now try to configure your system automatically.\n"):
***************
*** 457,460 ****
--- 458,462 ----
fi:
+
# KM
# dist p("\n"):
***************
*** 483,486 ****
--- 485,489 ----
"Def" = "C:\\AIM\\Process",
"Def" = "C:\\Process",
+ "Def" = cat(Config['WebAppDir'],"\\bin\\process\\process.exe"),
"Check" = ["-v","beyondlogic.org"]
)):
Index: ManualConfig.dist
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/ManualConfig.dist,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** ManualConfig.dist 25 Aug 2003 21:47:18 -0000 1.2
--- ManualConfig.dist 26 Aug 2003 08:27:43 -0000 1.2.2.1
***************
*** 2,7 ****
# This configuration file can be edited by hand. After editing, you
! # should run AutoConf.mpl to generate Config.mpl and ServletConfig.mpl,
! # and then run Servlet.mpl to generate web.xml and server.xml, as
# described in the installation instructions.
--- 2,6 ----
# This configuration file can be edited by hand. After editing, you
! # should run AutoConf.mpl as
# described in the installation instructions.
***************
*** 10,41 ****
######################################################################
# 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":
# Config['CatalinaHome'] := "C:\\Tomcat":
--- 9,66 ----
######################################################################
+ # The SMTP server that AiM should use for sending mail.
+ # You will certainly want to change this setting.
+ # Config['SMTPServer'] := "smtp.york.ac.uk":
+
+ ######################################################################
+ # The fully qualified host name of the server (eg aim.shef.ac.uk).
+ # For initial testing purposes, you can set this to "localhost". This
+ # will allow you to access AiM that it is running on, but not from any
+ # other machine.
+ # Config['HostName'] := "localhost":
+
+ ######################################################################
# The name of the subdirectory of the Tomcat\webapps directory into
# which you have copied the AiM files
# Config['TomcatContext'] := "AiM":
! # You probably won't need to make any changes below, unless you get an
! # error message after reading in autoconf.mpl
! ######################################################################
! # The absolute path to the BLAT program, used for sending email
# Config['BLATProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\blat\\blat.exe":
! ######################################################################
! # The absolute path to the kill program (used to kill processes on this OS).
! # Config['KillProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\Process\\Process.exe":
+ ######################################################################
+ # The number of 'Recent Requests' to show on the Alice Monitor page
+ # Config['AliceHistorySize'] := 20:
######################################################################
! # The time limits placed on Maple processes by the Alice servlet.
! # Processes which take longer than the time limit are terminated.
! # The AdminTimeLimit restricts the time allowed for Administrative
! # commands. The StudentTimeLimit is the restriction on all other
! # commands. Generally the StudentTimeLimit should be shorter than
! # the admisitrative time limit. Both values are integers which specify
! # the time limit in milliseconds.
! # Config['StudentTimeLimit'] := 60000: # one minute
! # Config['AdminTimeLimit'] := 1200000: # twenty minutes
+ ######################################################################
+ # The maximum number of maple processes that can be running at the same
+ # time on this machine.
+ # Config['MaxMapleProcesses'] := 8:
######################################################################
! # The top directory for the Java distribution.
! # Config['JavaHome'] := "C:\\Program Files\\Java\\j2re1.4.2":
!
!
! ######################################################################
! # The top directory for the Tomcat distribution.
# Config['CatalinaHome'] := "C:\\Tomcat":
***************
*** 43,48 ****
######################################################################
# 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":
--- 68,71 ----
***************
*** 50,55 ****
######################################################################
# 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":
--- 73,76 ----
***************
*** 58,65 ****
# The directory where the servlet should put temporary copies of uploaded
# files. (The Maple part of the system will delete them or move them to
! # a more permanent home moments later.) Under Windows, the path should
! # use backslashes as separators, and should not contain any spaces.
! # The recommended locations are as follows
! # Config['TempDir'] := "/tmp":
# Config['TempDir'] := "C:\\WINDOWS\\Temp":
--- 79,83 ----
# The directory where the servlet should put temporary copies of uploaded
# files. (The Maple part of the system will delete them or move them to
! # a more permanent home moments later.)
# Config['TempDir'] := "C:\\WINDOWS\\Temp":
***************
*** 72,83 ****
######################################################################
- # The fully qualified host name of the server (eg aim.shef.ac.uk).
- # For initial testing purposes, you can set this to "localhost". This
- # 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 8080. For any port other than 80, the
--- 90,93 ----
***************
*** 89,93 ****
######################################################################
! # In principle this allows you to choose the language in which AIM's
# messages are presented. The required mechanisms are in place but
# as yet there are no tables of translated messages.
--- 99,103 ----
######################################################################
! # In principle this allows you to choose the language in which AiM's
# messages are presented. The required mechanisms are in place but
# as yet there are no tables of translated messages.
***************
*** 129,138 ****
# Config['DocumentURL']
# Config['ServletURL']
- # KM
- # Config['TimeLimit']
- # END KM
# Config['WEBINFDir']
# Config['WebAppDir']
# Config['WebDir']
######################################################################
--- 139,146 ----
# 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.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** Servlet.mpl 25 Aug 2003 21:47:18 -0000 1.3
--- Servlet.mpl 26 Aug 2003 08:27:43 -0000 1.3.2.1
***************
*** 4,7 ****
--- 4,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
***************
*** 156,159 ****
--- 157,198 ----
):
+ # KM
+ initparam(
+ "KillProgram",
+ "The command used to kill processes on this OS.",
+ 'omit',
+ 'KillProgram'
+ ):
+
+ initparam(
+ "KillProgramArg",
+ "The argument given to the kill command to kill processes on this OS (preceding the PID).",
+ 'omit',
+ 'KillProgramArg'
+ ):
+
+ initparam(
+ "AliceHistorySize",
+ "The number of 'Recent Requests' to display on the Alice Monitor page.",
+ 20,
+ 'AliceHistorySize'
+ ):
+
+ initparam(
+ "StudentTimeLimit",
+ "The time limit on non-administrative commands in milliseconds.",
+ 60000,
+ 'StudentTimeLimit'
+ ):
+
+ initparam(
+ "AdminTimeLimit",
+ "The time limit on administrative commands in milliseconds.",
+ 1200000,
+ 'AdminTimeLimit'
+ ):
+
+ # END KM
+
initparam(
"LogFile",
***************
*** 406,410 ****
for f in os_listfiles(cat(cossource,"/multipart")) do
os_copy(cat(cossource,"/multipart/",f),
! cat(cosdest,"/multipart/",f)):
od:
--- 445,449 ----
for f in os_listfiles(cat(cossource,"/multipart")) do
os_copy(cat(cossource,"/multipart/",f),
! cat(cosdest,"/multipart/",f)):
od:
|
