[Aimmath-commit] AIM/WEB-INF/java Alice.java,1.8.4.5,1.8.4.6

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

Update of /cvsroot/aimmath/AIM/WEB-INF/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29897/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.4.5
retrieving revision 1.8.4.6
diff -C2 -d -r1.8.4.5 -r1.8.4.6
*** Alice.java	25 Apr 2005 22:36:34 -0000	1.8.4.5
--- Alice.java	29 Apr 2005 15:09:43 -0000	1.8.4.6
***************
*** 65,69 ****
    // This controls how much logging information is generated by TtH
  
!   private String ServletURI;
    // The message to print if the server is too busy.
  
--- 65,69 ----
    // This controls how much logging information is generated by TtH
  
!   private String ServletURL;
    // The message to print if the server is too busy.
  
***************
*** 87,91 ****
      TempDir = getInitParameter("TempDir");
      ZoneFile = getInitParameter("ZoneFile");
!     ServletURI = getInitParameter("ServletURI");
  
      // It doesn't necessarily matter if these ones are null
--- 87,91 ----
      TempDir = getInitParameter("TempDir");
      ZoneFile = getInitParameter("ZoneFile");
!     ServletURL = getInitParameter("ServletURL");
  
      // It doesn't necessarily matter if these ones are null
***************
*** 289,294 ****
      }
  
!     if (ServletURI == null) {
!       missing.addElement("ServletURI");
      }
  
--- 289,294 ----
      }
  
!     if (ServletURL == null) {
!       missing.addElement("ServletURL");
      }
  
***************
*** 548,552 ****
      PrintWriter logWriter;
  
-     Maple maple;
      MapleArgList commandargs;
  
--- 548,551 ----
***************
*** 558,562 ****
      if (alicereq.isWSDL) {
        writeLog("Sending WSDL file\r\n\r\n");
!       sendWSDL(response,ServletURI);
        return;
      }
--- 557,561 ----
      if (alicereq.isWSDL) {
        writeLog("Sending WSDL file\r\n\r\n");
!       sendWSDL(response,ServletURL);
        return;
      }
***************
*** 589,593 ****
        restartEngine();
        writeLog("Error executing SOAP command:\r\n" + e.getMessage() + "\r\n\r\n");
!       writeSOAPFault(out,"Server","Server error",ServletURI,e);
        return;
      } finally {
--- 588,592 ----
        restartEngine();
        writeLog("Error executing SOAP command:\r\n" + e.getMessage() + "\r\n\r\n");
!       writeSOAPFault(out,"Server","Server error",ServletURL,e);
        return;
      } finally {