Index: src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
retrieving revision 1.2
diff -u -r1.2 xsp.xsl
--- src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl	2001/05/25 18:49:55	1.2
+++ src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl	2001/06/22 13:27:26
@@ -87,6 +87,12 @@
             };
         }
 
+        /* Built-in parameters available for use */
+        // context    - ServletContext
+        // request    - HttpServletRequest
+        // response   - HttpServletResponse
+        // parameters - parameters defined in the sitemap
+
         /* User Class Declarations */
         <xsl:apply-templates select="xsp:logic"/>
 
Index: src/org/apache/cocoon/environment/Context.java
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/src/org/apache/cocoon/environment/Context.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Context.java
--- src/org/apache/cocoon/environment/Context.java	2001/05/09 20:49:44	1.1.1.1
+++ src/org/apache/cocoon/environment/Context.java	2001/06/22 13:27:50
@@ -27,4 +27,5 @@
 
     String getMimeType(String file);
 
+    String getInitParameter(String name);
 }
Index: src/org/apache/cocoon/environment/commandline/CommandlineContext.java
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java,v
retrieving revision 1.1
diff -u -r1.1 CommandlineContext.java
--- src/org/apache/cocoon/environment/commandline/CommandlineContext.java	2001/05/10 22:19:33	1.1
+++ src/org/apache/cocoon/environment/commandline/CommandlineContext.java	2001/06/22 13:27:53
@@ -50,9 +50,14 @@
         return this.contextDir + path;
     }
 
-    public java.lang.String getMimeType(String file) {
+    public String getMimeType(String file) {
         getLogger().debug("CommandlineContext: getMimeType=" + file);
         //return servletContext.getMimeType(file);
+        return null;
+    }
+    
+    public String getInitParameter(String name) {
+        getLogger().debug("CommandlineContext: getInitParameter=" + name);
         return null;
     }
 }
Index: src/org/apache/cocoon/environment/http/HttpContext.java
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpContext.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 HttpContext.java
--- src/org/apache/cocoon/environment/http/HttpContext.java	2001/05/09 20:49:44	1.1.1.1
+++ src/org/apache/cocoon/environment/http/HttpContext.java	2001/06/22 13:27:56
@@ -27,24 +27,28 @@
      * Constructs a HttpContext object from a ServletContext object
      */
     public HttpContext (ServletContext servletContext) {
-                this.servletContext = servletContext;
-        }
+        this.servletContext = servletContext;
+    }
 
     public Object getAttribute(String name) {
-                return servletContext.getAttribute(name);
-        }
+        return servletContext.getAttribute(name);
+    }
 
-        public URL getResource(String path)
-                         throws MalformedURLException {
-                return servletContext.getResource(path);
-        }
+    public URL getResource(String path)
+       throws MalformedURLException {
+       return servletContext.getResource(path);
+    }
 
-        public String getRealPath(String path)
-                         throws MalformedURLException {
-                return servletContext.getRealPath(path);
-        }
+    public String getRealPath(String path)
+      throws MalformedURLException {
+      return servletContext.getRealPath(path);
+    }
 
-        public java.lang.String getMimeType(String file) {
-                return servletContext.getMimeType(file);
-        }
+    public String getMimeType(String file) {
+      return servletContext.getMimeType(file);
+    }
+
+    public String getInitParameter(String name) {
+        return servletContext.getInitParameter(name);
+    }
 }
Index: xdocs/installing.xml
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/xdocs/installing.xml,v
retrieving revision 1.9
diff -u -r1.9 installing.xml
--- xdocs/installing.xml	2001/06/12 18:52:13	1.9
+++ xdocs/installing.xml	2001/06/22 13:29:23
@@ -281,38 +281,20 @@
     <s2 title="Installing on ServletExec 3.1 (In Process with IIS)">
 
       <p>This installs Cocoon 2 in a "war" configuration.  This was successfully
-         installed under Windows NT 4.0 and IIS 4; unix users will need to 
-         adjust appropriately.</p>
+         installed under Windows NT 4.0 and IIS 4.  I don't believe that SE is
+         available for unix.</p>
 
+      <p><strong>Please note that <em>JDK 1.3</em> is required.</strong></p>
+
       <ol>
         <li>Install IIS as usual</li>
-        <li>Install ServletExec (default paths will be used throughout)</li>
+        <li>Install ServletExec (default paths will be used throughout), but
+            don't start it.</li>
         <li>Build Cocoon 2's war file (include lib's)</li>
-        <li>Copy <em>cocoon.war</em> to 
-            <em>C:\Program Files\New Atlanta\ServletExec ISAPI\webapps\default</em></li>
-        <li>Stop and restart IIS.  This should expand Cocoon 2 into
-            <em>C:\Program Files\New Atlanta\ServletExec ISAPI\ServletExec Data\default\cocoon</em></li>
-        <li>Open ServletExec's admin page (http://localhost/servlet/admin)</li>
-        <li>Open the Virtual Machine: classpath page (http://localhost/servlet/admin?classpath.html)</li>
-        <li>Enter the following Options (adjusting paths if appropriate)
-          <ul>
-            <li>C:\Program Files\New Atlanta\ServletExec ISAPI\ServletExec Data\default\cocoon\WAR\WEB-INF\lib\cocoon-2.0a6.jar</li>
-            <li>C:\Program Files\New Atlanta\ServletExec ISAPI\ServletExec Data\default\cocoon\WAR\WEB-INF\lib\xalan-2.0.1.jar</li>
-            <li>C:\Program Files\New Atlanta\ServletExec ISAPI\ServletExec Data\default\cocoon\WAR\WEB-INF\lib\xerces_1_3_1.jar</li>
-          </ul>
-          ensuring that they come <em>after</em> ServletExec's classes but 
-          <em>before</em> any other jar files.
-        </li>
-        <li>Open the Virtual Machine: options page (http://localhost/servlet/admin?vmoptions.html)</li>
-        <li>Enter the following Options (adjusting paths if appropriate)
-          <ul>
-            <li>-Xbootclasspath/a:C:\Program Files\New Atlanta\ServletExec ISAPI\ServletExec Data\default\cocoon\WAR\WEB-INF\lib\cocoon-2.0a6.jar</li>
-            <li>-Xbootclasspath/a:C:\Program Files\New Atlanta\ServletExec ISAPI\ServletExec Data\default\cocoon\WAR\WEB-INF\lib\xalan-2.0.1.jar</li>
-            <li>-Xbootclasspath/a:C:\Program Files\New Atlanta\ServletExec ISAPI\ServletExec Data\default\cocoon\WAR\WEB-INF\lib\xerces_1_3_1.jar</li>
-          </ul>
-        </li>
-        <li>Stop and restart IIS.  This should allow ServletExec to pickup the
-            new vm options.</li>
+        <li>Copy <em>cocoon.war</em> into 
+            <em>C:\Program Files\New Atlanta\ServletExec ISAPI\webapps\default</em>,
+            creating the directory default if required.</li>
+        <li>Start IIS.</li>
         <li>Open the Cocoon welcome page (http://localhost/cocoon/)</li>
         <li>
             Congratulations! (hopefully) you should see the Cocoon welcome page.