[Aimmath-commit] AIM/WEB-INF/maple Servlet.mpl,1.3,1.4

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

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

Modified Files:
	Servlet.mpl 
Log Message:
no longer copies com.oreilly classes

Index: Servlet.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Servlet.mpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Servlet.mpl	25 Aug 2003 21:47:18 -0000	1.3
--- Servlet.mpl	26 Aug 2003 18:06:06 -0000	1.4
***************
*** 201,284 ****
  
  ######################################################################
- # 
- # 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:
- #
- ######################################################################
  
  if os_os = "Linux" then
--- 201,204 ----
***************
*** 375,419 ****
  fi:
  
- ######################################################################
- 
- # Copy the com.oreilly.servlet classes
- 
- cosdir    := "com/oreilly/servlet/":
- cossource := cat("../cos/",cosdir):
- 
- # Of the three lines below, the first is approved for Tomcat 4.0 but
- # fails for Tomcat 4.1, and the reverse is true of the second.  The
- # third option is not really the approved place for general purpose
- # classes, but it works with all versions of Tomcat.
- #cosdest   := cat(ServletConfig['CatalinaHome'],"/classes/",cosdir):
- #cosdest   := cat(ServletConfig['CatalinaHome'],"/shared/classes/",cosdir):
- cosdest   := cat(webinf,"/classes/",cosdir):
- 
- if not(os_fileexists(cat(cosdest,"/multipart/Part.class"))) then
-  err := traperror(os_makedirectory(cat(cosdest,"/multipart"))):
- 
-  if err = lasterror then
-   printf("Could not create directory for com.oreilly.servlet classes\n"):
-   `quit`(1):
-  fi:
- 
-  for f in os_listfiles(cossource) do
-   if f <> "multipart" then
-    os_copy(cat(cossource,"/",f),cat(cosdest,"/",f)):
-   fi:
-  od:
- 
-  for f in os_listfiles(cat(cossource,"/multipart")) do
-   os_copy(cat(cossource,"/multipart/",f),
- 	  cat(cosdest,"/multipart/",f)):
-  od:
- 
-  if not(os_fileexists(cat(cosdest,"/multipart/Part.class"))) then
-   printf("Could not copy com.oreilly.servlet classes\n"):
-   `quit`(1):
-  fi:
- else
-  printf("com.oreilly.servlet classes are already installed.\n"):
- fi:
  
  read("Make.mpl");
--- 295,298 ----