[Aimmath-commit] AIM/WEB-INF/java Alice.java,1.8,1.8.4.1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: aim-xml
	Alice.java 
Log Message:


Index: Alice.java
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/java/Alice.java,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** Alice.java	5 Sep 2003 09:57:07 -0000	1.8
--- Alice.java	7 Oct 2004 10:55:52 -0000	1.8.4.1
***************
*** 120,123 ****
--- 120,128 ----
    // if necessary.
  
+   private String ZoneFile;
+   // The DefaultZone.mpl file.  The servlet will look in this file
+   // to find the administrator password, which controls access to
+   // the servlet monitor.
+ 
    private int MaxPostSize;
    // The maximum allowed size for uploaded files, in bytes
***************
*** 174,177 ****
--- 179,183 ----
      AliceMapleDir = getInitParameter("AliceMapleDir");
      TempDir = getInitParameter("TempDir");
+     ZoneFile = getInitParameter("ZoneFile");
  
      // It doesn't necessarily matter if these ones are null
***************
*** 610,613 ****
--- 616,621 ----
             ||
    	   (browser.indexOf("safari") >= 0)
+ 	   ||
+   	   (browser.indexOf("opera 7") >= 0)
  	 )
        {
***************
*** 733,737 ****
      out.println("<body bgcolor='white'>");
      out.println("<h1>Alice server monitor</h1>");
!     DateFormat d = DateFormat.getTimeInstance(DateFormat.SHORT);
      out.println("Page last refreshed " + d.format(new Date()));
      out.println("<hr noshade>");
--- 741,745 ----
      out.println("<body bgcolor='white'>");
      out.println("<h1>Alice server monitor</h1>");
!     DateFormat d = DateFormat.getTimeInstance();
      out.println("Page last refreshed " + d.format(new Date()));
      out.println("<hr noshade>");
***************
*** 858,865 ****
        trapOutput_ = new StringWriter();
        trapOutput = new PrintWriter(trapOutput_);
!       initcommand = "currentdir(\"" + AliceMapleDir + "\"):\n";
        maple.exec(initcommand,trapOutput);
      } catch (Exception ex) {
-       //TODO: check that these \n's are OK in Windows
        msg_ = new StringWriter();
        msg = new PrintWriter(msg_);
--- 866,874 ----
        trapOutput_ = new StringWriter();
        trapOutput = new PrintWriter(trapOutput_);
!       initcommand =
!        "currentdir(\"" + AliceMapleDir + "\"):" + 
!        "ProcessID:=" + maple.id + ":\n";
        maple.exec(initcommand,trapOutput);
      } catch (Exception ex) {
        msg_ = new StringWriter();
        msg = new PrintWriter(msg_);
***************
*** 1203,1207 ****
    public String toHTML() {
      String id,st,tt;
!     DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT);
  
      if (processID < 0) {
--- 1212,1216 ----
    public String toHTML() {
      String id,st,tt;
!     DateFormat df = DateFormat.getTimeInstance();
  
      if (processID < 0) {
***************
*** 1290,1293 ****
  // Local Variables:
  // c-basic-offset: 2
! // compile-command: "javac -d /aim/WEB-INF/classes Alice.java"
  // End:
--- 1299,1302 ----
  // Local Variables:
  // c-basic-offset: 2
! // compile-command: "javac -d ../classes Alice.java"
  // End: