Author: cziegeler
Date: Fri Feb 11 03:34:49 2005
New Revision: 153383
URL: http://svn.apache.org/viewcvs?view=rev&rev=153383
Log:
Move XSP logicsheets from the session-fw block to the xsp block.
Added:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
- copied unchanged from r153377,
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl
- copied unchanged from r153377,
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl
Removed:
cocoon/trunk/src/blocks/session-fw/conf/xsp-session-fw.xconf
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/
Modified:
cocoon/trunk/gump.xml
cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf
cocoon/trunk/status.xml
Modified: cocoon/trunk/gump.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diff&r1=153382&r2=153383
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Fri Feb 11 03:34:49 2005
@@ -279,7 +279,6 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="cocoon-block-xsp"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1182,6 +1181,7 @@
</ant>
<depend project="cocoon" inherit="all"/>
+ <depend project="cocoon-block-session-fw"/>
<depend project="concurrent"/>
<depend project="pizza"/>
<depend project="jdtcore"/>
Modified: cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf?view=diff&r1=153382&r2=153383
==============================================================================
--- cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf (original)
+++ cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf Fri Feb 11 03:34:49 2005
@@ -142,6 +142,16 @@
<parameter name="uri"
value="http://apache.org/cocoon/xsp/input/1.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/input.xsl"/>
</builtin-logicsheet>
+
+ <!--+
+ | The session-fw logicsheet is an XSP logicsheet that allows
access to the session
+ | context
+ +-->
+ <builtin-logicsheet>
+ <parameter name="prefix" value="xsp-session-fw"/>
+ <parameter name="uri" value="http://apache.org/xsp/session-fw/1.0"/>
+ <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl"/>
+ </builtin-logicsheet>
</target-language>
<!--+
Modified: cocoon/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&r1=153382&r2=153383
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Feb 11 03:34:49 2005
@@ -202,6 +202,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="update">
+ Move XSP logicsheets from the session-fw block to the xsp block.
+ </action>
<action dev="TC" type="add">
javaflow: updated to the API change,
lazy method lookups,
