dims 01/08/14 06:59:23
Modified: src/org/apache/cocoon Tag: cocoon_20_branch
ProcessingException.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: cocoon_20_branch request.xsl xsp.xsl
Log:
Miscellaneous Patches from Ovidiu Peridescu.
- ProcessingException adds a new constructor.
- Patch for request.xsl adds xsp-request:get-session-id.
- Patch for xsp.xsl adds a xsp:init-page.
Revision Changes Path
No revision
No revision
1.1.1.1.2.1 +10 -1 xml-cocoon2/src/org/apache/cocoon/ProcessingException.java
Index: ProcessingException.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/ProcessingException.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
--- ProcessingException.java 2001/05/09 20:49:27 1.1.1.1
+++ ProcessingException.java 2001/08/14 13:59:23 1.1.1.1.2.1
@@ -17,7 +17,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:27 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/14 13:59:23 $
*/
public class ProcessingException extends CascadingException {
@@ -26,6 +26,15 @@
*/
public ProcessingException(String message) {
super(message, null);
+ }
+
+ /**
+ * Creates a new <code>ProcessingException</code> instance.
+ *
+ * @param ex an <code>Exception</code> value
+ */
+ public ProcessingException(Exception ex) {
+ super(ex.getMessage(), ex);
}
/**
No revision
No revision
1.3.2.1 +7 -1
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.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- request.xsl 2001/05/23 12:32:17 1.3
+++ request.xsl 2001/08/14 13:59:23 1.3.2.1
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:17 $
+ * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/14 13:59:23 $
-->
<!-- XSP Request logicsheet for the Java language -->
@@ -101,6 +101,12 @@
</xsp:logic>
</xsl:when>
</xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="xsp-request:get-session-id">
+ <xsp:expr>
+ (XSPRequestHelper.getSessionId(objectModel))
+ </xsp:expr>
</xsl:template>
<xsl:template match="xsp-request:get-parameter">
1.2.2.5 +4 -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.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- xsp.xsl 2001/08/09 10:48:11 1.2.2.4
+++ xsp.xsl 2001/08/14 13:59:23 1.2.2.5
@@ -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.2.4 $ $Date: 2001/08/09 10:48:11 $
+ * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/08/14 13:59:23 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -101,6 +101,9 @@
* Generate XML data.
*/
public void generate() throws SAXException, IOException, ProcessingException {
+ <!-- Do any user-defined necessary initializations -->
+ <xsl:value-of select="xsp:init-page"/>
+
this.contentHandler.startDocument();
AttributesImpl xspAttr = new AttributesImpl();
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
