Return-Path: 
 <cvs-return-22023-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 34191 invoked from network); 11 Feb 2005 11:34:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 11 Feb 2005 11:34:58 -0000
Received: (qmail 88917 invoked by uid 500); 11 Feb 2005 11:34:57 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 88878 invoked by uid 500); 11 Feb 2005 11:34:57 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 88860 invoked by uid 99); 11 Feb 2005 11:34:57 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 11 Feb 2005 03:34:57 -0800
Received: (qmail 34149 invoked by uid 65534); 11 Feb 2005 11:34:56 -0000
Message-ID: <20050211113456.34136.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Fri, 11 Feb 2005 11:34:55 -0000
Subject: svn commit: r153383 - in cocoon/trunk: ./ src/blocks/session-fw/conf/
 src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/
 src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/
 src/blocks/xsp/conf/
 src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/
 src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Fri Feb 11 03:34:49 2005
New Revision: 153383

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D153383
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/j=
ava/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/j=
ava/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/la=
nguage/markup/xsp/XSPSessionFwHelper.java
    cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/la=
nguage/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=3Ddiff&r1=3D1=
53382&r2=3D153383
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Fri Feb 11 03:34:49 2005
@@ -279,7 +279,6 @@
     </ant>
=20
     <depend project=3D"cocoon" inherit=3D"all"/>
-    <depend project=3D"cocoon-block-xsp"/>
=20
     <work nested=3D"tools/anttasks"/>
     <home nested=3D"build/cocoon-@@DATE@@"/>
@@ -1182,6 +1181,7 @@
     </ant>
=20
     <depend project=3D"cocoon" inherit=3D"all"/>
+    <depend project=3D"cocoon-block-session-fw"/>
     <depend project=3D"concurrent"/>
     <depend project=3D"pizza"/>
     <depend project=3D"jdtcore"/>

Modified: cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/conf/xsp-mar=
kup.xconf?view=3Ddiff&r1=3D153382&r2=3D153383
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 2=
005
@@ -142,6 +142,16 @@
           <parameter name=3D"uri" value=3D"http://apache.org/cocoon/xsp/in=
put/1.0"/>
           <parameter name=3D"href" value=3D"resource://org/apache/cocoon/c=
omponents/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=3D"prefix" value=3D"xsp-session-fw"/>
+          <parameter name=3D"uri" value=3D"http://apache.org/xsp/session-f=
w/1.0"/>
+          <parameter name=3D"href" value=3D"resource://org/apache/cocoon/c=
omponents/language/markup/xsp/java/session-fw.xsl"/>
+        </builtin-logicsheet>
       </target-language>
=20
       <!--+

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=3Ddiff&r1=
=3D153382&r2=3D153383
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Feb 11 03:34:49 2005
@@ -202,6 +202,9 @@
=20
   <changes>
  <release version=3D"@version@" date=3D"@date@">
+   <action dev=3D"CZ" type=3D"update">
+    Move XSP logicsheets from the session-fw block to the xsp block.
+   </action>
    <action dev=3D"TC" type=3D"add">
     javaflow: updated to the API change,
     lazy method lookups,