[Aimmath-commit] AIM/WEB-INF/maple ConfigFields.mpl,1.4.2.1,1.4.2.2 Make.mpl,1.4.2.3,1.4.2.4 Servlet.mpl,1.6.2.1,1.6.2.2

[Neil S. <nps...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29897/maple

Modified Files:
      Tag: aim-xml
	ConfigFields.mpl Make.mpl Servlet.mpl 
Log Message:


Index: Make.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Make.mpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -d -r1.4.2.3 -r1.4.2.4
*** Make.mpl	25 Apr 2005 22:36:46 -0000	1.4.2.3
--- Make.mpl	29 Apr 2005 15:09:44 -0000	1.4.2.4
***************
*** 136,139 ****
--- 136,140 ----
  if (MakingDist <> true) then
   pread("AliceServer.mpl"):
+  DefaultZone['MakeLoginPage']:
  fi:
  

Index: ConfigFields.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/ConfigFields.mpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** ConfigFields.mpl	31 Mar 2005 12:37:53 -0000	1.4.2.1
--- ConfigFields.mpl	29 Apr 2005 15:09:44 -0000	1.4.2.2
***************
*** 111,121 ****
  
  ServletConfigFields := [
!  ['MapleProgram',
    string,"
! 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.  The recommended
! location is /usr/bin/maple (under Linux) or c:\\Maple\\bin.wnt\\cmaple 
! (under Windows)."],
  
   ['MapleInitOptions',
--- 111,117 ----
  
  ServletConfigFields := [
!  ['ServletURL',
    string,"
! The base URL used to access the Alice servlet."],
  
   ['MapleInitOptions',
***************
*** 138,154 ****
  c:\\TtH\\tth (under Windows)."],
  
-  ['KillProgram',
-   string,"
- The absolute path to the kill program (used to kill Maple processes on this OS).
- Under Windows, the path should use backslashes as separators, and
- should not contain any spaces; in particular, 'Program Files' is
- disallowed."],
- 
-  ['KillProgramArg',
-   string,"
- The argument for the kill program to tell it to kill the process whose PID
- Is the final arg. Typically this is -k for the Process.exe program in Windows, and 
- -9 for the kill command in UNIX."],
- 
   ['AliceHistorySize',
    posint,"
--- 134,137 ----
***************
*** 163,170 ****
  The time limit on administrative commands in milliseconds."],
  
-  ['MaxMapleProcesses',
-   posint,"
- The maximum number of Maple processes that can be running at one time."],
- 
   ['TempDir',
    string,"
--- 146,149 ----

Index: Servlet.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Servlet.mpl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** Servlet.mpl	31 Mar 2005 12:37:53 -0000	1.6.2.1
--- Servlet.mpl	29 Apr 2005 15:09:44 -0000	1.6.2.2
***************
*** 100,103 ****
--- 100,110 ----
  
  initparam(
+  "ServletURL",
+  "The URL used to access the servlet",
+  'complain',
+  'ServletURL'
+ ):
+ 
+ initparam(
   "AliceMapleDir",
   "The top directory for the AIM maple code.",
***************
*** 120,130 ****
  
  initparam(
-  "MapleProgram",
-  "The command used to start Maple",
-  'omit',
-  'MapleProgram'
- ):
- 
- initparam(
   "MapleInitOptions",
   "Initialization options for Maple processes started by the servlet",
--- 127,130 ----
***************
*** 134,151 ****
  
  initparam(
-  "MaxMapleProcesses",
-  "The maximum number of maple processes to be run by the server",
-  8,
-  'MaxMapleProcesses'
- ):
- 
- initparam(
-  "BusyMessage",
-  "The message to return if this count is exceeded.",
-  "The Alice server is busy.  Please try again in a few minutes.",
-  'BusyMessage'
- ):
- 
- initparam(
   "TtHProgram",
   "The command used to run  the TeX-to-HTML converter tth.",
--- 134,137 ----