sylvain 01/08/30 06:04:51
Modified: . Tag: cocoon_20_branch changes.xml
webapp Tag: cocoon_20_branch cocoon.xconf
webapp/docs/samples/xsp Tag: cocoon_20_branch simple.xsp
Added: src/org/apache/cocoon/components/language/markup/xsp/java
Tag: cocoon_20_branch capture.xsl
logicsheet-util.xsl
src/org/apache/cocoon/components/sax Tag: cocoon_20_branch
XMLByteStreamFragment.java
Log:
Added capture logicsheet and XMLByteStreamFragment from 2.1 branch
Revision Changes Path
No revision
No revision
1.2.2.31 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.2.2.30
retrieving revision 1.2.2.31
diff -u -r1.2.2.30 -r1.2.2.31
--- changes.xml 2001/08/22 12:08:20 1.2.2.30
+++ changes.xml 2001/08/30 13:04:51 1.2.2.31
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.2.2.30 2001/08/22 12:08:20 sylvain Exp $
+ $Id: changes.xml,v 1.2.2.31 2001/08/30 13:04:51 sylvain Exp $
-->
<changes title="History of Changes">
@@ -26,6 +26,10 @@
</devs>
<release version="2.0b2-dev" date="@date@">
+ <action dev="SW" type="add">
+ New "capture" logicsheet that allows parts of XSP-generated XML to be captured
+ as XMLFragment or DOM objects.
+ </action>
<action dev="SW" type="add">
Removed ThreadSafe from the Action interfaces : the decision to be ThreadSafe
is left to each implementation. Consequently, existing actions now explictly
No revision
No revision
1.1.2.1 +1 -1
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/capture.xsl
Index: capture.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/capture.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- capture.xsl 2001/08/09 10:51:32 1.1
+++ capture.xsl 2001/08/30 13:04:51 1.1.2.1
@@ -17,7 +17,7 @@
content production.
@author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- @version CVS $Revision: 1.1 $ $Date: 2001/08/09 10:51:32 $
+ @version CVS $Revision: 1.1.2.1 $ $Date: 2001/08/30 13:04:51 $
-->
<xsl:stylesheet version="1.0"
1.1.2.1 +1 -1
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl
Index: logicsheet-util.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- logicsheet-util.xsl 2001/08/09 10:51:32 1.1
+++ logicsheet-util.xsl 2001/08/30 13:04:51 1.1.2.1
@@ -20,7 +20,7 @@
be set in the including logicsheet to its namespace URI.
@author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- @version CVS $Revision: 1.1 $ $Date: 2001/08/09 10:51:32 $
+ @version CVS $Revision: 1.1.2.1 $ $Date: 2001/08/30 13:04:51 $
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
No revision
No revision
1.4.2.1 +1 -1
xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamFragment.java
Index: XMLByteStreamFragment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamFragment.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- XMLByteStreamFragment.java 2001/08/30 11:48:41 1.4
+++ XMLByteStreamFragment.java 2001/08/30 13:04:51 1.4.2.1
@@ -18,7 +18,7 @@
* store SAX events and insert them in an XSP result using <xsp:expr>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/30 11:48:41 $
+ * @version CVS $Revision: 1.4.2.1 $ $Date: 2001/08/30 13:04:51 $
*/
public class XMLByteStreamFragment extends AbstractSAXFragment {
No revision
No revision
1.7.2.20 +7 -0 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.7.2.19
retrieving revision 1.7.2.20
diff -u -r1.7.2.19 -r1.7.2.20
--- cocoon.xconf 2001/08/03 11:10:05 1.7.2.19
+++ cocoon.xconf 2001/08/30 13:04:51 1.7.2.20
@@ -171,6 +171,13 @@
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/form-validator.xsl"/>
</builtin-logicsheet>
+ <!-- The capture taglib is for capturing parts of the XSP-generated XML as
+ XML fragments or DOM nodes -->
+ <builtin-logicsheet>
+ <parameter name="prefix" value="capture"/>
+ <parameter name="uri" value="http://apache.org/cocoon/capture/1.0"/>
+ <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/capture.xsl"/>
+ </builtin-logicsheet>
</target-language>
</xsp-language>
No revision
No revision
1.3.2.1 +8 -1 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.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- simple.xsp 2001/05/25 14:26:00 1.3
+++ simple.xsp 2001/08/30 13:04:51 1.3.2.1
@@ -5,6 +5,7 @@
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";
xmlns:log="http://apache.org/xsp/log/2.0";
+ xmlns:capture="http://apache.org/cocoon/capture/1.0";
>
<page>
@@ -15,6 +16,12 @@
<content>
+ <capture:fragment-variable name="page_part">
+ <para>These 2 paragraphs were generated at the start of the XSP, and captured
for insertion at the end.</para>
+
+ <para>Brought to you by Cocoon2 at <xsp:expr>new Date()</xsp:expr>.</para>
+ </capture:fragment-variable>
+
<para>Hi there! I'm a simple dynamic page generated by XSP (eXtensible Server
Pages).</para>
<para>I was requested as the URI: <b><xsp-request:get-uri as="xml"/></b></para>
@@ -69,7 +76,7 @@
<xsp-request:get-header-names/>
- <para>Brought to you by Cocoon2 at <xsp:expr>new Date()</xsp:expr>.</para>
+ <xsp:expr>page_part</xsp:expr>
</content>
<log:debug>Processing the end of the page</log:debug>
</page>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
