dims 01/06/22 07:11:54
Modified: src/org/apache/cocoon/components/language/markup/xsp/java
Tag: cocoon_20_branch xsp.xsl
src/org/apache/cocoon/environment Tag: cocoon_20_branch
Context.java
src/org/apache/cocoon/environment/commandline Tag:
cocoon_20_branch CommandlineContext.java
src/org/apache/cocoon/environment/http Tag: cocoon_20_branch
HttpContext.java
xdocs Tag: cocoon_20_branch installing.xml
Log:
Patch from John Morrison for installing.xml on ServletExec + other fixes.
Revision Changes Path
No revision
No revision
1.2.2.1 +7 -1
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- xsp.xsl 2001/05/25 18:49:55 1.2
+++ xsp.xsl 2001/06/22 14:11:44 1.2.2.1
@@ -12,7 +12,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/25 18:49:55 $
+ * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/06/22 14:11:44 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -86,6 +86,12 @@
</xsl:for-each>
};
}
+
+ /* 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"/>
No revision
No revision
1.1.1.1.2.1 +2 -1 xml-cocoon2/src/org/apache/cocoon/environment/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Context.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Context.java 2001/05/09 20:49:44 1.1.1.1
+++ Context.java 2001/06/22 14:11:46 1.1.1.1.2.1
@@ -15,7 +15,7 @@
* Defines an interface to provide client context information .
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:44 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/06/22 14:11:46 $
*
*/
@@ -27,4 +27,5 @@
String getMimeType(String file);
+ String getInitParameter(String name);
}
No revision
No revision
1.1.2.1 +6 -1
xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java
Index: CommandlineContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- CommandlineContext.java 2001/05/10 22:19:33 1.1
+++ CommandlineContext.java 2001/06/22 14:11:48 1.1.2.1
@@ -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;
}
}
No revision
No revision
1.1.1.1.2.1 +19 -15
xml-cocoon2/src/org/apache/cocoon/environment/http/HttpContext.java
Index: HttpContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpContext.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- HttpContext.java 2001/05/09 20:49:44 1.1.1.1
+++ HttpContext.java 2001/06/22 14:11:50 1.1.1.1.2.1
@@ -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);
+ }
}
No revision
No revision
1.6.2.4 +10 -28 xml-cocoon2/xdocs/installing.xml
Index: installing.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/installing.xml,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- installing.xml 2001/06/12 18:52:34 1.6.2.3
+++ installing.xml 2001/06/22 14:11:52 1.6.2.4
@@ -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>
+ <note>Please note that <em>JDK 1.3</em> is required.</note>
+
<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.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
