Return-Path: 
 <cvs-return-23190-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 80096 invoked from network); 6 May 2005 09:12:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 May 2005 09:12:10 -0000
Received: (qmail 13580 invoked by uid 500); 6 May 2005 09:14:09 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 13478 invoked by uid 500); 6 May 2005 09:14:08 -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 13410 invoked by uid 99); 6 May 2005 09:14:07 -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; Fri, 06 May 2005 02:14:01 -0700
Received: (qmail 79649 invoked by uid 65534); 6 May 2005 09:11:24 -0000
Message-ID: <20050506091124.79648.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r168579 - in
 /cocoon/blocks/unsupported/databases/trunk/samples:
 org-db/add-department.xsp org-db/departments.xsp
 org-db/process-department.xsp samples.xml transform/sql-page3.xml
Date: Fri, 06 May 2005 09:11:23 -0000
To: cvs@cocoon.apache.org
From: cziegeler@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: cziegeler
Date: Fri May  6 02:11:22 2005
New Revision: 168579

URL: http://svn.apache.org/viewcvs?rev=3D168579&view=3Drev
Log:
Add some more samples

Added:
    cocoon/blocks/unsupported/databases/trunk/samples/org-db/departments.xs=
p   (with props)
    cocoon/blocks/unsupported/databases/trunk/samples/transform/sql-page3.x=
ml   (with props)
Modified:
    cocoon/blocks/unsupported/databases/trunk/samples/org-db/add-department=
.xsp
    cocoon/blocks/unsupported/databases/trunk/samples/org-db/process-depart=
ment.xsp
    cocoon/blocks/unsupported/databases/trunk/samples/samples.xml

Modified: cocoon/blocks/unsupported/databases/trunk/samples/org-db/add-depa=
rtment.xsp
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/databases/trun=
k/samples/org-db/add-department.xsp?rev=3D168579&r1=3D168578&r2=3D168579&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/blocks/unsupported/databases/trunk/samples/org-db/add-department=
.xsp (original)
+++ cocoon/blocks/unsupported/databases/trunk/samples/org-db/add-department=
.xsp Fri May  6 02:11:22 2005
@@ -31,6 +31,7 @@
       <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>
+        <para>Description: <textarea name=3D"desc" cols=3D"50" rows=3D"10"=
></textarea></para>
         <input type=3D"submit" value=3D"Add"/>
       </form>
     </content>

Added: cocoon/blocks/unsupported/databases/trunk/samples/org-db/departments=
.xsp
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/databases/trun=
k/samples/org-db/departments.xsp?rev=3D168579&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/blocks/unsupported/databases/trunk/samples/org-db/departments.xs=
p (added)
+++ cocoon/blocks/unsupported/databases/trunk/samples/org-db/departments.xs=
p Fri May  6 02:11:22 2005
@@ -0,0 +1,37 @@
+<?xml version=3D"1.0"?>
+<!--
+  Copyright 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.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<xsp:page language=3D"java"
+          xmlns:xsp=3D"http://apache.org/xsp"
+          xmlns:esql=3D"http://apache.org/cocoon/SQL/v2">
+  <page>
+    <title>Show Departments</title>
+    <content>
+      <esql:connection>
+        <esql:pool>personnel</esql:pool>
+        <esql:execute-query>
+          <esql:query>select id, name, description from department order b=
y name</esql:query>
+          <esql:results>
+            <esql:row-results>
+              <li><esql:get-string column=3D"id"/>. <esql:get-string colum=
n=3D"name"/> : <esql:get-string column=3D"description"/></li>
+            </esql:row-results>
+          </esql:results>
+        </esql:execute-query>
+      </esql:connection>
+    </content>
+  </page>
+</xsp:page>

Propchange: cocoon/blocks/unsupported/databases/trunk/samples/org-db/depart=
ments.xsp
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/blocks/unsupported/databases/trunk/samples/org-db/depart=
ments.xsp
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Modified: cocoon/blocks/unsupported/databases/trunk/samples/org-db/process-=
department.xsp
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/databases/trun=
k/samples/org-db/process-department.xsp?rev=3D168579&r1=3D168578&r2=3D16857=
9&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/blocks/unsupported/databases/trunk/samples/org-db/process-depart=
ment.xsp (original)
+++ cocoon/blocks/unsupported/databases/trunk/samples/org-db/process-depart=
ment.xsp Fri May  6 02:11:22 2005
@@ -23,6 +23,7 @@
   <xsp:logic>
     String process =3D null;
     String name =3D null;
+    String desc =3D null;
     int currId =3D -1;
   </xsp:logic>
=20
@@ -30,6 +31,7 @@
     <xsp:logic>
       process =3D <xsp-request:get-parameter name=3D"process"/>;
       name =3D <xsp-request:get-parameter name=3D"name"/>;
+      desc =3D <xsp-request:get-parameter name=3D"desc"/>;
     </xsp:logic>
=20
     <resources>
@@ -54,9 +56,10 @@
               </xsp:logic>
               <esql:execute-query>
                 <esql:query>
-                  insert into department (id, name) values (
+                  insert into department (id, name, description) values (
                     (<esql:parameter><xsp:expr>currId</xsp:expr></esql:par=
ameter> + 1),
-                    <esql:parameter><xsp:expr>name</xsp:expr></esql:parame=
ter>
+                    <esql:parameter><xsp:expr>name</xsp:expr></esql:parame=
ter>,
+                    <esql:parameter><xsp:expr>desc</xsp:expr></esql:parame=
ter>
                   )
                 </esql:query>
               </esql:execute-query>

Modified: cocoon/blocks/unsupported/databases/trunk/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/databases/trun=
k/samples/samples.xml?rev=3D168579&r1=3D168578&r2=3D168579&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/blocks/unsupported/databases/trunk/samples/samples.xml (original)
+++ cocoon/blocks/unsupported/databases/trunk/samples/samples.xml Fri May  =
6 02:11:22 2005
@@ -40,6 +40,9 @@
      <sample name=3D"Nested Queries" href=3D"transform/sql-page2" xlink:ro=
le=3D"dynamic">
        Example with two queries nested into the third one.
      </sample>
+     <sample name=3D"XML Test" href=3D"transform/sql-page3" xlink:role=3D"=
dynamic">
+       Example with inserting XML into a database.
+     </sample>
   </group>
=20
   <group name=3D"XSP">
@@ -86,6 +89,9 @@
      </sample>
      <sample name=3D"Insert Employees" href=3D"org-db/add-employee" xlink:=
role=3D"dynamic">
        Adds new Employees to the employees table.
+     </sample>
+     <sample name=3D"Show Departments" href=3D"org-db/departments" xlink:r=
ole=3D"dynamic">
+       Show all departments.
      </sample>
   </group>
=20

Added: cocoon/blocks/unsupported/databases/trunk/samples/transform/sql-page=
3=2Exml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/databases/trun=
k/samples/transform/sql-page3.xml?rev=3D168579&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/blocks/unsupported/databases/trunk/samples/transform/sql-page3.x=
ml (added)
+++ cocoon/blocks/unsupported/databases/trunk/samples/transform/sql-page3.x=
ml Fri May  6 02:11:22 2005
@@ -0,0 +1,42 @@
+<?xml version=3D"1.0"?>
+<!--
+  Copyright 1999-2004 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.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<page>
+  <title>Hello</title>
+
+  <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>
+
+  <content>
+    <para>This is my first Cocoon2 page filled with SQL data!</para>
+
+    <sql:execute-query xmlns:sql=3D"http://apache.org/cocoon/SQL/2.0">
+      <sql:query>
+        select max(id) as maxid from department
+      </sql:query>
+      <sql:execute-query>
+        <sql:query>
+         insert into department (id, name, description)=20
+             values(<sql:ancestor-value name=3D"maxid" level=3D"1"/> + 1, =
'XML Test',
+            '<span>An XML Test</span>')
+        </sql:query>
+      </sql:execute-query>
+    </sql:execute-query>
+  </content>
+</page>

Propchange: cocoon/blocks/unsupported/databases/trunk/samples/transform/sql=
-page3.xml
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/blocks/unsupported/databases/trunk/samples/transform/sql=
-page3.xml
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id