You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2001/05/23 14:32:23 UTC
cvs commit: xml-cocoon2/xdocs httprequest.xml i18n.xml installing.xml sessions.xml xsp-internals.xml
giacomo 01/05/23 05:32:23
Modified: src/org/apache/cocoon Constants.java
src/org/apache/cocoon/components/language/markup/xsp
XSPRequestHelper.java
src/org/apache/cocoon/components/language/markup/xsp/java
cookie.xsl log.xsl request.xsl response.xsl
sendmail.xsl session.xsl util.xsl
src/org/apache/cocoon/generation DirectoryGenerator.java
RequestGenerator.java StatusGenerator.java
src/org/apache/cocoon/transformation
FragmentExtractorTransformer.java
I18nTransformer.java I18nTransformer2.java
SQLTransformer.java
webapp cocoon.xconf
webapp/docs/samples/forms process-department.xsp
process-employee.xsp
webapp/docs/samples/session sessionpage.xsp
webapp/docs/samples/sql sql-page.xml
webapp/docs/samples/xsp cookie.xsp request-test.xsp
simple.xsp upload.xsp
webapp/i18n simple.xml simple.xsp
webapp/protected/docs protected.xsp
webapp/protected/stylesheets error2html.xsl
webapp/stylesheets dynamic-page2html.xsl
fragment-extractor.xsl simple-sql2html.xsl
webapp/stylesheets/system directory2html.xsl error2html.xsl
status2html.xsl
webapp/sub/stylesheets error2html.xsl
xdocs httprequest.xml i18n.xml installing.xml
sessions.xml xsp-internals.xml
Log:
changeg URI namespaces to the agreed pattern:
http://apache.org/cocoon/app/m.n
http://apache.org/xsp/app/m.n
where app is the application (request, session, ...)
and m.n is a version numbering scheme of major.minor numbers.
The only namespaces not affected are:
http://apache.org/xsp
http://apache.org/cocoon/SQL/v2
Revision Changes Path
1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2001/05/09 20:49:28 1.1
+++ Constants.java 2001/05/23 12:32:16 1.2
@@ -10,7 +10,7 @@
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:28 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 12:32:16 $
*/
public interface Constants {
@@ -55,7 +55,7 @@
String INDEX_URI = "index";
- String ERROR_NAMESPACE_URI = "http://apache.org/cocoon/" + CONF_VERSION + "/error";
+ String ERROR_NAMESPACE_URI = "http://apache.org/cocoon/error/" + CONF_VERSION;
String ERROR_NAMESPACE_PREFIX = "error";
String CONTEXT_ENVIRONMENT_CONTEXT = "environment-context";
1.3 +33 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSPRequestHelper.java 2001/05/10 22:24:25 1.2
+++ XSPRequestHelper.java 2001/05/23 12:32:16 1.3
@@ -21,7 +21,7 @@
* The <code>Request</code> object helper
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 22:24:25 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:16 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -781,5 +781,36 @@
Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
request.getSession().removeAttribute(name);
}
-}
+ /**
+ * Obtain the portion of the request URI that indicates the context
+ * of the request
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static String getContextPath(
+ Map objectModel
+ )
+ {
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getContextPath();
+ }
+
+ /**
+ * Obtain the portion of the request URI that indicates the context
+ * of the request
+ *
+ * @param objectModel The Map objectModel
+ * @param contentHandler The SAX content handler
+ * @exception SAXException If a SAX error occurs
+ */
+ public static void getContextPath(
+ Map objectModel,
+ ContentHandler contentHandler
+ )
+ throws SAXException
+ {
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ elementData(contentHandler, "context-path", request.getContextPath());
+ }
+}
1.2 +1 -1 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl
Index: cookie.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cookie.xsl 2001/05/09 20:49:53 1.1
+++ cookie.xsl 2001/05/23 12:32:17 1.2
@@ -11,7 +11,7 @@
<xsl:stylesheet
version="1.0"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-cookie="http://apache.org/xsp/cookie"
+ xmlns:xsp-cookie="http://apache.org/xsp/cookie/2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
1.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/log.xsl
Index: log.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/log.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log.xsl 2001/05/14 13:53:02 1.2
+++ log.xsl 2001/05/23 12:32:17 1.3
@@ -11,14 +11,14 @@
<!--
* @author <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/14 13:53:02 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:17 $
-->
<!-- XSP Response logicsheet for the Java language -->
<xsl:stylesheet
version="1.0"
xmlns:xsp="http://apache.org/xsp"
- xmlns:log="http://apache.org/xsp/log"
+ xmlns:log="http://apache.org/xsp/log/2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
1.3 +23 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/request.xsl
Index: request.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/request.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- request.xsl 2001/05/10 22:24:27 1.2
+++ request.xsl 2001/05/23 12:32:17 1.3
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 22:24:27 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:17 $
-->
<!-- XSP Request logicsheet for the Java language -->
@@ -19,7 +19,7 @@
<xsl:stylesheet
version="1.0"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-request="http://apache.org/xsp/request"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:template match="xsp-request:get-uri">
@@ -287,6 +287,27 @@
<xsl:when test="$as = 'xml'">
<xsp:logic>
XSPRequestHelper.getRemoteUser(objectModel, this.contentHandler);
+ </xsp:logic>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="xsp-request:get-context-path">
+ <xsl:variable name="as">
+ <xsl:call-template name="value-for-as">
+ <xsl:with-param name="default" select="'string'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$as = 'string'">
+ <xsp:expr>
+ (XSPRequestHelper.getContextPath(objectModel))
+ </xsp:expr>
+ </xsl:when>
+ <xsl:when test="$as = 'xml'">
+ <xsp:logic>
+ XSPRequestHelper.getContextPath(objectModel, this.contentHandler);
</xsp:logic>
</xsl:when>
</xsl:choose>
1.2 +3 -3 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/response.xsl
Index: response.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/response.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- response.xsl 2001/05/09 20:49:55 1.1
+++ response.xsl 2001/05/23 12:32:17 1.2
@@ -6,19 +6,19 @@
* This software is published under the terms of the Apache Software License *
* version 1.1, a copy of which has been included with this distribution in *
* the LICENSE file. *
- *****************************************************************************
+ *****************************************************************************
-->
<!--
* @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:55 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 12:32:17 $
-->
<!-- XSP Response logicsheet for the Java language -->
<xsl:stylesheet
version="1.0"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-response="http://apache.org/xsp/response"
+ xmlns:xsp-response="http://apache.org/xsp/response/2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
1.2 +1 -1 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl
Index: sendmail.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sendmail.xsl 2001/05/09 20:49:55 1.1
+++ sendmail.xsl 2001/05/23 12:32:17 1.2
@@ -58,7 +58,7 @@
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsp="http://apache.org/xsp"
- xmlns:sendmail="http://apache.org/cocoon/sendmail/v1"
+ xmlns:sendmail="http://apache.org/cocoon/sendmail/1.0"
version="1.0"
>
1.2 +1 -1 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/session.xsl
Index: session.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/session.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- session.xsl 2001/05/09 20:49:55 1.1
+++ session.xsl 2001/05/23 12:32:17 1.2
@@ -57,7 +57,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsp="http://apache.org/xsp"
- xmlns:session="http://apache.org/xsp/session"
+ xmlns:session="http://apache.org/xsp/session/2.0"
>
<!-- *** ServletSession Templates *** -->
1.3 +1 -1 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/util.xsl
Index: util.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/util.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util.xsl 2001/05/18 16:47:09 1.2
+++ util.xsl 2001/05/23 12:32:17 1.3
@@ -58,7 +58,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsp="http://apache.org/xsp"
- xmlns:util="http://apache.org/xsp/util"
+ xmlns:util="http://apache.org/xsp/util/2.0"
>
<xsl:template match="xsp:page">
<xsp:page>
1.4 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectoryGenerator.java 2001/05/22 14:40:31 1.3
+++ DirectoryGenerator.java 2001/05/23 12:32:17 1.4
@@ -64,13 +64,13 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:conny@smb-tec.com">Conny Krappatsch</a>
* (SMB GmbH) for Virbus AG
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/22 14:40:31 $ */
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/23 12:32:17 $ */
public class DirectoryGenerator extends ComposerGenerator implements Recyclable {
/** The URI of the namespace of this generator. */
protected static final String URI =
- "http://apache.org/cocoon/2.0/directory";
+ "http://apache.org/cocoon/directory/2.0";
/** The namespace prefix for this namespace. */
protected static final String PREFIX = "dir";
1.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestGenerator.java 2001/05/10 21:16:53 1.2
+++ RequestGenerator.java 2001/05/23 12:32:18 1.3
@@ -20,12 +20,12 @@
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:53 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:18 $
*/
public class RequestGenerator extends ServletGenerator implements Recyclable {
/** The URI of the namespace of this generator. */
- private String URI="http://xml.apache.org/cocoon/2.0/RequestGenerator";
+ private String URI="http://xml.apache.org/cocoon/requestgenerator/2.0";
/**
* Generate XML data.
1.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatusGenerator.java 2001/05/10 21:16:54 1.2
+++ StatusGenerator.java 2001/05/23 12:32:18 1.3
@@ -48,14 +48,14 @@
*
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a> (Luminas Limited)
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:54 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:18 $
*/
public class StatusGenerator extends ComposerGenerator implements Recyclable {
/** The XML namespace for the output document.
*/
protected static final String namespace =
- "http://apache.org/cocoon/2.0/status";
+ "http://apache.org/cocoon/status/2.0";
/** The XML namespace for xlink
*/
1.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Index: FragmentExtractorTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FragmentExtractorTransformer.java 2001/05/22 14:47:17 1.2
+++ FragmentExtractorTransformer.java 2001/05/23 12:32:18 1.3
@@ -43,14 +43,14 @@
* <a href="http://c2.com/cgi/wiki?YouArentGonnaNeedIt">you aren't gonna need it</a>,
* so I've just used very simple extraction based on a URI and local name.
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:47:17 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:18 $
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements Composable, Disposable, Cacheable, Poolable {
private static String EXTRACT_URI="http://www.w3.org/2000/svg";
private static String EXTRACT_ELEMENT="svg";
- private static String FE_URI="http://apache.org/cocoon/fragmentextractor";
+ private static String FE_URI="http://apache.org/cocoon/fragmentextractor/2.0";
private static String XLINK_URI="http://www.w3c.org/1999/xlink";
private static String generatorClass = "org.apache.cocoon.generation.FragmentExtractorGenerator";
1.4 +3 -3 xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- I18nTransformer.java 2001/05/22 14:47:24 1.3
+++ I18nTransformer.java 2001/05/23 12:32:18 1.4
@@ -69,7 +69,7 @@
* </p>
* <p>
* file.xml:<br>
- * <root xmlns:i="http://apache.org/cocoon/i18n"><br>
+ * <root xmlns:i="http://apache.org/cocoon/i18n/2.0"><br>
* <elem i:tr="y">Translate me</elem><br>
* <elem><i:tr>Translate me</i:tr></elem><br>
* </root>
@@ -110,9 +110,9 @@
public Map dictionary;
- //apache.org/cocoon/i18n";
+ //apache.org/cocoon/i18n/2.0";
public final static String I18N_NAMESPACE_URI =
- "http://apache.org/cocoon/i18n";
+ "http://apache.org/cocoon/i18n/2.0";
public final static String I18N_ELEMENT = "i18n";
public final static String I18N_ELEMENT_KEY_ATTRIBUTE = "key";
1.3 +3 -3 xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer2.java
Index: I18nTransformer2.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- I18nTransformer2.java 2001/05/22 14:47:29 1.2
+++ I18nTransformer2.java 2001/05/23 12:32:18 1.3
@@ -75,7 +75,7 @@
* </p>
* <p>
* file.xml:<br>
- * <root xmlns:i18n="http://apache.org/cocoon/i18n"><br>
+ * <root xmlns:i18n="http://apache.org/cocoon/i18n/2.0"><br>
* <elem i18n:attr="title" title="translate_me">Text</elem><br>
* <elem><i18n:text>Translate me</i18n:text></elem><br>
* </root>
@@ -106,9 +106,9 @@
public Map dictionary;
- //apache.org/cocoon/i18n";
+ //apache.org/cocoon/i18n/2.0";
public final static String I18N_NAMESPACE_URI =
- "http://apache.org/cocoon/i18n";
+ "http://apache.org/cocoon/i18n/2.0";
public final static String I18N_ELEMENT = "i18n";
//
1.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SQLTransformer.java 2001/05/22 14:47:41 1.2
+++ SQLTransformer.java 2001/05/23 12:32:18 1.3
@@ -46,13 +46,13 @@
* @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:47:41 $ $Author: cziegeler $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:18 $ $Author: giacomo $
*/
public class SQLTransformer extends AbstractTransformer implements Composable, Poolable, Disposable {
/** The SQL namespace **/
- public static final String my_uri = "http://apache.org/cocoon/SQL";
+ public static final String my_uri = "http://apache.org/cocoon/SQL/2.0";
public static final String my_name = "SQLTransformer";
/** The SQL namespace element names **/
1.7 +6 -6 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cocoon.xconf 2001/05/23 09:40:53 1.6
+++ cocoon.xconf 2001/05/23 12:32:19 1.7
@@ -74,25 +74,25 @@
<builtin-logicsheet>
<parameter name="prefix" value="xsp-request"/>
- <parameter name="uri" value="http://apache.org/xsp/request"/>
+ <parameter name="uri" value="http://apache.org/xsp/request/2.0"/>
<parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-response"/>
- <parameter name="uri" value="http://apache.org/xsp/response"/>
+ <parameter name="uri" value="http://apache.org/xsp/response/2.0"/>
<parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="session"/>
- <parameter name="uri" value="http://apache.org/xsp/session"/>
+ <parameter name="uri" value="http://apache.org/xsp/session/2.0"/>
<parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/session.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-cookie"/>
- <parameter name="uri" value="http://apache.org/xsp/cookie"/>
+ <parameter name="uri" value="http://apache.org/xsp/cookie/2.0"/>
<parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl"/>
</builtin-logicsheet>
@@ -104,13 +104,13 @@
<builtin-logicsheet>
<parameter name="prefix" value="log"/>
- <parameter name="uri" value="http://apache.org/xsp/log"/>
+ <parameter name="uri" value="http://apache.org/xsp/log/2.0"/>
<parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/log.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="util"/>
- <parameter name="uri" value="http://apache.org/xsp/util"/>
+ <parameter name="uri" value="http://apache.org/xsp/util/2.0"/>
<parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/util.xsl"/>
</builtin-logicsheet>
</target-language>
1.2 +1 -1 xml-cocoon2/webapp/docs/samples/forms/process-department.xsp
Index: process-department.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/forms/process-department.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- process-department.xsp 2001/05/09 20:50:14 1.1
+++ process-department.xsp 2001/05/23 12:32:19 1.2
@@ -4,7 +4,7 @@
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:esql="http://apache.org/cocoon/SQL/v2"
- xmlns:xsp-request="http://apache.org/xsp/request"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
>
<xsp:logic>
String process = null;
1.2 +1 -1 xml-cocoon2/webapp/docs/samples/forms/process-employee.xsp
Index: process-employee.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/forms/process-employee.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- process-employee.xsp 2001/05/09 20:50:14 1.1
+++ process-employee.xsp 2001/05/23 12:32:19 1.2
@@ -4,7 +4,7 @@
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:esql="http://apache.org/cocoon/SQL/v2"
- xmlns:xsp-request="http://apache.org/xsp/request"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
>
<xsp:logic>
String process = null;
1.2 +2 -2 xml-cocoon2/webapp/docs/samples/session/sessionpage.xsp
Index: sessionpage.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/session/sessionpage.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sessionpage.xsp 2001/05/09 20:50:19 1.1
+++ sessionpage.xsp 2001/05/23 12:32:19 1.2
@@ -3,8 +3,8 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:session="http://apache.org/xsp/session"
- xmlns:xsp-request="http://apache.org/xsp/request"
+ xmlns:session="http://apache.org/xsp/session/2.0"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
>
<!-- a simple session page by J�rg Prante <jo...@7val.com> -->
1.2 +2 -2 xml-cocoon2/webapp/docs/samples/sql/sql-page.xml
Index: sql-page.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/sql/sql-page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sql-page.xml 2001/05/09 20:50:16 1.1
+++ sql-page.xml 2001/05/23 12:32:19 1.2
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<page xmlns:sql="http://apache.org/cocoon/SQL">
+<page xmlns:sql="http://apache.org/cocoon/SQL/2.0">
<title>Hello</title>
<content>
<para>This is my first Cocoon2 page filled with sql data!</para>
- <execute-query xmlns="http://apache.org/cocoon/SQL">
+ <execute-query xmlns="http://apache.org/cocoon/SQL/2.0">
<query>
select id,name from department_table
</query>
1.2 +2 -2 xml-cocoon2/webapp/docs/samples/xsp/cookie.xsp
Index: cookie.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/xsp/cookie.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cookie.xsp 2001/05/09 20:50:15 1.1
+++ cookie.xsp 2001/05/23 12:32:20 1.2
@@ -3,8 +3,8 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-cookie="http://apache.org/xsp/cookie"
- xmlns:xsp-request="http://apache.org/xsp/request"
+ xmlns:xsp-cookie="http://apache.org/xsp/cookie/2.0"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
>
<xsp:structure>
1.2 +2 -2 xml-cocoon2/webapp/docs/samples/xsp/request-test.xsp
Index: request-test.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/xsp/request-test.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- request-test.xsp 2001/05/09 20:50:15 1.1
+++ request-test.xsp 2001/05/23 12:32:20 1.2
@@ -3,8 +3,8 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-request="http://apache.org/xsp/request"
- xmlns:log="http://apache.org/xsp/log"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:log="http://apache.org/xsp/log/2.0"
>
<page>
1.2 +3 -3 xml-cocoon2/webapp/docs/samples/xsp/simple.xsp
Index: simple.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/xsp/simple.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple.xsp 2001/05/09 20:50:15 1.1
+++ simple.xsp 2001/05/23 12:32:20 1.2
@@ -3,9 +3,9 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-request="http://apache.org/xsp/request"
- xmlns:xsp-response="http://apache.org/xsp/response"
- xmlns:log="http://apache.org/xsp/log"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:xsp-response="http://apache.org/xsp/response/2.0"
+ xmlns:log="http://apache.org/xsp/log/2.0"
>
<page>
1.2 +3 -3 xml-cocoon2/webapp/docs/samples/xsp/upload.xsp
Index: upload.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/xsp/upload.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upload.xsp 2001/05/09 20:50:15 1.1
+++ upload.xsp 2001/05/23 12:32:20 1.2
@@ -3,9 +3,9 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-request="http://apache.org/xsp/request"
- xmlns:xsp-response="http://apache.org/xsp/response"
- xmlns:log="http://apache.org/xsp/log"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:xsp-response="http://apache.org/xsp/response/2.0"
+ xmlns:log="http://apache.org/xsp/log/2.0"
>
<xsp:structure>
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPUtil</xsp:include>
1.3 +1 -1 xml-cocoon2/webapp/i18n/simple.xml
Index: simple.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/i18n/simple.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple.xml 2001/05/18 14:05:18 1.2
+++ simple.xml 2001/05/23 12:32:20 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns:i18n="http://apache.org/cocoon/i18n">
+<root xmlns:i18n="http://apache.org/cocoon/i18n/2.0">
<title>
<i18n:text>Hello, internationalization!</i18n:text>
</title>
1.3 +1 -1 xml-cocoon2/webapp/i18n/simple.xsp
Index: simple.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/i18n/simple.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple.xsp 2001/05/18 14:05:21 1.2
+++ simple.xsp 2001/05/23 12:32:20 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request" xmlns:i18n="http://apache.org/cocoon/i18n">
+<xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0" xmlns:i18n="http://apache.org/cocoon/i18n/2.0">
<xsp:structure>
<xsp:include>java.text.SimpleDateFormat</xsp:include>
1.2 +1 -1 xml-cocoon2/webapp/protected/docs/protected.xsp
Index: protected.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/protected/docs/protected.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- protected.xsp 2001/05/09 20:50:21 1.1
+++ protected.xsp 2001/05/23 12:32:20 1.2
@@ -2,7 +2,7 @@
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:session="http://apache.org/xsp/session">
+ xmlns:session="http://apache.org/xsp/session/2.0">
<page>
<title>Protected area</title>
<content>
1.2 +1 -1 xml-cocoon2/webapp/protected/stylesheets/error2html.xsl
Index: error2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/protected/stylesheets/error2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error2html.xsl 2001/05/09 20:50:21 1.1
+++ error2html.xsl 2001/05/23 12:32:21 1.2
@@ -2,7 +2,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:error="http://apache.org/cocoon/2.0/error">
+ xmlns:error="http://apache.org/cocoon/error/2.0">
<xsl:template match="error:notify">
<html>
1.2 +2 -2 xml-cocoon2/webapp/stylesheets/dynamic-page2html.xsl
Index: dynamic-page2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/dynamic-page2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dynamic-page2html.xsl 2001/05/09 20:50:11 1.1
+++ dynamic-page2html.xsl 2001/05/23 12:32:21 1.2
@@ -3,8 +3,8 @@
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:xsp-request="http://apache.org/xsp/request"
- xmlns:xsp-response="http://apache.org/xsp/response"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:xsp-response="http://apache.org/xsp/response/2.0"
>
<xsl:include href="page/simple-page2html.xsl"/>
1.2 +1 -1 xml-cocoon2/webapp/stylesheets/fragment-extractor.xsl
Index: fragment-extractor.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/fragment-extractor.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fragment-extractor.xsl 2001/05/09 20:50:11 1.1
+++ fragment-extractor.xsl 2001/05/23 12:32:21 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fe="http://apache.org/cocoon/fragmentextractor">
+ xmlns:fe="http://apache.org/cocoon/fragmentextractor/2.0">
<xsl:template match="//fe:fragment">
<img src="welcome-svg-images/{@fragment-id}.png" border="0"/>
1.2 +1 -1 xml-cocoon2/webapp/stylesheets/simple-sql2html.xsl
Index: simple-sql2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/simple-sql2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple-sql2html.xsl 2001/05/09 20:50:10 1.1
+++ simple-sql2html.xsl 2001/05/23 12:32:21 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:sql="http://apache.org/cocoon/SQL">
+ xmlns:sql="http://apache.org/cocoon/SQL/2.0">
<xsl:import href="page/simple-page2html.xsl"/>
1.2 +2 -2 xml-cocoon2/webapp/stylesheets/system/directory2html.xsl
Index: directory2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/system/directory2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- directory2html.xsl 2001/05/09 20:50:11 1.1
+++ directory2html.xsl 2001/05/23 12:32:21 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:dir="http://apache.org/cocoon/2.0/directory">
+ xmlns:dir="http://apache.org/cocoon/directory/2.0">
<xsl:template match="/">
<html>
1.2 +1 -1 xml-cocoon2/webapp/stylesheets/system/error2html.xsl
Index: error2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/system/error2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error2html.xsl 2001/05/09 20:50:11 1.1
+++ error2html.xsl 2001/05/23 12:32:21 1.2
@@ -2,7 +2,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:error="http://apache.org/cocoon/2.0/error">
+ xmlns:error="http://apache.org/cocoon/error/2.0">
<xsl:template match="error:notify">
<html>
1.2 +1 -1 xml-cocoon2/webapp/stylesheets/system/status2html.xsl
Index: status2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/system/status2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- status2html.xsl 2001/05/09 20:50:11 1.1
+++ status2html.xsl 2001/05/23 12:32:21 1.2
@@ -2,7 +2,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:status="http://apache.org/cocoon/2.0/status">
+ xmlns:status="http://apache.org/cocoon/status/2.0">
<xsl:template match="status:statusinfo">
<html>
1.2 +1 -1 xml-cocoon2/webapp/sub/stylesheets/error2html.xsl
Index: error2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sub/stylesheets/error2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error2html.xsl 2001/05/09 20:50:10 1.1
+++ error2html.xsl 2001/05/23 12:32:22 1.2
@@ -2,7 +2,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:error="http://apache.org/cocoon/2.0/error">
+ xmlns:error="http://apache.org/cocoon/error/2.0">
<xsl:template match="error:notify">
<html>
1.2 +2 -2 xml-cocoon2/xdocs/httprequest.xml
Index: httprequest.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/httprequest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httprequest.xml 2001/05/09 20:50:22 1.1
+++ httprequest.xml 2001/05/23 12:32:22 1.2
@@ -140,14 +140,14 @@
<builtin-logicsheet>
<parameter name="prefix" value="xsp-request"/>
- <parameter name="uri" value="http://apache.org/xsp/request"/>
+ <parameter name="uri" value="http://apache.org/xsp/request/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-response"/>
- <parameter name="uri" value="http://apache.org/xsp/response"/>
+ <parameter name="uri" value="http://apache.org/xsp/response/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
</builtin-logicsheet>
1.2 +2 -2 xml-cocoon2/xdocs/i18n.xml
Index: i18n.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/i18n.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i18n.xml 2001/05/16 14:42:00 1.1
+++ i18n.xml 2001/05/23 12:32:22 1.2
@@ -27,7 +27,7 @@
<code>I18nTransformer</code>
</link>
, it uses XML dictionaries for all the i18n data. The namespace of i18n is defined as follows:
- <code>xmlns:i18n="http://apache.org/cocoon/i18n"</code>
+ <code>xmlns:i18n="http://apache.org/cocoon/i18n/2.0"</code>
</p>
<p>
First implementation was developed by <link href="mailto:lassi.immonen@valkeus.com">Lassi Immonen</link>. In this implementation the syntax was changed according to the <link href="http://www.infozone-group.org">Infozone Group's</link> i18n proposal (with a little difference) and new features were implemented.
@@ -248,7 +248,7 @@
</p>
<source><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns:i18n="http://apache.org/cocoon/i18n">
+<root xmlns:i18n="http://apache.org/cocoon/i18n/2.0">
<elem title="main_title" i18n:attr="title">
<i18n:text>Text to be translated</i18n:text>
</elem>
1.5 +43 -2 xml-cocoon2/xdocs/installing.xml
Index: installing.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/installing.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- installing.xml 2001/05/16 10:35:06 1.4
+++ installing.xml 2001/05/23 12:32:22 1.5
@@ -291,11 +291,11 @@
Continue to edit the same file by inserting the following system property into
the java run command for Weblogic:
<br/>
- -Dorg.apache.cocoon.components.parser.Parser=org.apache.cocoon.components.parser.XercesPa rser
+ -Dorg.apache.cocoon.components.parser.Parser=org.apache.cocoon.components.parser.XercesParser
<br/>
In other words, after you modify the java run command, it should look something like this:
<br/>
- "%JAVA_HOME%\bin\java" -hotspot -ms64m -mx64m -classpath %CLASSPATH% -Dorg.apache.cocoon.components.parser.Parser=org.apache.cocoon.components.parser.XercesPa rser -Dweblogic.Domain=mydomain -Dweblogic.Name=myserver "-Dbea.home=C:\bea" "-Djava.security.policy=C:\bea\wlserver6.0sp1/lib/weblogic.policy" -Dweblogic.management.password=%WLS_PW% weblogic.Server
+ "%JAVA_HOME%\bin\java" -hotspot -ms64m -mx64m -classpath %CLASSPATH% -Dorg.apache.cocoon.components.parser.Parser=org.apache.cocoon.components.parser.XercesParser -Dweblogic.Domain=mydomain -Dweblogic.Name=myserver "-Dbea.home=C:\bea" "-Djava.security.policy=C:\bea\wlserver6.0sp1/lib/weblogic.policy" -Dweblogic.management.password=%WLS_PW% weblogic.Server
<br/>
</li>
@@ -323,6 +323,47 @@
</ol>
</s2>
+ <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>
+
+ <ol>
+ <li>Install IIS as usual</li>
+ <li>Install ServletExec (default paths will be used throughout)</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>Open the Cocoon welcome page (http://localhost/cocoon/)</li>
+ <li>
+ Congratulations! (hopefully) you should see the Cocoon welcome page.
+ </li>
+ </ol>
+ </s2>
</s1>
</body>
1.2 +3 -3 xml-cocoon2/xdocs/sessions.xml
Index: sessions.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/sessions.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sessions.xml 2001/05/09 20:50:23 1.1
+++ sessions.xml 2001/05/23 12:32:22 1.2
@@ -169,8 +169,8 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:session="http://apache.org/xsp/session"
- xmlns:xsp-request="http://apache.org/xsp/request"
+ xmlns:session="http://apache.org/xsp/session/2.0"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
>
<!-- a simple session page by J�rg Prante <jo...@7val.com> -->
@@ -211,7 +211,7 @@
<content>
<p align="left"><i>
- <b xmlns:xsp-response="http://apache.org/xsp/response" xmlns:xsp-request="http://apache.org/xsp/request">sessionpage.xsp</b>
+ <b xmlns:xsp-response="http://apache.org/xsp/response/2.0" xmlns:xsp-request="http://apache.org/xsp/request/2.0">sessionpage.xsp</b>
</i></p>
<p align="left"><i>
1.2 +4 -4 xml-cocoon2/xdocs/xsp-internals.xml
Index: xsp-internals.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/xsp-internals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsp-internals.xml 2001/05/09 20:50:23 1.1
+++ xsp-internals.xml 2001/05/23 12:32:22 1.2
@@ -1260,7 +1260,7 @@
<builtin-logicsheet>
<parameter name="prefix" value="xsp-request"/>
- <parameter name="uri" value="http://xml.apache.org/xsp/request"/>
+ <parameter name="uri" value="http://xml.apache.org/xsp/request/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
</builtin-logicsheet>
@@ -1268,7 +1268,7 @@
<builtin-logicsheet>
<parameter name="prefix" value="xsp-response"/>
<parameter name="uri"
- value="http://xml.apache.org/xsp/response"/>
+ value="http://xml.apache.org/xsp/response/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
</builtin-logicsheet>
@@ -1708,7 +1708,7 @@
<builtin-logicsheet>
<parameter name="prefix" value="xsp-request"/>
- <parameter name="uri" value="http://xml.apache.org/xsp/request"/>
+ <parameter name="uri" value="http://xml.apache.org/xsp/request/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
</builtin-logicsheet>
@@ -1716,7 +1716,7 @@
<builtin-logicsheet>
<parameter name="prefix" value="xsp-response"/>
<parameter name="uri"
- value="http://xml.apache.org/xsp/response"/>
+ value="http://xml.apache.org/xsp/response/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
</builtin-logicsheet>
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org