Branch: Tag:

2004-05-30

2004-05-30 23:18:42 by Marc Dirix <marc@electronics-design.nl>

Migrated from roxen_module.jar & roxen_servlet.jar to
chilimoon_module.jar & chilimoon_servlet.jar.

This needs some testing, however the modules seem to load fine
on my system j2sdk1.4.2.

The /java/src/com/roxen dir should be deleted after thorough testing.

Rev: server/java/classes/Makefile:1.9
Rev: server/java/doc/manualify.zsh:1.2
Rev: server/java/src/com/roxen/roxen/AbstractLocationModule.java:1.4
Rev: server/java/src/com/roxen/roxen/Defvar.java:1.3
Rev: server/java/src/com/roxen/roxen/ExperimentalModule.java:1.4
Rev: server/java/src/com/roxen/roxen/FileExtensionModule.java:1.4
Rev: server/java/src/com/roxen/roxen/Frame.java:1.3
Rev: server/java/src/com/roxen/roxen/HTTP.java:1.7
Rev: server/java/src/com/roxen/roxen/JarUtil.java:1.2
Rev: server/java/src/com/roxen/roxen/LastResortModule.java:1.2
Rev: server/java/src/com/roxen/roxen/LocationModule.java:1.6
Rev: server/java/src/com/roxen/roxen/Module.java:1.11
Rev: server/java/src/com/roxen/roxen/ParserModule.java:1.5
Rev: server/java/src/com/roxen/roxen/ProviderModule.java:1.3
Rev: server/java/src/com/roxen/roxen/RXML.java:1.3
Rev: server/java/src/com/roxen/roxen/SecurityModule.java:1.4
Rev: server/java/src/com/roxen/roxen/SimpleTagCaller.java:1.7
Rev: server/java/src/com/roxen/roxen/UniqueModule.java:1.4
Rev: server/java/src/com/roxen/servlet/HTTPInputStream.java:1.3
Rev: server/java/src/com/roxen/servlet/HTTPOutputStream.java:1.5
Rev: server/java/src/com/roxen/servlet/HeaderTokenizer.java:1.4
Rev: server/java/src/com/roxen/servlet/ServletConfig.java:1.5
Rev: server/java/src/com/roxen/servlet/ServletRequest.java:1.13
Rev: server/java/src/com/roxen/servlet/ServletResponse.java:1.10
Rev: server/modules/compat/ssi.pike:1.46
Rev: server/modules/examples/JavaReflector.java:1.4
Rev: server/modules/scripting/servlet.pike:2.25
Rev: server/pike_modules/JavaModule.pmod:1.26
Rev: server/pike_modules/Servlet.pmod:1.31

1: - import com.roxen.roxen.*; + import com.chilimoon.chilimoon.*;      import java.util.HashMap;   import java.lang.reflect.Modifier;
8:         /* -  * This is an example Roxen location module. +  * This is an example ChiliMoon location module.    * Copyright (c) 2000 - 2001, Roxen IS    */   
28:    return "A location module providing an HTML interface to Java Reflection.";    }    -  protected RoxenResponse response(String title, String body) +  protected ChiliMoonResponse response(String title, String body)    {    /*    * Package the content in an HTML page and return it with
40:    body+    "</body></html>\n";    -  return RoxenLib.httpRXMLAnswer(page); +  return ChiliMoonLib.httpRXMLAnswer(page);    }    -  public RoxenResponse packageList(RoxenRequest id) +  public ChiliMoonResponse packageList(ChiliMoonRequest id)    {    /*    * Default page, lists known packages.
56:    page.append(" <li>");    HashMap args = new HashMap();    args.put("href", queryLocation()+p.getName()); -  page.append(RoxenLib.makeContainer("a", args, p.getName())); +  page.append(ChiliMoonLib.makeContainer("a", args, p.getName()));    page.append("</li>\n");    }    page.append("</ul>\n");
68:    HashMap args = new HashMap();    Class c = getClass();    args.put("href", queryLocation()+c.getName()); -  page.append(RoxenLib.makeContainer("a", args, c.getName())); +  page.append(ChiliMoonLib.makeContainer("a", args, c.getName()));    page.append("\n");    return response("Packages", page.toString());    }    -  public RoxenResponse describePackage(Package p, RoxenRequest id) +  public ChiliMoonResponse describePackage(Package p, ChiliMoonRequest id)    {    /*    * Unfortunately, there is no way to list all classes
84:    page.append("<table border=1>\n<tr><td></td><th>Title</th>"+    "<th>Vendor</th><th>Version</th></tr>\n");    page.append("<tr><th>Specification</th><td>"); -  page.append(RoxenLib.htmlEncodeString(p.getSpecificationTitle()+"")); +  page.append(ChiliMoonLib.htmlEncodeString(p.getSpecificationTitle()+""));    page.append("</td><td>"); -  page.append(RoxenLib.htmlEncodeString(p.getSpecificationVendor()+"")); +  page.append(ChiliMoonLib.htmlEncodeString(p.getSpecificationVendor()+""));    page.append("</td><td>"); -  page.append(RoxenLib.htmlEncodeString(p.getSpecificationVersion()+"")); +  page.append(ChiliMoonLib.htmlEncodeString(p.getSpecificationVersion()+""));    page.append("</td></tr>\n<tr><th>Implementation</th><td>"); -  page.append(RoxenLib.htmlEncodeString(p.getImplementationTitle()+"")); +  page.append(ChiliMoonLib.htmlEncodeString(p.getImplementationTitle()+""));    page.append("</td><td>"); -  page.append(RoxenLib.htmlEncodeString(p.getImplementationVendor()+"")); +  page.append(ChiliMoonLib.htmlEncodeString(p.getImplementationVendor()+""));    page.append("</td><td>"); -  page.append(RoxenLib.htmlEncodeString(p.getImplementationVersion()+"")); +  page.append(ChiliMoonLib.htmlEncodeString(p.getImplementationVersion()+""));    page.append("</td></tr></table>\n");    return response("Package "+p.getName(), page.toString());    }
137:    int i = n.lastIndexOf('$');    HashMap args = new HashMap();    args.put("href", queryLocation()+(i<0? n : n.substring(0, i))); -  return RoxenLib.makeContainer("a", args, t); +  return ChiliMoonLib.makeContainer("a", args, t);    }       protected String classLink(Class[] c)
152:    return buf.toString();    }    -  protected void describe(StringBuffer page, Field f, RoxenRequest id, +  protected void describe(StringBuffer page, Field f, ChiliMoonRequest id,    int indent)    {    /* Append description of a field to a StringBuffer */
161:    f.getName()+"</font>;", indent);    }    -  protected void describe(StringBuffer page, Method m, RoxenRequest id, +  protected void describe(StringBuffer page, Method m, ChiliMoonRequest id,    int indent)    {    /* Append description of a method to a StringBuffer */
173:    classLink(th):"")+";", indent);    }    -  protected void describe(StringBuffer page, Constructor c, RoxenRequest id, +  protected void describe(StringBuffer page, Constructor c, ChiliMoonRequest id,    int indent)    {    /* Append description of a constructor to a StringBuffer */
185:    classLink(th):"")+";", indent);    }    -  protected void describe(StringBuffer page, Class c, RoxenRequest id, +  protected void describe(StringBuffer page, Class c, ChiliMoonRequest id,    int indent)    {    /* Append description of a class or interface to a StringBuffer */
234:    indentedLine(page, "}", indent);    }    -  public RoxenResponse describeClass(Class c, RoxenRequest id) +  public ChiliMoonResponse describeClass(Class c, ChiliMoonRequest id)    {    /*    * Page describing a class or interface (including inner classes)
248:    page.append(keywordFont+"package</font> ");    HashMap args = new HashMap();    args.put("href", queryLocation()+p.getName()); -  page.append(RoxenLib.makeContainer("a", args, +  page.append(ChiliMoonLib.makeContainer("a", args,    modifierFont+p.getName()+"</font>"));    page.append(";<br><br>\n");    }
257:    return response(ci+" "+c.getName(), page.toString());    }    -  public RoxenResponse findFile(String f, RoxenRequest id) +  public ChiliMoonResponse findFile(String f, ChiliMoonRequest id)    {    /* If no class or package name is given, show a default page */    if("".equals(f))