Return-Path: 
 <cvs-return-23159-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 65829 invoked from network); 3 May 2005 18:53:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 3 May 2005 18:53:50 -0000
Received: (qmail 31608 invoked by uid 500); 3 May 2005 18:24:33 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 31526 invoked by uid 500); 3 May 2005 18:24:32 -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 31417 invoked by uid 99); 3 May 2005 18:24:29 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=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; Tue, 03 May 2005 11:24:07 -0700
Received: (qmail 51223 invoked by uid 65534); 3 May 2005 18:22:18 -0000
Message-ID: <20050503182218.51222.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r167951 - in /cocoon/branches/BRANCH_2_1_X/src/blocks:
 databases/ databases/conf/ databases/samples/ databases/samples/mod-db/
 databases/samples/org-db/ databases/samples/stylesheets/
 databases/samples/transform/ databases/samples/xsp/ hsqldb/ hsqldb/conf/
 hsqldb/samples/
Date: Tue, 03 May 2005 18:22:15 -0000
To: cvs@cocoon.apache.org
From: vgritsenko@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: vgritsenko
Date: Tue May  3 11:22:14 2005
New Revision: 167951

URL: http://svn.apache.org/viewcvs?rev=3D167951&view=3Drev
Log:
Remove duplicate HSQLDB database from databases block.
Remove duplicate samples schema from databases block.
Link samples to samples schema in hsqldb block.
Fix namespaces in sql transformer example.

Added:
    cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/build.xml
      - copied, changed from r165647, cocoon/branches/BRANCH_2_1_X/src/bloc=
ks/databases/build.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/conf/cocoondb.properties
      - copied unchanged from r165647, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/hsqldb/samples/WEB-INF/db/cocoondb.properties
    cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/conf/cocoondb.script
      - copied, changed from r165647, cocoon/branches/BRANCH_2_1_X/src/bloc=
ks/hsqldb/samples/WEB-INF/db/cocoondb.script
    cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/conf/schema.sql
      - copied, changed from r165647, cocoon/branches/BRANCH_2_1_X/src/bloc=
ks/hsqldb/samples/WEB-INF/db/tutorial.sql
Removed:
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/build.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/conf/cocoondb.propert=
ies
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/conf/cocoondb.script
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/transform/sql=
-page.xml.sql
    cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/samples/
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/edit-g=
roups.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/file-u=
pload-blob.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/schema=
.sql
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/user-l=
ist.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/add-de=
partment.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/add-em=
ployee.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/employ=
ee.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/proces=
s-department.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/proces=
s-employee.xsp
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/sitema=
p=2Exmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/sitemap.xmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/stylesheets/s=
ql2html.xsl
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/transform/sit=
emap.xmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/transform/sql=
-page.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/xsp/esql.xsp

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/=
edit-groups.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/mod-db/edit-groups.xsp?rev=3D167951&r1=3D167950&r2=3D1679=
51&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/edit-g=
roups.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/edit-g=
roups.xsp Tue May  3 11:22:14 2005
@@ -15,32 +15,29 @@
   limitations under the License.
 -->
=20
-<xsp:page
-          language=3D"java"
+<xsp:page language=3D"java"
           xmlns:xsp=3D"http://apache.org/xsp"
-	  xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
-          xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0"
-  >
-  <!--
-       -->
+	        xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
+          xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0">
+
   <xsp:structure>
     <xsp:include>java.util.Enumeration</xsp:include>
   </xsp:structure>
- =20
+
   <page>
     <resources>
        <resource type=3D"file" href=3D"database.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"schema.sql">Schema</resource>
+       <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
        <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
        <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
     </resources>
=20
     <title>edit-groups</title>
-   =20
+
=20
     <esql:connection>
       <esql:pool>personnel</esql:pool>
-   =20
+
       <xsp:logic>
          String user =3D <xsp-request:get-parameter name=3D"user.uid"/>;
          if ( user =3D=3D null ) {
@@ -71,7 +68,7 @@
                </esql:row-results>
              </esql:results>
            </esql:execute-query>
-         } =20
+         }
       </xsp:logic>
=20
=20
@@ -129,7 +126,7 @@
                                   <esql:query>select gid, gname from user_=
groups, groups where user_groups.gid =3D groups.gid and uid=3D<esql:paramet=
er type=3D"int"><xsp:expr>uid</xsp:expr></esql:parameter> order by gname</e=
sql:query>
                                   <esql:results>
                                     <esql:row-results>
-                                      <option>			       =20
+                                      <option>
                                         <xsp:attribute name=3D"value"><esq=
l:get-string column=3D"gid"/></xsp:attribute>
                                         <esql:get-string column=3D"gname"/>
                                       </option>
@@ -173,7 +170,7 @@
                                   <esql:query>select gid, gname from group=
s where gid not in (select gid from user_groups where uid=3D<esql:parameter=
 type=3D"int"><xsp:expr>uid</xsp:expr></esql:parameter>) order by gname</es=
ql:query>
                                   <esql:results>
                                     <esql:row-results>
-                                      <option>			       =20
+                                      <option>
                                         <xsp:attribute name=3D"value"><esq=
l:get-string column=3D"gid"/></xsp:attribute>
                                         <esql:get-string column=3D"gname"/>
                                       </option>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/=
file-upload-blob.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/mod-db/file-upload-blob.xsp?rev=3D167951&r1=3D167950&r2=
=3D167951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/file-u=
pload-blob.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/file-u=
pload-blob.xsp Tue May  3 11:22:14 2005
@@ -24,11 +24,11 @@
   <xsp:structure>
     <xsp:include>java.util.Enumeration</xsp:include>
   </xsp:structure>
- =20
+
   <page>
     <resources>
        <resource type=3D"file" href=3D"database.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"schema.sql">Schema</resource>
+       <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
        <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
        <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
     </resources>
@@ -36,12 +36,12 @@
     <title>file-upload-blob</title>
=20
    <!-- create image tags out of the images stored in the database, the br=
owser will subsequently
-        request those images and they will be served by a special pipeline=
 in the sitemap using=20
+        request those images and they will be served by a special pipeline=
 in the sitemap using
         the database reader component
-   -->   =20
+   -->
    <esql:connection>
       <esql:pool>personnel</esql:pool>
-   =20
+
       <esql:execute-query>
              <esql:query>select media.id from media</esql:query>
              <esql:results>
@@ -53,17 +53,17 @@
              <esql:no-results>no images yet</esql:no-results>
       </esql:execute-query>
     </esql:connection>
-    =20
+
=20
       <h1>Upload Media</h1>
-      <p>What's happening?  This example interacts with a simple database =
schema, set up by=20
-      default in the sample "personnel" hsql database installed with the d=
atabase block.  There=20
-      is one table "media" with two fields: a primary key, and a binary fi=
eld "image". =20
-      When a file upload is received from the simple form on this page, th=
e modular db action=20
+      <p>What's happening?  This example interacts with a simple database =
schema, set up by
+      default in the sample "personnel" hsql database installed with the d=
atabase block.  There
+      is one table "media" with two fields: a primary key, and a binary fi=
eld "image".
+      When a file upload is received from the simple form on this page, th=
e modular db action
       auto increments the primary key, and loads the binary file contents =
into the column (declared
       as type=3D"binary" in database.xml).  That's it.</p>
-      <p>Additionally, when this page is loaded, esql queries the media ta=
ble and places an image tag=20
-      for each row, using "primarykeyvalue".jpg for the src.  The sitemap =
is configured to serve=20
+      <p>Additionally, when this page is loaded, esql queries the media ta=
ble and places an image tag
+      for each row, using "primarykeyvalue".jpg for the src.  The sitemap =
is configured to serve
 	  *.jpg using the database reader (declared in the root database samples =
sitemap) which simply
 	  retrieves the binary data from the database and streams it to the brows=
er.</p>
=20

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/=
schema.sql
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/mod-db/schema.sql?rev=3D167951&r1=3D167950&r2=3D167951&vi=
ew=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/schema=
.sql (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/schema=
.sql Tue May  3 11:22:14 2005
@@ -1,5 +1,3 @@
-
-
 # Copyright 1999-2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,4 +45,3 @@
 	mimetype varchar(50),
 	primary key (id)
 );
-

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/=
user-list.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/mod-db/user-list.xsp?rev=3D167951&r1=3D167950&r2=3D167951=
&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/user-l=
ist.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/mod-db/user-l=
ist.xsp Tue May  3 11:22:14 2005
@@ -16,32 +16,28 @@
 -->
=20
 <xsp:page language=3D"java"
-     xmlns:xsp=3D"http://apache.org/xsp"
-     xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
-     xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0"
->
+          xmlns:xsp=3D"http://apache.org/xsp"
+          xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
+          xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0">
=20
   <xsp:structure>
     <xsp:include>java.util.Enumeration</xsp:include>
   </xsp:structure>
-   =20
-  <page>
=20
+  <page>
     <resources>
        <resource type=3D"file" href=3D"database.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"schema.sql">Schema</resource>
+       <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
        <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
        <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
     </resources>
=20
     <title>user-list</title>
-   =20
-    <content>
-       =20
=20
-      <h1>Modular Database Actions</h1>=20
+    <content>
+      <h1>Modular Database Actions</h1>
=20
-      <hr/>=20
+      <hr/>
=20
       <p>The intention is to factor out those parts that are dependent on
       the utilised DBMS as well as the methods used to obtain the values
@@ -50,7 +46,7 @@
=20
       <ol>
         <li>Input Modules read data from some source (e.g. the request
-            object or session attributes or whatever)</li>=20
+            object or session attributes or whatever)</li>
=20
        <li>Output Modules send the data to an arbitrary
            destination. Again, this could be request attributes or
@@ -71,16 +67,16 @@
=20
       <h2>Current database content</h2>
=20
-      <esql:connection>        =20
+      <esql:connection>
         <esql:pool>personnel</esql:pool>
-             =20
+
         <p>
           <sqltbl>
             <esql:execute-query>
               <esql:query>select * from user order by name, firstname, una=
me, uid</esql:query>
               <esql:results>
                 <esql:row-results>
-                      =20
+
                   <sqltblrow>
                     <name>
                       <esql:get-string column=3D"name"/>
@@ -106,7 +102,7 @@
                       </form>
                     </action>
                   </sqltblrow>
-                      =20
+
                 </esql:row-results>
               </esql:results>
               <esql:error-results>
@@ -136,7 +132,7 @@
                       <esql:query>select gid, gname from groups order by g=
name</esql:query>
                       <esql:results>
                         <esql:row-results>
-                          <option>                 =20
+                          <option>
                             <xsp:attribute name=3D"value"><esql:get-string=
 column=3D"gid"/></xsp:attribute>
                             <esql:get-string column=3D"gname"/>
                           </option>
@@ -146,7 +142,7 @@
                   </select>
                   <input type=3D"submit" name=3D"add-user-groups" value=3D=
"new user"/>
                 </action>
-              </sqltblrow>  =20
+              </sqltblrow>
             </form>
           </sqltbl>
         </p>
@@ -221,7 +217,7 @@
           </form>
         </p>
       </esql:connection>
-      =20
+
       <hr/>
=20
=20
@@ -268,7 +264,7 @@
       </p>
=20
       <hr/>
-     =20
+
     </content>
   </page>
 </xsp:page>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/=
add-department.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/org-db/add-department.xsp?rev=3D167951&r1=3D167950&r2=3D1=
67951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/add-de=
partment.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/add-de=
partment.xsp Tue May  3 11:22:14 2005
@@ -15,28 +15,24 @@
   limitations under the License.
 -->
=20
-<xsp:page
-          language=3D"java"
-          xmlns:xsp=3D"http://apache.org/xsp"
->
-
+<xsp:page language=3D"java"
+          xmlns:xsp=3D"http://apache.org/xsp">
   <page>
-
     <resources>
-       <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"../transform/sql-page.xml.sql">Sche=
ma</resource>
-       <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
-       <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
+      <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-co=
ntent">Descriptor</resource>
+      <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
+      <resource type=3D"doc" href=3D"userdocs/actions/database-actions.htm=
l">Actions</resource>
+      <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resourc=
e>
     </resources>
=20
-   <title>Add a Department</title>
+    <title>Add a Department</title>
=20
-   <content>
-   <form action=3D"process-department" method=3D"POST">
-     <input name=3D"process" type=3D"hidden" value=3D"Add"/>
-     <para>Department Name: <input name=3D"name" type=3D"text"/></para>
-     <input type=3D"submit" value=3D"Add"/>
-   </form>
-   </content>
+    <content>
+      <form action=3D"process-department" method=3D"POST">
+        <input name=3D"process" type=3D"hidden" value=3D"Add"/>
+        <para>Department Name: <input name=3D"name" type=3D"text"/></para>
+        <input type=3D"submit" value=3D"Add"/>
+      </form>
+    </content>
   </page>
 </xsp:page>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/=
add-employee.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/org-db/add-employee.xsp?rev=3D167951&r1=3D167950&r2=3D167=
951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/add-em=
ployee.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/add-em=
ployee.xsp Tue May  3 11:22:14 2005
@@ -15,41 +15,39 @@
   limitations under the License.
 -->
=20
-<xsp:page
-          language=3D"java"
+<xsp:page language=3D"java"
           xmlns:xsp=3D"http://apache.org/xsp"
-	  xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
->
+          xmlns:esql=3D"http://apache.org/cocoon/SQL/v2">
   <page>
-
     <resources>
-       <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"../transform/sql-page.xml.sql">Sche=
ma</resource>
-       <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
-       <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
+      <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-co=
ntent">Descriptor</resource>
+      <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
+      <resource type=3D"doc" href=3D"userdocs/actions/database-actions.htm=
l">Actions</resource>
+      <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resourc=
e>
     </resources>
=20
     <title>Add an Employee</title>
+
     <content>
       <form action=3D"process-employee" method=3D"POST">
         <input name=3D"process" type=3D"hidden" value=3D"Add"/>
         <para>Employee Name: <input name=3D"name" type=3D"text"/></para>
         <para>Department:
           <select name=3D"department">
-	  <esql:connection>
-	    <esql:pool>personnel</esql:pool>
-	    <esql:execute-query>
-	      <esql:query>select id, name from department order by name</esql:que=
ry>
-	      <esql:results>
-	        <esql:row-results>
-		  <option>
-		    <xsp:attribute name=3D"value"><esql:get-int column=3D"id"/></xsp:att=
ribute>
-                    <esql:get-string column=3D"name"/>
-		  </option>
-		</esql:row-results>
-	      </esql:results>
-	    </esql:execute-query>
-	  </esql:connection>
+            <esql:connection>
+              <esql:pool>personnel</esql:pool>
+              <esql:execute-query>
+                <esql:query>select id, name from department order by name<=
/esql:query>
+                <esql:results>
+                  <esql:row-results>
+                    <option>
+                      <xsp:attribute name=3D"value"><esql:get-int column=
=3D"id"/></xsp:attribute>
+                      <esql:get-string column=3D"name"/>
+                    </option>
+                  </esql:row-results>
+                </esql:results>
+              </esql:execute-query>
+            </esql:connection>
           </select>
         </para>
         <input type=3D"submit" value=3D"Add"/>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/=
employee.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/org-db/employee.xsp?rev=3D167951&r1=3D167950&r2=3D167951&=
view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/employ=
ee.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/employ=
ee.xsp Tue May  3 11:22:14 2005
@@ -15,11 +15,9 @@
   limitations under the License.
 -->
=20
-<xsp:page
-          language=3D"java"
+<xsp:page language=3D"java"
           xmlns:xsp=3D"http://apache.org/xsp"
-          xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
->
+          xmlns:esql=3D"http://apache.org/cocoon/SQL/v2">
   <page>
     <xsp:logic>
       String empID =3D request.getParameter("employee");
@@ -29,52 +27,53 @@
     </xsp:logic>
=20
     <resources>
-       <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"../transform/sql-page.xml.sql">Sche=
ma</resource>
-       <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
-       <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
+      <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-co=
ntent">Descriptor</resource>
+      <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
+      <resource type=3D"doc" href=3D"userdocs/actions/database-actions.htm=
l">Actions</resource>
+      <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resourc=
e>
     </resources>
=20
     <title>Manage Employees</title>
     <para style=3D"backgroud-color:#ff0000"><xsp:expr>(message =3D=3D null=
?"":message)</xsp:expr></para>
     <content>
       <form name=3D"EmployeeSelection">
-          <select size=3D"1" name=3D"employee"
-              onChange=3D"top.location.href=3Dwindow.location.pathname + '=
?employee=3D' + document.forms['EmployeeSelection'].employee.options[docume=
nt.forms['EmployeeSelection'].employee.options.selectedIndex].value">
-            <option value=3D"-1">-- New employee --</option>
-            <esql:connection>
-              <esql:pool>personnel</esql:pool>
-              <esql:execute-query>
-                <esql:query>select id, department_id, name from employee o=
rder by name</esql:query>
-                <esql:results>
-                  <esql:row-results>
-                      <xsp:logic>
+        <select size=3D"1" name=3D"employee"
+          onChange=3D"top.location.href=3Dwindow.location.pathname + '?emp=
loyee=3D' + document.forms['EmployeeSelection'].employee.options[document.f=
orms['EmployeeSelection'].employee.options.selectedIndex].value">
+          <option value=3D"-1">-- New employee --</option>
+          <esql:connection>
+            <esql:pool>personnel</esql:pool>
+            <esql:execute-query>
+              <esql:query>select id, department_id, name from employee ord=
er by name</esql:query>
+              <esql:results>
+                <esql:row-results>
+                  <xsp:logic>
                         if (<esql:get-string column=3D"id"/>.equals(empID)=
) {
                             depID =3D <esql:get-string column=3D"departmen=
t_id"/>;
-			    name =3D <esql:get-string column=3D"name"/>;
-			    xspAttr.addAttribute("", "selected", "selected", "CDATA", "");
+			                      name =3D <esql:get-string column=3D"name"/>;
+			                      xspAttr.addAttribute("", "selected", "selected", =
"CDATA", "");
                         }
-                      </xsp:logic>
-                    <option>
-                      <xsp:attribute name=3D"value"><esql:get-int column=
=3D"id"/></xsp:attribute>
-                      <esql:get-string column=3D"name"/>
-                    </option>
-                  </esql:row-results>
-                </esql:results>
-              </esql:execute-query>
-            </esql:connection>
-          </select>
+                  </xsp:logic>
+                  <option>
+                    <xsp:attribute name=3D"value"><esql:get-int column=3D"=
id"/></xsp:attribute>
+                    <esql:get-string column=3D"name"/>
+                  </option>
+                </esql:row-results>
+              </esql:results>
+            </esql:execute-query>
+          </esql:connection>
+        </select>
       </form>
+
       <form action=3D"" method=3D"POST" name=3D"EmployeeEntry">
         <script>document.forms["EmployeeEntry"].action =3D window.location=
.pathname</script>
         <input type=3D"hidden" name=3D"employee">
-	  <xsp:attribute name=3D"value"><xsp:expr>((empID !=3D null) ? empID : ""=
)</xsp:expr></xsp:attribute>
-	</input>
+          <xsp:attribute name=3D"value"><xsp:expr>((empID !=3D null) ? emp=
ID : "")</xsp:expr></xsp:attribute>
+        </input>
         <para>Employee Name:
-	  <input name=3D"name" type=3D"text">
-	   <xsp:attribute name=3D"value"><xsp:expr>((name !=3D null) ? name : "")=
</xsp:expr></xsp:attribute>
-	  </input>
-	</para>
+          <input name=3D"name" type=3D"text">
+            <xsp:attribute name=3D"value"><xsp:expr>((name !=3D null) ? na=
me : "")</xsp:expr></xsp:attribute>
+          </input>
+        </para>
         <para>Department:
           <select name=3D"department">
             <option value=3D"-1">-- Select department --</option>
@@ -84,11 +83,11 @@
                 <esql:query>select id, name from department order by name<=
/esql:query>
                 <esql:results>
                   <esql:row-results>
-                      <xsp:logic>
+                    <xsp:logic>
                         if (<esql:get-string column=3D"id"/>.equals(depID)=
) {
-			    xspAttr.addAttribute("", "selected", "selected", "CDATA", "");
+			                    xspAttr.addAttribute("", "selected", "selected", "C=
DATA", "");
                         }
-                      </xsp:logic>
+                    </xsp:logic>
                     <option>
                       <xsp:attribute name=3D"value"><esql:get-int column=
=3D"id"/></xsp:attribute>
                       <esql:get-string column=3D"name"/>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/=
process-department.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/org-db/process-department.xsp?rev=3D167951&r1=3D167950&r2=
=3D167951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/proces=
s-department.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/proces=
s-department.xsp Tue May  3 11:22:14 2005
@@ -15,17 +15,17 @@
   limitations under the License.
 -->
=20
-<xsp:page
-          language=3D"java"
+<xsp:page language=3D"java"
           xmlns:xsp=3D"http://apache.org/xsp"
           xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
-          xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0"
->
+          xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0">
+
   <xsp:logic>
     String process =3D null;
     String name =3D null;
     int currId =3D -1;
   </xsp:logic>
+
   <page>
     <xsp:logic>
       process =3D <xsp-request:get-parameter name=3D"process"/>;
@@ -33,10 +33,10 @@
     </xsp:logic>
=20
     <resources>
-       <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"../transform/sql-page.xml.sql">Sche=
ma</resource>
-       <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
-       <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
+      <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-co=
ntent">Descriptor</resource>
+      <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
+      <resource type=3D"doc" href=3D"userdocs/actions/database-actions.htm=
l">Actions</resource>
+      <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resourc=
e>
     </resources>
=20
     <title><xsp:expr>process</xsp:expr> Department Processed</title>
@@ -45,13 +45,13 @@
         <esql:pool>personnel</esql:pool>
         <esql:execute-query>
           <esql:query>
-	    select max(id) as maxid from department
-	  </esql:query>
+	          select max(id) as maxid from department
+          </esql:query>
           <esql:results>
-	    <esql:row-results>
-	      <xsp:logic>
+            <esql:row-results>
+              <xsp:logic>
                 currId =3D <esql:get-int column=3D"maxid"/>;
-	      </xsp:logic>
+              </xsp:logic>
               <esql:execute-query>
                 <esql:query>
                   insert into department (id, name) values (
@@ -60,7 +60,7 @@
                   )
                 </esql:query>
               </esql:execute-query>
-	    </esql:row-results>
+            </esql:row-results>
           </esql:results>
         </esql:execute-query>
       </esql:connection>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/=
process-employee.xsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/org-db/process-employee.xsp?rev=3D167951&r1=3D167950&r2=
=3D167951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/proces=
s-employee.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/proces=
s-employee.xsp Tue May  3 11:22:14 2005
@@ -15,18 +15,18 @@
   limitations under the License.
 -->
=20
-<xsp:page
-          language=3D"java"
+<xsp:page language=3D"java"
           xmlns:xsp=3D"http://apache.org/xsp"
           xmlns:esql=3D"http://apache.org/cocoon/SQL/v2"
-          xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0"
->
+          xmlns:xsp-request=3D"http://apache.org/xsp/request/2.0">
+
   <xsp:logic>
     String process =3D null;
     String name =3D null;
     String departmentId =3D null;
     int currId =3D -1;
   </xsp:logic>
+
   <page>
     <xsp:logic>
       process =3D <xsp-request:get-parameter name=3D"process"/>;
@@ -35,34 +35,34 @@
     </xsp:logic>
=20
     <resources>
-       <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-c=
ontent">Descriptor</resource>
-       <resource type=3D"file" href=3D"../transform/sql-page.xml.sql">Sche=
ma</resource>
-       <resource type=3D"doc" href=3D"userdocs/actions/database-actions.ht=
ml">Actions</resource>
-       <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resour=
ce>
+      <resource type=3D"file" href=3D"employee.xml?cocoon-view=3Dpretty-co=
ntent">Descriptor</resource>
+      <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
+      <resource type=3D"doc" href=3D"userdocs/actions/database-actions.htm=
l">Actions</resource>
+      <resource type=3D"doc" href=3D"userdocs/xsp/esql.html">ESQL</resourc=
e>
     </resources>
=20
     <title><xsp:expr>process</xsp:expr> Employee Processed</title>
     <content>
       <esql:connection>
         <esql:pool>personnel</esql:pool>
-	<esql:autocommit>false</esql:autocommit>
+        <esql:autocommit>false</esql:autocommit>
         <esql:execute-query>
           <esql:query>select max(id) as maxid from employee</esql:query>
           <esql:results>
-	    <esql:row-results>
-	      <xsp:logic>
+            <esql:row-results>
+              <xsp:logic>
                 currId =3D <esql:get-int column=3D"maxid"/>;
-	      </xsp:logic>
+              </xsp:logic>
               <esql:execute-query>
                 <esql:query>
                   insert into employee (id, name, department_id) values (
                     (<esql:parameter><xsp:expr>currId + 1</xsp:expr></esql=
:parameter>),
-                    <esql:parameter><xsp:expr>name</xsp:expr></esql:parame=
ter>,
-		    <esql:parameter><xsp:expr>departmentId</xsp:expr></esql:parameter>
+                  <esql:parameter><xsp:expr>name</xsp:expr></esql:paramete=
r>,
+                  <esql:parameter><xsp:expr>departmentId</xsp:expr></esql:=
parameter>
                   )
                 </esql:query>
               </esql:execute-query>
-	    </esql:row-results>
+            </esql:row-results>
           </esql:results>
         </esql:execute-query>
       </esql:connection>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/=
sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/org-db/sitemap.xmap?rev=3D167951&r1=3D167950&r2=3D167951&=
view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/sitema=
p=2Exmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/org-db/sitema=
p=2Exmap Tue May  3 11:22:14 2005
@@ -14,107 +14,103 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <map:sitemap xmlns:map=3D"http://apache.org/cocoon/sitemap/1.0">
=20
-<!-- =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 Components =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 Components =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 -->
=20
- <map:components>
-  <!-- original database actions -->
-  <map:actions>
-    <map:action logger=3D"sitemap.action.add-employee" name=3D"add-employe=
e" src=3D"org.apache.cocoon.acting.DatabaseAddAction"/>
-    <map:action logger=3D"sitemap.action.del-employee" name=3D"del-employe=
e" src=3D"org.apache.cocoon.acting.DatabaseDeleteAction"/>
-    <map:action logger=3D"sitemap.action.upd-employee" name=3D"upd-employe=
e" src=3D"org.apache.cocoon.acting.DatabaseUpdateAction"/>
-  </map:actions>
-
- </map:components>
-
-
-<!-- =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 Action sets =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 -->
-
-<!--
-  Action sets group actions together. If some actions are often used
-  together in pipeline fragments, it's easier to group them and refer
-  to the group. For more info, please see the docs.
--->
-
- <map:action-sets>
-  <map:action-set name=3D"employee">
-   <map:act action=3D"Add" type=3D"add-employee"/>
-   <map:act action=3D"Delete" type=3D"del-employee"/>
-   <map:act action=3D"Update" type=3D"upd-employee"/>
-  </map:action-set>
- </map:action-sets>
-
-<!-- =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 Views =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 -->
-
- <map:views>
-  <map:view name=3D"content" from-label=3D"content">
-   <map:serialize type=3D"xml"/>
-  </map:view>
-
-  <map:view from-label=3D"content" name=3D"pretty-content">
-    <map:transform src=3D"context://stylesheets/system/xml2html.xslt"/>
-    <map:serialize type=3D"html"/>
-  </map:view>
- =20
-  <map:view name=3D"links" from-position=3D"last">
-   <map:serialize type=3D"links"/>
-  </map:view>
-
- </map:views>
-
-<!-- =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 Pipelines =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 -->
-
- <map:pipelines>
-
-  <map:pipeline>
-
-   <map:match pattern=3D"employee.xml">
-     <map:generate src=3D"{0}"/>
-     <map:serialize type=3D"xml"/>
-   </map:match>
-
-   <map:match pattern=3D"employee">
-     <map:act set=3D"employee">
-       <map:parameter name=3D"descriptor" value=3D"employee.xml"/>
-       <!--
-          Here an action is used. To be precise: all actions that were
-          grouped together to a set named "employee". See user docs on
-          actions for more on this.
-
-      This fragment until the closing tag of map:act is only
-      included if at least one action of this set completes
-      successfully.
-       -->
-       <map:generate src=3D"employee.xsp" type=3D"serverpages"/>
-       <map:transform src=3D"context://samples/stylesheets/dynamic-page2ht=
ml.xsl">
-          <map:parameter name=3D"servletPath" value=3D"{request:servletPat=
h}"/>
-          <map:parameter name=3D"sitemapURI" value=3D"{request:sitemapURI}=
"/>
-          <map:parameter name=3D"contextPath" value=3D"{request:contextPat=
h}"/>
-          <map:parameter name=3D"file" value=3D".xsp"/>
-       </map:transform>
-       <map:serialize/>
-     </map:act>
-   </map:match>
-
-   <map:match pattern=3D"*">
-     <map:generate src=3D"{1}.xsp" type=3D"serverpages"/>
-       <map:transform src=3D"context://samples/stylesheets/dynamic-page2ht=
ml.xsl">
+  <map:components>
+    <map:actions>
+      <!--
+        - Original database actions
+        -->
+      <map:action logger=3D"sitemap.action.add-employee" name=3D"add-emplo=
yee" src=3D"org.apache.cocoon.acting.DatabaseAddAction"/>
+      <map:action logger=3D"sitemap.action.del-employee" name=3D"del-emplo=
yee" src=3D"org.apache.cocoon.acting.DatabaseDeleteAction"/>
+      <map:action logger=3D"sitemap.action.upd-employee" name=3D"upd-emplo=
yee" src=3D"org.apache.cocoon.acting.DatabaseUpdateAction"/>
+    </map:actions>
+  </map:components>
+
+  <!-- =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 Action sets =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 -->
+
+  <!--
+    - Action sets group actions together. If some actions are often used
+    - together in pipeline fragments, it's easier to group them and refer
+    - to the group. For more info, please see the docs.
+    -->
+  <map:action-sets>
+    <map:action-set name=3D"employee">
+      <map:act action=3D"Add" type=3D"add-employee"/>
+      <map:act action=3D"Delete" type=3D"del-employee"/>
+      <map:act action=3D"Update" type=3D"upd-employee"/>
+    </map:action-set>
+  </map:action-sets>
+
+  <!-- =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 Views =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 -->
+
+  <map:views>
+    <map:view name=3D"content" from-label=3D"content">
+      <map:serialize type=3D"xml"/>
+    </map:view>
+
+    <map:view from-label=3D"content" name=3D"pretty-content">
+      <map:transform src=3D"context://stylesheets/system/xml2html.xslt"/>
+      <map:serialize type=3D"html"/>
+    </map:view>
+
+    <map:view name=3D"links" from-position=3D"last">
+      <map:serialize type=3D"links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =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 Pipelines =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 -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern=3D"employee.xml">
+        <map:generate src=3D"{0}"/>
+        <map:serialize type=3D"xml"/>
+      </map:match>
+
+      <map:match pattern=3D"employee">
+        <map:act set=3D"employee">
+          <map:parameter name=3D"descriptor" value=3D"employee.xml"/>
+          <!--
+            - Here an action is used. To be precise: all actions that were
+            - grouped together to a set named "employee". See user docs on
+            - actions for more on this.
+            -
+            - This fragment until the closing tag of map:act is only
+            - included if at least one action of this set completes
+            - successfully.
+            -->
+          <map:generate src=3D"employee.xsp" type=3D"serverpages"/>
+          <map:transform src=3D"context://samples/stylesheets/dynamic-page=
2html.xsl">
+            <map:parameter name=3D"servletPath" value=3D"{request:servletP=
ath}"/>
+            <map:parameter name=3D"sitemapURI" value=3D"{request:sitemapUR=
I}"/>
+            <map:parameter name=3D"contextPath" value=3D"{request:contextP=
ath}"/>
+            <map:parameter name=3D"file" value=3D".xsp"/>
+          </map:transform>
+          <map:serialize/>
+        </map:act>
+      </map:match>
+
+      <map:match pattern=3D"*">
+        <map:generate src=3D"{1}.xsp" type=3D"serverpages"/>
+        <map:transform src=3D"context://samples/stylesheets/dynamic-page2h=
tml.xsl">
           <map:parameter name=3D"servletPath" value=3D"{request:servletPat=
h}"/>
           <map:parameter name=3D"sitemapURI" value=3D"{request:sitemapURI}=
"/>
           <map:parameter name=3D"contextPath" value=3D"{request:contextPat=
h}"/>
           <map:parameter name=3D"file" value=3D".xsp"/>
-       </map:transform>
-     <map:serialize/>
-   </map:match>
-
-   <map:match pattern=3D"">
-    <map:redirect-to uri=3D"../"/>
-   </map:match>
+        </map:transform>
+        <map:serialize/>
+      </map:match>
+
+      <map:match pattern=3D"">
+        <map:redirect-to uri=3D"../"/>
+      </map:match>
=20
-  </map:pipeline>
- </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
=20
 </map:sitemap>
-
-<!-- end of file -->

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/sitemap=
.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/sitemap.xmap?rev=3D167951&r1=3D167950&r2=3D167951&view=3D=
diff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/sitemap.xmap =
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/sitemap.xmap =
Tue May  3 11:22:14 2005
@@ -19,63 +19,64 @@
=20
 <!-- =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 Components =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 -->
=20
- <map:components>
-  <map:readers default=3D"resource">
-  	<map:reader name=3D"databasereader" logger=3D"sitemap.reader.databasere=
ader"
-                src=3D"org.apache.cocoon.reading.DatabaseReader">
-    	<use-connection>personnel</use-connection>
-    </map:reader>
-  </map:readers>
- </map:components>
-
-<!-- =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 Views =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 -->
-
- <map:views>
-  <map:view name=3D"content" from-label=3D"content">
-   <map:serialize type=3D"xml"/>
-  </map:view>
-
-  <map:view from-label=3D"content" name=3D"pretty-content">
-    <map:transform src=3D"context://stylesheets/system/xml2html.xslt"/>
-    <map:serialize type=3D"html"/>
-  </map:view>
- =20
-  <map:view name=3D"links" from-position=3D"last">
-   <map:serialize type=3D"links"/>
-  </map:view>
-
- </map:views>
-
-<!-- =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 Pipelines =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 -->
-
- <map:pipelines>
-
-  <map:pipeline>
-
-   <map:match pattern=3D"">
-     <map:redirect-to uri=3D"samples"/>
-   </map:match>
-
-   <map:match pattern=3D"welcome">
-     <map:redirect-to uri=3D"samples"/>
-   </map:match>
-  =20
-   <map:match pattern=3D"samples">
-    <map:generate src=3D"samples.xml"/>
-    <map:transform src=3D"context://samples/common/style/xsl/html/simple-s=
amples2html.xsl">
-       <map:parameter name=3D"contextPath" value=3D"{request:contextPath}"=
/>
-    </map:transform>
-    <map:serialize/>
-   </map:match>
-
-   <!-- samples automount --> =20
-   <map:match pattern=3D"*/**">
-     <map:mount uri-prefix=3D"{1}" src=3D"{1}/" check-reload=3D"yes"/>
-   </map:match>
-       =20
-  </map:pipeline>
- </map:pipelines>
+  <map:components>
+    <map:readers default=3D"resource">
+      <map:reader name=3D"databasereader"
+                  logger=3D"sitemap.reader.databasereader"
+                  src=3D"org.apache.cocoon.reading.DatabaseReader">
+        <use-connection>personnel</use-connection>
+      </map:reader>
+    </map:readers>
+  </map:components>
+
+  <!-- =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 Views =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 -->
+
+  <map:views>
+    <map:view name=3D"content" from-label=3D"content">
+      <map:serialize type=3D"xml"/>
+    </map:view>
+
+    <map:view from-label=3D"content" name=3D"pretty-content">
+      <map:transform src=3D"context://stylesheets/system/xml2html.xslt"/>
+      <map:serialize type=3D"html"/>
+    </map:view>
+
+    <map:view name=3D"links" from-position=3D"last">
+      <map:serialize type=3D"links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =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 Pipelines =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 -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern=3D"">
+        <map:redirect-to uri=3D"samples"/>
+      </map:match>
+
+      <map:match pattern=3D"welcome">
+        <map:redirect-to uri=3D"samples"/>
+      </map:match>
+
+      <map:match pattern=3D"schema.sql">
+        <map:read src=3D"context://WEB-INF/db/schema.sql" mime-type=3D"tex=
t/plain"/>
+      </map:match>
+
+      <map:match pattern=3D"samples">
+        <map:generate src=3D"samples.xml"/>
+        <map:transform src=3D"context://samples/common/style/xsl/html/simp=
le-samples2html.xsl">
+          <map:parameter name=3D"contextPath" value=3D"{request:contextPat=
h}"/>
+        </map:transform>
+        <map:serialize/>
+      </map:match>
+
+      <!-- samples automount -->
+      <map:match pattern=3D"*/**">
+        <map:mount uri-prefix=3D"{1}" src=3D"{1}/" check-reload=3D"yes"/>
+      </map:match>
=20
-</map:sitemap>
+    </map:pipeline>
+  </map:pipelines>
=20
-<!-- end of file -->
+</map:sitemap>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/stylesh=
eets/sql2html.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/stylesheets/sql2html.xsl?rev=3D167951&r1=3D167950&r2=3D16=
7951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/stylesheets/s=
ql2html.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/stylesheets/s=
ql2html.xsl Tue May  3 11:22:14 2005
@@ -15,43 +15,52 @@
   limitations under the License.
 -->
=20
-<xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/Tr=
ansform"
-                              xmlns:sql=3D"http://apache.org/cocoon/SQL/2.=
0">
-
+<!--
+  - Transforms sql transformer output into html.
+  - @version $Id$
+  -->
+<xsl:stylesheet version=3D"1.0"
+                xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transform"
+                xmlns:sql=3D"http://apache.org/cocoon/SQL/2.0">
=20
   <xsl:import href=3D"../../../common/style/xsl/html/simple-page2html.xsl"=
/>
=20
   <xsl:template match=3D"sql:rowset">
-   <xsl:choose>
-    <xsl:when test=3D"ancestor::sql:rowset">
-     <tr>
-      <td>
-       <table border=3D"1">
-        <xsl:apply-templates/>
-       </table>
-      </td>
-     </tr>
-    </xsl:when>
-    <xsl:otherwise>
-     <table border=3D"1">
-      <xsl:apply-templates/>
-     </table>
-    </xsl:otherwise>
-   </xsl:choose>
+    <xsl:choose>
+      <xsl:when test=3D"ancestor::sql:rowset">
+        <tr>
+          <td>
+            <table border=3D"1">
+              <xsl:apply-templates/>
+            </table>
+          </td>
+        </tr>
+      </xsl:when>
+      <xsl:otherwise>
+        <table border=3D"1">
+          <xsl:apply-templates/>
+        </table>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
=20
   <xsl:template match=3D"sql:row">
-   <tr>
-    <xsl:apply-templates/>
-   </tr>
+    <tr>
+      <xsl:apply-templates/>
+    </tr>
   </xsl:template>
=20
   <xsl:template match=3D"sql:name">
-   <td><xsl:value-of select=3D"."/></td> =20
+    <td>
+      <xsl:value-of select=3D"."/>
+      <br/>
+      <xsl:copy-of select=3D"../sql:description/*"/>
+    </td>
   </xsl:template>
=20
+  <xsl:template match=3D"sql:description"/>
+
   <xsl:template match=3D"sql:id">
-   <!-- ignore -->
+    <!-- ignore -->
   </xsl:template>
-
 </xsl:stylesheet>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/transfo=
rm/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/transform/sitemap.xmap?rev=3D167951&r1=3D167950&r2=3D1679=
51&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/transform/sit=
emap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/transform/sit=
emap.xmap Tue May  3 11:22:14 2005
@@ -18,59 +18,51 @@
=20
 <!-- =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 Views =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 -->
=20
- <map:views>
-  <map:view name=3D"content" from-label=3D"content">
-   <map:serialize type=3D"xml"/>
-  </map:view>
-
-  <map:view from-label=3D"content" name=3D"pretty-content">
-    <map:transform src=3D"context://stylesheets/system/xml2html.xslt"/>
-    <map:serialize type=3D"html"/>
-  </map:view>
- =20
-  <map:view name=3D"links" from-position=3D"last">
-   <map:serialize type=3D"links"/>
-  </map:view>
-
- </map:views>
+  <map:views>
+    <map:view name=3D"content" from-label=3D"content">
+      <map:serialize type=3D"xml"/>
+    </map:view>
+
+    <map:view from-label=3D"content" name=3D"pretty-content">
+      <map:transform src=3D"context://stylesheets/system/xml2html.xslt"/>
+      <map:serialize type=3D"html"/>
+    </map:view>
+
+    <map:view name=3D"links" from-position=3D"last">
+      <map:serialize type=3D"links"/>
+    </map:view>
+  </map:views>
=20
 <!-- =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 Pipelines =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 -->
=20
- <map:pipelines>
+  <map:pipelines>
=20
-  <map:pipeline>
-   <map:match pattern=3D"sql-page.xml.sql">
-    <map:read src=3D"sql-page.xml.sql" mime-type=3D"text/plain"/>
-   </map:match>
-
-   <map:match pattern=3D"*">
-    <map:generate src=3D"{1}.xml"/>
-    <map:transform type=3D"sql">
-      <map:parameter name=3D"use-connection" value=3D"personnel"/>
-    <!--
-       Let's have a look at the user docs: =20
-
-       "[...] The purpose of the SQLTransformer is to query a
-    database and translate the result to XML. [...]"=20
-    -->
-    </map:transform>
-    <map:transform src=3D"../stylesheets/sql2html.xsl">
-       <map:parameter name=3D"servletPath" value=3D"{request:servletPath}"=
/>
-       <map:parameter name=3D"sitemapURI" value=3D"{request:sitemapURI}"/>
-       <map:parameter name=3D"contextPath" value=3D"{request:contextPath}"=
/>
-       <map:parameter name=3D"file" value=3D".xml"/>
-    </map:transform>
-    <map:serialize/>
-   </map:match>
-
-   <map:match pattern=3D"">
-     <map:redirect-to uri=3D"../"/>
-   </map:match>
-
-  </map:pipeline>
- =20
- </map:pipelines>
+    <map:pipeline>
+      <map:match pattern=3D"*">
+        <map:generate src=3D"{1}.xml"/>
+        <!--
+          - Let's have a look at the user docs:
+          -
+          - "[...] The purpose of the SQLTransformer is to query a
+          - database and translate the result to XML. [...]"
+          -->
+        <map:transform type=3D"sql">
+          <map:parameter name=3D"use-connection" value=3D"personnel"/>
+        </map:transform>
+        <map:transform src=3D"../stylesheets/sql2html.xsl">
+          <map:parameter name=3D"servletPath" value=3D"{request:servletPat=
h}"/>
+          <map:parameter name=3D"sitemapURI" value=3D"{request:sitemapURI}=
"/>
+          <map:parameter name=3D"contextPath" value=3D"{request:contextPat=
h}"/>
+          <map:parameter name=3D"file" value=3D".xml"/>
+        </map:transform>
+        <map:serialize/>
+      </map:match>
+
+      <map:match pattern=3D"">
+        <map:redirect-to uri=3D"../"/>
+      </map:match>
=20
-</map:sitemap>
+    </map:pipeline>
+  </map:pipelines>
=20
-<!-- end of file -->
+</map:sitemap>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/transfo=
rm/sql-page.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/transform/sql-page.xml?rev=3D167951&r1=3D167950&r2=3D1679=
51&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/transform/sql=
-page.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/transform/sql=
-page.xml Tue May  3 11:22:14 2005
@@ -15,27 +15,26 @@
   limitations under the License.
 -->
=20
-<page xmlns:sql=3D"http://apache.org/cocoon/SQL/2.0">
+<page>
+  <title>Hello</title>
=20
- <title>Hello</title>
-    <resources>
-       <resource type=3D"file" href=3D"sql-page.xml.sql">Schema</resource>
-       <resource type=3D"doc" href=3D"userdocs/transformers/sql-transforme=
r=2Ehtml">SQL Transformer</resource>
-    </resources>
- <content>
-  <para>This is my first Cocoon2 page filled with sql data!</para>
+  <resources>
+    <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
+    <resource type=3D"doc" href=3D"userdocs/transformers/sql-transformer.h=
tml">SQL Transformer</resource>
+  </resources>
=20
-  <execute-query xmlns=3D"http://apache.org/cocoon/SQL/2.0">=20
-   <query>
-        select id,name from department
-   </query>
-   <execute-query>
-    <query>
-     select id,name from employee where department_id =3D <ancestor-value =
sql:name=3D"id" sql:level=3D"1"/>
-    </query>
-   </execute-query>
-  </execute-query>
+  <content>
+    <para>This is my first Cocoon2 page filled with SQL data!</para>
=20
- </content>
+    <sql:execute-query xmlns:sql=3D"http://apache.org/cocoon/SQL/2.0">
+      <sql:query>
+        select id, name, description from department
+      </sql:query>
+      <sql:execute-query>
+        <sql:query>
+          select id, name from employee where department_id =3D <sql:ances=
tor-value sql:name=3D"id" sql:level=3D"1"/>
+        </sql:query>
+      </sql:execute-query>
+    </sql:execute-query>
+  </content>
 </page>
-

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/xsp/esq=
l=2Exsp
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
databases/samples/xsp/esql.xsp?rev=3D167951&r1=3D167950&r2=3D167951&view=3D=
diff
=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/branches/BRANCH_2_1_X/src/blocks/databases/samples/xsp/esql.xsp =
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/samples/xsp/esql.xsp =
Tue May  3 11:22:14 2005
@@ -15,151 +15,136 @@
   limitations under the License.
 -->
=20
-<!-- CVS: $Id: esql.xsp,v 1.5 2004/04/05 12:25:35 antonio Exp $ -->
+<!-- CVS: $Id$ -->
=20
 <xsp:page language=3D"java"
           xmlns:xsp=3D"http://apache.org/xsp"
           xmlns:esql=3D"http://apache.org/cocoon/SQL/v2">
=20
   <page>
-   <title>A Database Driven XSP Page</title>
+    <title>A Database Driven XSP Page</title>
     <resources>
-       <resource type=3D"file" href=3D"../transform/sql-page.xml.sql">Sche=
ma</resource>
-       <resource type=3D"doc" href=3D"userdocs/xsp/esql">ESQL</resource>
+      <resource type=3D"file" href=3D"../schema.sql">Schema</resource>
+      <resource type=3D"doc" href=3D"userdocs/xsp/esql">ESQL</resource>
     </resources>
=20
-   <content>
-
-   <esql:connection>
-     <esql:pool>personnel</esql:pool>
-
-
-       <para>
-           Below you see all guys from the departments
-       </para>
-
-       <esql:execute-query>
-         <esql:query>select * from employee</esql:query>
-         <esql:results>
-           <esql:row-results>
-             <para><esql:get-string column=3D"name"/></para>
-             <!-- uncomment if you want columns to become tags -->
-             <!-- <esql:get-columns/> -->
-           </esql:row-results>
-         </esql:results>
-       </esql:execute-query>
-
-       <hr/>
-
-       <para>
-           Below you see just some of the guys
-       </para>
-
-       <esql:execute-query>
-         <esql:query>select * from employee</esql:query>
-         <esql:use-limit-clause>jdbc</esql:use-limit-clause>
-         <esql:skip-rows>1</esql:skip-rows>
-         <esql:max-rows>2</esql:max-rows>
-         <esql:results>
-           <esql:row-results>
-             <para><esql:get-string column=3D"name"/></para>
-           </esql:row-results>
-           <esql:previous-results>
-             We skipped some.
-           </esql:previous-results>
-           <esql:more-results>
-             There are some more.
-           </esql:more-results>
-           <para>
-             There is a total of <esql:row-count/> employees.
-           </para>
-         </esql:results>
-       </esql:execute-query>
-
-       <hr/>
-
-       <para>
-           Below departments and employees are printed.
-           Without the grouping feature, the result would look like this:
-       </para>
-
-       <esql:execute-query>
-         <esql:query>
-           SELECT department.name, employee.id, employee.name as empName F=
ROM department, employee
-           WHERE department.id =3D employee.department_id  ORDER BY depart=
ment.name
-         </esql:query>
-         <esql:results>
-           <esql:row-results>
-             <Department>
-               <xsp:attribute name=3D'name'><esql:get-string column=3D'nam=
e'/></xsp:attribute>
-               <h2><esql:get-string column=3D'name'/></h2>
-               <para><employee><esql:get-string column=3D'empName'/></empl=
oyee></para>
-             </Department>
-           </esql:row-results>
-         </esql:results>
-       </esql:execute-query>
-
-       <hr/>
-
-       <para>
-         This uses the grouping feature in esql.
-       </para>
-
-       <esql:execute-query>
-         <esql:query>
-           SELECT department.name, employee.id, employee.name as empName F=
ROM department, employee
-           WHERE department.id =3D employee.department_id  ORDER BY depart=
ment.name
-         </esql:query>
-         <esql:results>
-           <esql:row-results>
-             <esql:group group-on=3D'name'><!-- grouping -->
-               <Department>
-                 <xsp:attribute name=3D'name'><esql:get-string column=3D'n=
ame'/></xsp:attribute>
-                 <h2><esql:get-string column=3D'name'/></h2>
-                 <esql:member><!-- grouping -->
-                   <para><employee><esql:get-string column=3D'empName'/></=
employee></para>
-                 </esql:member><!--grouping -->
-               </Department>
-             </esql:group><!-- grouping -->
-           </esql:row-results>
-         </esql:results>
-       </esql:execute-query>
-
-       <hr/>
-
-       <para>
-         This uses nested queries.
-       </para>
-
-       <esql:execute-query>
-         <esql:query>
-           SELECT name, id FROM department ORDER BY name
-         </esql:query>
-         <esql:results>
-           <esql:row-results>
-               <Department>
-                 <xsp:attribute name=3D'name'><esql:get-string column=3D'n=
ame'/></xsp:attribute>
-                 <h2><esql:get-string column=3D'name'/></h2>
-                =20
-                 <esql:execute-query>
-                    <esql:query>
-                       select name from employee=20
-                       where department_id =3D <esql:parameter type=3D"int=
"><esql:get-int column=3D"id" ancestor=3D"1"/></esql:parameter>
-                    </esql:query>
-                 	<esql:results>
-                       <esql:row-results>
-                 	       <para><employee><esql:get-string column=3D'name'/=
></employee></para>
-                 	   </esql:row-results>
-                 	</esql:results>
-                 </esql:execute-query>
-
-               </Department>
-           </esql:row-results>
-         </esql:results>
-       </esql:execute-query>
+    <content>
+      <esql:connection>
+        <esql:pool>personnel</esql:pool>
+
+        <h3>Below you see all of the guys</h3>
+        <ul>
+          <esql:execute-query>
+            <esql:query>select * from employee</esql:query>
+            <esql:results>
+              <esql:row-results>
+                <li><esql:get-string column=3D"name"/></li>
+                <!-- uncomment if you want columns to become tags -->
+                <!-- <esql:get-columns/> -->
+              </esql:row-results>
+            </esql:results>
+          </esql:execute-query>
+        </ul>
+
+        <h3>Below you see just some of the guys</h3>
+        <esql:execute-query>
+          <esql:query>select * from employee</esql:query>
+          <esql:use-limit-clause>jdbc</esql:use-limit-clause>
+          <esql:skip-rows>1</esql:skip-rows>
+          <esql:max-rows>2</esql:max-rows>
+          <esql:results>
+            <ul>
+              <esql:row-results>
+                <li><esql:get-string column=3D"name"/></li>
+              </esql:row-results>
+              <esql:previous-results>
+                <li>We skipped some.</li>
+              </esql:previous-results>
+              <esql:more-results>
+                <li>There are some more.</li>
+              </esql:more-results>
+            </ul>
+            <para>
+              There is a total of <esql:row-count/> employees.
+            </para>
+          </esql:results>
+        </esql:execute-query>
+
+        <h3>
+          Below departments and employees are printed.
+          Without the grouping feature, the result would look like this:
+        </h3>
+
+        <esql:execute-query>
+          <esql:query>
+            SELECT department.name, employee.id, employee.name as empName =
FROM department, employee
+            WHERE department.id =3D employee.department_id  ORDER BY depar=
tment.name
+          </esql:query>
+          <esql:results>
+            <esql:row-results>
+              <Department>
+                <xsp:attribute name=3D'name'><esql:get-string column=3D'na=
me'/></xsp:attribute>
+                <h4><esql:get-string column=3D'name'/></h4>
+                <para><employee><esql:get-string column=3D'empName'/></emp=
loyee></para>
+              </Department>
+            </esql:row-results>
+          </esql:results>
+        </esql:execute-query>
+
+        <h3>
+          This uses the grouping feature in esql.
+        </h3>
+
+        <esql:execute-query>
+          <esql:query>
+            SELECT department.name, employee.id, employee.name as empName =
FROM department, employee
+            WHERE department.id =3D employee.department_id  ORDER BY depar=
tment.name
+          </esql:query>
+          <esql:results>
+            <esql:row-results>
+              <esql:group group-on=3D'name'><!-- grouping -->
+                <Department>
+                  <xsp:attribute name=3D'name'><esql:get-string column=3D'=
name'/></xsp:attribute>
+                  <h4><esql:get-string column=3D'name'/></h4>
+                  <esql:member><!-- grouping -->
+                    <para><employee><esql:get-string column=3D'empName'/><=
/employee></para>
+                  </esql:member><!--grouping -->
+                </Department>
+              </esql:group><!-- grouping -->
+            </esql:row-results>
+          </esql:results>
+        </esql:execute-query>
+
+        <h3>This uses nested queries.</h3>
+        <esql:execute-query>
+          <esql:query>
+            SELECT name, id FROM department ORDER BY name
+          </esql:query>
+          <esql:results>
+            <esql:row-results>
+              <Department>
+                <xsp:attribute name=3D'name'><esql:get-string column=3D'na=
me'/></xsp:attribute>
+                <h4><esql:get-string column=3D'name'/></h4>
+
+                <esql:execute-query>
+                  <esql:query>
+                    select name from employee
+                    where department_id =3D <esql:parameter type=3D"int"><=
esql:get-int column=3D"id" ancestor=3D"1"/></esql:parameter>
+                  </esql:query>
+                  <esql:results>
+                    <esql:row-results>
+                      <para><employee><esql:get-string column=3D'name'/></=
employee></para>
+                    </esql:row-results>
+                  </esql:results>
+                </esql:execute-query>
+
+              </Department>
+            </esql:row-results>
+          </esql:results>
+        </esql:execute-query>
=20
       </esql:connection>
=20
-   </content>
+    </content>
   </page>
 </xsp:page>

Copied: cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/build.xml (from r165=
647, cocoon/branches/BRANCH_2_1_X/src/blocks/databases/build.xml)
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
hsqldb/build.xml?p2=3Dcocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/build.=
xml&p1=3Dcocoon/branches/BRANCH_2_1_X/src/blocks/databases/build.xml&r1=3D1=
65647&r2=3D167951&rev=3D167951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/databases/build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/build.xml Tue May  3 11:=
22:14 2005
@@ -14,12 +14,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default=3D"main" >
=20
-      <target name=3D"main">
+<project default=3D"main" >
+    <target name=3D"main">
         <mkdir dir=3D"${build.webapp.webinf}/db"/>
         <copy file=3D"${block.dir}/conf/cocoondb.script" tofile=3D"${build=
.webapp.webinf}/db/cocoondb.script"/>
         <copy file=3D"${block.dir}/conf/cocoondb.properties" tofile=3D"${b=
uild.webapp.webinf}/db/cocoondb.properties"/>
-      </target>
-     =20
-</project>
\ No newline at end of file
+        <copy file=3D"${block.dir}/conf/schema.sql" tofile=3D"${build.weba=
pp.webinf}/db/schema.sql"/>
+    </target>
+</project>
+

Copied: cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/conf/cocoondb.script=
 (from r165647, cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/samples/WEB-=
INF/db/cocoondb.script)
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
hsqldb/conf/cocoondb.script?p2=3Dcocoon/branches/BRANCH_2_1_X/src/blocks/hs=
qldb/conf/cocoondb.script&p1=3Dcocoon/branches/BRANCH_2_1_X/src/blocks/hsql=
db/samples/WEB-INF/db/cocoondb.script&r1=3D165647&r2=3D167951&rev=3D167951&=
view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/hsqldb/samples/WEB-INF/db/cocoo=
ndb.script (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/conf/cocoondb.script Tue=
 May  3 11:22:14 2005
@@ -12,32 +12,35 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
=20
-CREATE TABLE DEPARTMENT(ID INTEGER NOT NULL,NAME VARCHAR NOT NULL,CONSTRAI=
NT SYS_CT_1 UNIQUE(ID))
-CREATE TABLE EMPLOYEE(ID INTEGER NOT NULL,DEPARTMENT_ID INTEGER NOT NULL,N=
AME VARCHAR NOT NULL,CONSTRAINT SYS_CT_3 UNIQUE(ID))
-CREATE TABLE USER(UID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH =
0)  NOT NULL PRIMARY KEY,NAME VARCHAR,FIRSTNAME VARCHAR,UNAME VARCHAR,CONST=
RAINT SYS_CT_5 UNIQUE(UNAME))
-CREATE TABLE GROUPS(GID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WIT=
H 0)  NOT NULL PRIMARY KEY,GNAME VARCHAR,CONSTRAINT SYS_CT_7 UNIQUE(GNAME))
-CREATE TABLE USER_GROUPS(UID INTEGER,GID INTEGER,CONSTRAINT SYS_CT_9 UNIQU=
E(UID,GID),CONSTRAINT SYS_FK_10 FOREIGN KEY(UID) REFERENCES USER(UID),CONST=
RAINT SYS_FK_11 FOREIGN KEY(GID) REFERENCES GROUPS(GID))
+CREATE TABLE DEPARTMENT(ID INTEGER NOT NULL,NAME VARCHAR NOT NULL,DESCRIPT=
ION VARCHAR NULL,UNIQUE(ID))
+CREATE TABLE EMPLOYEE(ID INTEGER NOT NULL,DEPARTMENT_ID INTEGER NOT NULL,N=
AME VARCHAR NOT NULL,DESCRIPTION VARCHAR NULL,UNIQUE(ID))
+CREATE TABLE USER(UID INTEGER IDENTITY PRIMARY KEY,NAME VARCHAR,FIRSTNAME =
VARCHAR,UNAME VARCHAR,UNIQUE(UNAME))
+CREATE TABLE GROUPS(GID INTEGER IDENTITY PRIMARY KEY,GNAME VARCHAR,UNIQUE(=
GNAME))
+CREATE TABLE USER_GROUPS(UID INTEGER,GID INTEGER,UNIQUE(UID,GID),FOREIGN K=
EY(UID)REFERENCES USER(UID),FOREIGN KEY(GID)REFERENCES GROUPS(GID))
 CREATE TABLE STATE_TAX(CATEGORY VARCHAR NOT NULL,GROSSTAX_COLLECTED DOUBLE=
 NOT NULL,NETTAX_COLLECTED DOUBLE NOT NULL,YEAR INTEGER NOT NULL)
-CREATE TABLE MEDIA(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH =
0)  NOT NULL PRIMARY KEY,IMAGE BINARY,MIMETYPE VARCHAR)
+CREATE TABLE MEDIA(ID INTEGER IDENTITY PRIMARY KEY,IMAGE BINARY,MIMETYPE V=
ARCHAR)
 CREATE TABLE SOURCEPROPS(SOURCE VARCHAR NOT NULL,NAMESPACE VARCHAR NOT NUL=
L,NAME VARCHAR NOT NULL,VALUE VARCHAR NOT NULL,CONSTRAINT SYS_CT_11 UNIQUE(=
SOURCE,NAMESPACE,NAME))
+CREATE TABLE OJB_HL_SEQ(TABLENAME VARCHAR(175) NOT NULL,FIELDNAME VARCHAR(=
70) NOT NULL,MAX_KEY BIGINT,GRAB_SIZE INTEGER,VERSION INTEGER,CONSTRAINT SY=
S_PK_OJB_HL_SEQ PRIMARY KEY(TABLENAME,FIELDNAME))
+CREATE TABLE QUERY(ID BIGINT IDENTITY PRIMARY KEY,USER_ID VARCHAR NOT NULL=
,Q_DATE TIMESTAMP,Q_BOOL VARCHAR,Q_NAME VARCHAR,Q_TYPE VARCHAR,Q_SIZE BIGIN=
T,UNIQUE(ID))
+CREATE TABLE CRITERION(ID BIGINT IDENTITY PRIMARY KEY,Q_ID BIGINT,C_FIELD =
VARCHAR,C_MATCH VARCHAR,C_TERM VARCHAR,CONSTRAINT SYS_FK_20 FOREIGN KEY(Q_I=
D) REFERENCES QUERY(ID),UNIQUE(ID))
 CREATE USER SA PASSWORD "" ADMIN
 SET WRITE_DELAY 60
-INSERT INTO DEPARTMENT VALUES(1,'Development')
-INSERT INTO DEPARTMENT VALUES(2,'Management')
-INSERT INTO DEPARTMENT VALUES(3,'Testers')
-INSERT INTO EMPLOYEE VALUES(1,1,'Donald Ball')
-INSERT INTO EMPLOYEE VALUES(2,1,'Sylvain Wallez')
-INSERT INTO EMPLOYEE VALUES(3,1,'Carsten Ziegeler')
-INSERT INTO EMPLOYEE VALUES(4,1,'Torsten Curdt')
-INSERT INTO EMPLOYEE VALUES(5,1,'Marcus Crafter')
-INSERT INTO EMPLOYEE VALUES(6,1,'Ovidiu Predescu')
-INSERT INTO EMPLOYEE VALUES(7,1,'Christian Haul')
-INSERT INTO EMPLOYEE VALUES(8,2,'Stefano Mazzocchi')
-INSERT INTO EMPLOYEE VALUES(9,3,'Pierpaolo Fumagalli')
-INSERT INTO EMPLOYEE VALUES(10,3,'Davanum Srinivas')
-INSERT INTO EMPLOYEE VALUES(11,3,'Carlos Ch=C3=83=C2=A1vez')
-INSERT INTO EMPLOYEE VALUES(12,3,'Antonio Gallardo')
-INSERT INTO EMPLOYEE VALUES(13,1,'Jeremy Quinn')
+INSERT INTO DEPARTMENT VALUES(1,'Development','<span>Department producing =
software packages, <i>on time</i>, and <i>bug free</i>.</span>')
+INSERT INTO DEPARTMENT VALUES(2,'Management','<span>Department spending al=
l the budget on <i>meetings</i> and <i>donuts</i>.</span>')
+INSERT INTO DEPARTMENT VALUES(3,'Testers','<span>Department capable of fin=
ding issues in <i>bug free</i> software packages.</span>')
+INSERT INTO EMPLOYEE VALUES(1,1,'Donald Ball','')
+INSERT INTO EMPLOYEE VALUES(2,1,'Sylvain Wallez','')
+INSERT INTO EMPLOYEE VALUES(3,1,'Carsten Ziegeler','')
+INSERT INTO EMPLOYEE VALUES(4,1,'Torsten Curdt','')
+INSERT INTO EMPLOYEE VALUES(5,1,'Marcus Crafter','')
+INSERT INTO EMPLOYEE VALUES(6,1,'Ovidiu Predescu','')
+INSERT INTO EMPLOYEE VALUES(7,1,'Christian Haul','')
+INSERT INTO EMPLOYEE VALUES(8,2,'Stefano Mazzocchi','')
+INSERT INTO EMPLOYEE VALUES(9,3,'Pierpaolo Fumagalli','')
+INSERT INTO EMPLOYEE VALUES(10,3,'Davanum Srinivas','')
+INSERT INTO EMPLOYEE VALUES(11,3,'Carlos Ch=C3=83=C2=A1vez','')
+INSERT INTO EMPLOYEE VALUES(12,3,'Antonio Gallardo','')
+INSERT INTO EMPLOYEE VALUES(13,1,'Jeremy Quinn','')
 INSERT INTO STATE_TAX VALUES('State Sales And Use',6.263250997E9,6.2139618=
51E9,2000)
 INSERT INTO STATE_TAX VALUES('Local Sales And Use',1.321129345E9,1.3211293=
45E9,2000)
 INSERT INTO STATE_TAX VALUES('Resort Area Excise',718624.0E0,718624.0E0,20=
00)
@@ -72,3 +75,5 @@
 INSERT INTO STATE_TAX VALUES('Horse Racing',1.7921198E7,1.7321198E7,2001)
 INSERT INTO STATE_TAX VALUES('Severance',7981539.0E0,7967438.0E0,2001)
 INSERT INTO STATE_TAX VALUES('School District Income',1.61257059E8,1.53238=
001E8,2001)
+INSERT INTO QUERY VALUES(1,'anon','1970-01-01 01:00:00.0',NULL,'test','sim=
ple',20)
+INSERT INTO CRITERION VALUES(1,1,'any','any','cocoon')

Copied: cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/conf/schema.sql (fro=
m r165647, cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/samples/WEB-INF/d=
b/tutorial.sql)
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
hsqldb/conf/schema.sql?p2=3Dcocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/=
conf/schema.sql&p1=3Dcocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/samples=
/WEB-INF/db/tutorial.sql&r1=3D165647&r2=3D167951&rev=3D167951&view=3Ddiff
=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/branches/BRANCH_2_1_X/src/blocks/hsqldb/samples/WEB-INF/db/tutor=
ial.sql (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/conf/schema.sql Tue May =
 3 11:22:14 2005
@@ -1,6 +1,4 @@
-#
-
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
=20
-# Tutorial DB
+#
+# Samples Database Schema
 #
=20
 #
@@ -23,16 +22,16 @@
 CREATE TABLE department (
   id number(12) DEFAULT '0' NOT NULL,
   name varchar(64) DEFAULT '' NOT NULL,
+  description varchar(255) DEFAULT '' NULL,
   PRIMARY KEY (id)
 );
=20
 #
 # Data for table 'department'
 #
-
-INSERT INTO department VALUES (1,'Development');
-INSERT INTO department VALUES (2,'Management');
-INSERT INTO department VALUES (3,'Testers');
+INSERT INTO department VALUES (1, 'Development', '<span>Department produci=
ng software packages, <i>on time</i>, and <i>bug free</i>.</span>');
+INSERT INTO department VALUES (2, 'Management', '<span>Department spending=
 all the budget on <i>meetings</i> and <i>donuts</i>.</span>');
+INSERT INTO department VALUES (3, 'Testers', '<span>Department capable of =
finding issues in <i>bug free</i> software packages.</span>');
=20
 #
 # Table structure for table 'employee'
@@ -41,6 +40,7 @@
   id number(12) DEFAULT '0' NOT NULL,
   department_id number(12) DEFAULT '0' NOT NULL,
   name varchar(64) DEFAULT '' NOT NULL,
+  description varchar(255) DEFAULT '' NULL,
   PRIMARY KEY (id)
 );
=20
@@ -56,16 +56,15 @@
 #
 # Data for table 'employee'
 #
-
-INSERT INTO EMPLOYEE VALUES(1,1,'Donald Ball')
-INSERT INTO EMPLOYEE VALUES(2,1,'Sylvain Wallez ')
-INSERT INTO EMPLOYEE VALUES(3,1,'Carsten Ziegeler ')
-INSERT INTO EMPLOYEE VALUES(4,1,'Torsten Curdt')
-INSERT INTO EMPLOYEE VALUES(5,1,'Marcus Crafter')
-INSERT INTO EMPLOYEE VALUES(6,1,'Ovidiu Predescu')
-INSERT INTO EMPLOYEE VALUES(7,1,'Christian Haul')
-INSERT INTO EMPLOYEE VALUES(8,2,'Stefano Mazzocchi')
-INSERT INTO EMPLOYEE VALUES(9,3,'Pierpaolo Fumagalli')
-INSERT INTO EMPLOYEE VALUES(10,3,'Davanum Srinivas')
-INSERT INTO EMPLOYEE VALUES(11,3, 'Carlos Ch=C3=83=C2=A1vez')
-INSERT INTO EMPLOYEE VALUES(12,3, 'Antonio Gallardo')
+INSERT INTO EMPLOYEE VALUES(1,  1, 'Donald Ball')
+INSERT INTO EMPLOYEE VALUES(2,  1, 'Sylvain Wallez ')
+INSERT INTO EMPLOYEE VALUES(3,  1, 'Carsten Ziegeler ')
+INSERT INTO EMPLOYEE VALUES(4,  1, 'Torsten Curdt')
+INSERT INTO EMPLOYEE VALUES(5,  1, 'Marcus Crafter')
+INSERT INTO EMPLOYEE VALUES(6,  1, 'Ovidiu Predescu')
+INSERT INTO EMPLOYEE VALUES(7,  1, 'Christian Haul')
+INSERT INTO EMPLOYEE VALUES(8,  2, 'Stefano Mazzocchi')
+INSERT INTO EMPLOYEE VALUES(9,  3, 'Pierpaolo Fumagalli')
+INSERT INTO EMPLOYEE VALUES(10, 3, 'Davanum Srinivas')
+INSERT INTO EMPLOYEE VALUES(11, 3, 'Carlos Ch=C3=83=C2=A1vez')
+INSERT INTO EMPLOYEE VALUES(12, 3, 'Antonio Gallardo')