Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 3355 invoked from network); 15 Jun 2005 16:36:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Jun 2005 16:36:25 -0000 Received: (qmail 18786 invoked by uid 500); 15 Jun 2005 16:36:24 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 18751 invoked by uid 500); 15 Jun 2005 16:36:24 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 18734 invoked by uid 99); 15 Jun 2005 16:36:24 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 15 Jun 2005 09:36:16 -0700 Received: (qmail 75342 invoked by uid 65534); 15 Jun 2005 11:04:41 -0000 Message-ID: <20050615110441.75341.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r190730 - in /cocoon/branches/BRANCH_2_1_X: ./ src/blocks/forms/samples/ src/blocks/forms/samples/sqldatabase/ Date: Wed, 15 Jun 2005 11:04:39 -0000 To: cvs@cocoon.apache.org From: bdelacretaz@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: bdelacretaz Date: Wed Jun 15 04:04:37 2005 New Revision: 190730 URL: http://svn.apache.org/viewcvs?rev=3D190730&view=3Drev Log: Patch 35364 applied, example of 'zero java code' editing of SQL data using = the SQLTransformer. Thanks to Askild Aaberg Olsen Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/dbdem= o=2Ejs cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/docum= ent.jx cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yee-sql.xml cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yees-sql.xml cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yeexml2html.xslt cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yeexml2sql.xslt cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= binding.xml cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= definition.xml cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= template.xml cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/sitem= ap.xmap cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/sqlxm= l2employeexml.xslt Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml cocoon/branches/BRANCH_2_1_X/status.xml Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/db= demo.js URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/dbdemo.js?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/dbdem= o=2Ejs (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/dbdem= o=2Ejs Wed Jun 15 04:04:37 2005 @@ -0,0 +1,52 @@ +/* + * 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. + */ +cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js"); + +function employee_edit() { + + var employeeId =3D cocoon.parameters["employeeId"]; + var nextPage =3D cocoon.parameters["nextPage"]; + + var pu =3D null; + + try { + pu =3D cocoon.createObject(Packages.org.apache.cocoon.components.f= low.util.PipelineUtil); + + // load document for form data, via a pipeline to use the SQLTrans= former + var document =3D pu.processToDOM("employees/" + employeeId + ".xml= ", null); + + // create form, bind to document and load document into it + var form =3D new Form("form-definition.xml"); + form.createBinding("form-binding.xml"); + form.load(document); + + // display and edit form + form.showForm("edit-employee-form"); + + // save modified data to document object + // TODO if would be good to do this only if the data has changed + form.save(document); + + // run pipeline to let SQLTransformer update data based on documen= t object + var unusedOutput =3D new Packages.java.io.ByteArrayOutputStream(); + cocoon.processPipelineTo("save-employee",{"document": document},un= usedOutput); + + } finally { + if(pu!=3Dnull) cocoon.disposeObject(pu); + } + + cocoon.redirectTo(nextPage,true); +} Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/do= cument.jx URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/document.jx?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/docum= ent.jx (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/docum= ent.jx Wed Jun 15 04:04:37 2005 @@ -0,0 +1,17 @@ + + +#{docu= ment/*} Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/em= ployee-sql.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/employee-sql.xml?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yee-sql.xml (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yee-sql.xml Wed Jun 15 04:04:37 2005 @@ -0,0 +1,19 @@ + + + + SELECT id, name FROM employee WHERE id =3D <= sql:substitute-value sql:name=3D"id"/> + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/em= ployees-sql.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/employees-sql.xml?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yees-sql.xml (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yees-sql.xml Wed Jun 15 04:04:37 2005 @@ -0,0 +1,19 @@ + + + + SELECT id, name FROM employee ORDER BY name= + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/em= ployeexml2html.xslt URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/employeexml2html.xslt?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yeexml2html.xslt (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yeexml2html.xslt Wed Jun 15 04:04:37 2005 @@ -0,0 +1,67 @@ + + + + + + + + CForms / SQLTransformer sample + + + + +

CForms / SQLTransformer sample

+

+ This sample demonstrates a way of editing SQL data via CForms wi= thout having to write Java code. +

+

+ The database used is the "personnel" demo database, running on t= he embedded + HSQL database provided by the "databases" block. +

+

+ Study the sitemap (in the sqldatabase subdirectory of the CForms= samples) to see how the SQLTransformer is + used to load data for the CForms binding, and to update data bas= ed on the document updated by CForms. +

+

+ Only editing of existing data is implemented for now, complete C= RUD functionality can + be implemented in the same way. +

+

+ If you look at the form definitions and SQLTransformer parameter= s , you'll see that most + or all of it could be generated from a data dictionary or a data= base schema. This would + of course be a welcome enhancement... +

+ +

List of employees in database

+

+ Click one to edit, or use the XML links to view raw data: +

+ + + + + + + XML +   + + + +
+ + + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/em= ployeexml2sql.xslt URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/employeexml2sql.xslt?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yeexml2sql.xslt (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/emplo= yeexml2sql.xslt Wed Jun 15 04:04:37 2005 @@ -0,0 +1,30 @@ + + + + + + + + UPDATE employee SET name=3D' + + ' WHERE id =3D + + + + + + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/fo= rm-binding.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/form-binding.xml?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= binding.xml (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= binding.xml Wed Jun 15 04:04:37 2005 @@ -0,0 +1,20 @@ + + + + + + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/fo= rm-definition.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/form-definition.xml?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= definition.xml (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= definition.xml Wed Jun 15 04:04:37 2005 @@ -0,0 +1,34 @@ + + + + + + + ID: + + + + + Name: + + + + + + + + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/fo= rm-template.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/form-template.xml?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= template.xml (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-= template.xml Wed Jun 15 04:04:37 2005 @@ -0,0 +1,35 @@ + + + + + CForms / SQLTransformer sample + + + +

Edit employee info

+ + + +
+ + +
+ + +

(Yes, there's not much to edit- what do you expect from a sample?)<= /p> + + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/si= temap.xmap URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/sitemap.xmap?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/sitem= ap.xmap (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/sitem= ap.xmap Wed Jun 15 04:04:37 2005 @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/sq= lxml2employeexml.xslt URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/sqldatabase/sqlxml2employeexml.xslt?rev=3D190730&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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/sqlxm= l2employeexml.xslt (added) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/sqlxm= l2employeexml.xslt Wed Jun 15 04:04:37 2005 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/= forms/samples/welcome.xml?rev=3D190730&r1=3D190729&r2=3D190730&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/forms/samples/welcome.xml (orig= inal) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml Wed J= un 15 04:04:37 2005 @@ -73,6 +73,13 @@ --> =20 + + + SQL database editing without any custom Java code, using the SQLTrans= former to load + and update data. + + + The samples below are the same as the basic flowscript sample but now = use different locales. Modified: cocoon/branches/BRANCH_2_1_X/status.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?= rev=3D190730&r1=3D190729&r2=3D190730&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/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Jun 15 04:04:37 2005 @@ -196,7 +196,11 @@ =20 - + + Forms block: sqldatabase sample added, demonstrates "zero java code= " editing of SQL data + using the SQLTransformer. + + CForms block: Ensure FormHandler is always called when a field's val= ue change.