Return-Path: 
 <cvs-return-23286-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 94206 invoked from network); 18 May 2005 23:08:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 May 2005 23:08:50 -0000
Received: (qmail 84650 invoked by uid 500); 18 May 2005 21:39:36 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 84421 invoked by uid 500); 18 May 2005 21:39: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>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 84399 invoked by uid 99); 18 May 2005 21:39:30 -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, 18 May 2005 14:39:28 -0700
Received: (qmail 49025 invoked by uid 65534); 18 May 2005 21:39:23 -0000
Message-ID: <20050518213923.49024.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r170831 - in
 /cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples:
 forms/form1_template_action.xml forms/form1_template_action_jx-macro.xml
 sitemap.xmap welcome.xml
Date: Wed, 18 May 2005 21:39:22 -0000
To: cvs@cocoon.apache.org
From: reinhard@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: reinhard
Date: Wed May 18 14:39:20 2005
New Revision: 170831

URL: http://svn.apache.org/viewcvs?rev=3D170831&view=3Drev
Log:
sync profiling samples; because of a jxTemplate bug jx-macros don't work in=
 non-Flowscript scenarios

Added:
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_templ=
ate_action_jx-macro.xml
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_templ=
ate_action.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sitemap.xmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1=
_template_action.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
forms/samples/forms/form1_template_action.xml?rev=3D170831&r1=3D170830&r2=
=3D170831&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/forms/form1_templ=
ate_action.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_templ=
ate_action.xml Wed May 18 14:39:20 2005
@@ -16,7 +16,10 @@
 -->
 <!-- The only difference between this file and the form1_template_flow.xml
      is the value of the action attribute on the ft:form-template element =
-->
-<page xmlns:ft=3D"http://apache.org/cocoon/forms/1.0#template" xmlns:fi=3D=
"http://apache.org/cocoon/forms/1.0#instance">
+<page xmlns:ft=3D"http://apache.org/cocoon/forms/1.0#template"=20
+      xmlns:fi=3D"http://apache.org/cocoon/forms/1.0#instance"
+      xmlns:jx=3D"http://apache.org/cocoon/templates/jx/1.0">
+     =20
   <title>Sample form</title>
   <content>
     <ft:form-template action=3D"form1" method=3D"POST">

Added: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_te=
mplate_action_jx-macro.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
forms/samples/forms/form1_template_action_jx-macro.xml?rev=3D170831&view=3D=
auto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/forms/form1_templ=
ate_action_jx-macro.xml (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_templ=
ate_action_jx-macro.xml Wed May 18 14:39:20 2005
@@ -0,0 +1,138 @@
+<?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.
+-->
+<!-- The only difference between this file and the form1_template_flow.xml
+     is the value of the action attribute on the ft:form-template element =
-->
+<page xmlns:ft=3D"http://apache.org/cocoon/forms/1.0#template"=20
+      xmlns:fi=3D"http://apache.org/cocoon/forms/1.0#instance"
+      xmlns:jx=3D"http://apache.org/cocoon/templates/jx/1.0">
+ =20
+  <!-- Import the macros that define CForms template elements -->
+  <jx:import uri=3D"resource://org/apache/cocoon/forms/generation/jx-macro=
s=2Exml"/>
+  =09
+  <title>Sample form</title>
+  <content>
+    <ft:form-template action=3D"form1" method=3D"POST">
+      <div style=3D"width: 90%; margin: 10px 50px 50px 50px;">
+
+        <!-- group with tabs. Each of the children of <items> will constit=
ute a tab -->
+        <fi:group>
+          <fi:styling type=3D"tabs"/>
+          <fi:label>Choose a panel: </fi:label>
+          <fi:state>
+            <ft:widget id=3D"tab-state"/>
+          </fi:state>
+
+          <fi:items>
+            <!-- group with automatic two-column layout -->
+            <fi:group>
+              <fi:label>String fields</fi:label>
+              <fi:styling layout=3D"columns"/>
+              <fi:items>
+                <ft:widget id=3D"email"/>
+                <ft:widget id=3D"fourchars">
+                  <!-- particular styling for the enumeration -->
+                  <fi:styling list-type=3D"listbox" listbox-size=3D"4"/>
+                </ft:widget>
+              </fi:items>
+            </fi:group>
+
+            <fi:group>
+              <fi:label>Number fields</fi:label>
+              <fi:styling layout=3D"columns"/>
+              <fi:items>
+                <ft:widget id=3D"number1">
+                  <fi:styling submit-on-change=3D"true"/>
+                </ft:widget>
+                <ft:widget id=3D"number2"/>
+                <ft:widget id=3D"account"/>
+                <ft:widget id=3D"cowheight">
+                  <fi:styling list-type=3D"radio"/>
+                </ft:widget>
+              </fi:items>
+            </fi:group>
+
+            <fi:group>
+              <fi:styling layout=3D"columns"/>
+              <fi:label>Boolean fields</fi:label>
+              <fi:items>
+                <ft:widget id=3D"somebool"/>
+                <ft:widget id=3D"drinks">
+                  <fi:styling list-type=3D"double-listbox">
+                    <fi:available-label>Available drinks</fi:available-lab=
el>
+                    <fi:selected-label>Your selection</fi:selected-label>
+                  </fi:styling>
+                </ft:widget>
+              </fi:items>
+            </fi:group>
+          </fi:items>
+        </fi:group>
+
+        <p>Checkout the <a href=3D"form1.flow">form1 flow page</a> for ano=
ther way of formatting panels</p>
+
+        <!-- Group of type 'fieldset' will have a surrounding frame -->
+        <fi:group>
+          <fi:styling type=3D"fieldset" layout=3D"columns"/>
+          <fi:label>Misc controls</fi:label>
+          <fi:items>
+            <ft:widget id=3D"visa"/>
+            <ft:widget id=3D"ipaddress"/>
+            <ft:widget id=3D"altbirthdate"/>
+            <ft:widget id=3D"altbirthdate2"/>
+            <ft:widget id=3D"birthdate"/>
+            <ft:widget id=3D"dieselprice"/>
+          </fi:items>
+        </fi:group>
+
+        <!-- manual layout of fields, without use of a fi:group -->
+        <ft:widget-label id=3D"contacts"/><br/>
+        <ft:repeater-size id=3D"contacts"/>
+        <table border=3D"1">
+          <tr>
+            <th><ft:repeater-widget-label id=3D"contacts" widget-id=3D"fir=
stname"/></th>
+            <th><ft:repeater-widget-label id=3D"contacts" widget-id=3D"las=
tname"/></th>
+            <th><ft:repeater-widget-label id=3D"contacts" widget-id=3D"pho=
ne"/></th>
+            <th><ft:repeater-widget-label id=3D"contacts" widget-id=3D"ema=
il"/></th>
+            <th><ft:repeater-widget-label id=3D"contacts" widget-id=3D"bir=
thdate"/></th>
+            <th><ft:repeater-widget-label id=3D"contacts" widget-id=3D"sel=
ect"/></th>
+          </tr>
+          <!-- The contents of the repeater-widget element is a template t=
hat will
+               be applied to each row in the repeater. -->
+          <ft:repeater-widget id=3D"contacts">
+            <tr>
+              <td><ft:widget id=3D"firstname"/></td>
+              <td><ft:widget id=3D"lastname"/></td>
+              <td><ft:widget id=3D"phone"/></td>
+              <td><ft:widget id=3D"email"/></td>
+              <td>
+                <ft:widget id=3D"birthdate"/>
+              </td>
+              <td><ft:widget id=3D"select"/></td>
+            </tr>
+          </ft:repeater-widget>
+          <tr>
+            <td colspan=3D"4" align=3D"right">
+              <ft:widget id=3D"addcontact"/>
+              <ft:widget id=3D"removecontacts"/>
+            </td>
+          </tr>
+        </table>
+        <input type=3D"submit"/>
+      </div>
+    </ft:form-template>
+  </content>
+</page>
+

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
forms/samples/sitemap.xmap?rev=3D170831&r1=3D170830&r2=3D170831&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/sitemap.xmap (ori=
ginal)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sitemap.xmap Wed =
May 18 14:39:20 2005
@@ -493,6 +493,31 @@
        </map:call>
        <map:serialize />
      </map:match>
+    =20
+     <!-- **************************** profiling *************************=
*** -->
+     <map:match pattern=3D"form1-cforms-transformer">
+       <map:act type=3D"init-form">
+         <map:parameter name=3D"form-definition" value=3D"forms/form1.xml"=
/>
+         <map:parameter name=3D"attribute-name" value=3D"form1"/>
+       </map:act>      =20
+       <map:generate src=3D"forms/form1_template_action.xml"/>
+       <map:transform type=3D"forms" label=3D"content1">
+         <map:parameter name=3D"attribute-name" value=3D"form1"/>
+       </map:transform>
+       <map:serialize type=3D"xml"/>
+     </map:match> =20
+     <map:match pattern=3D"form1-jx-macro">
+       <map:act type=3D"init-form">
+         <map:parameter name=3D"form-definition" value=3D"forms/form1.xml"=
/>
+         <map:parameter name=3D"attribute-name" value=3D"form1"/>
+       </map:act>      =20
+       <map:generate src=3D"forms/form1_template_action_jx-macro.xml" type=
=3D"jx">
+         <map:parameter name=3D"attribute-name" value=3D"form1"/>       =09
+       </map:generate>
+       <map:serialize type=3D"xml"/>
+     </map:match>    =20
+    =20
+     <!-- **************************** mounts ****************************=
 -->    =20
=20
     <map:match pattern=3D"*">
         <map:redirect-to uri=3D"{1}/"/>

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=3D170831&r1=3D170830&r2=3D170831&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 M=
ay 18 14:39:20 2005
@@ -107,6 +107,15 @@
     </sample>
  </group>
 =20
+  <group name=3D"Profiling information">
+    <note>
+      These samples concentrate on Cocoon Forms and JXTemplate in order to=
 collect profiling information.
+      In order to keep the samples as lean as possible, an action is used =
as controller.
+    </note>
+    <sample name=3D"form1 - JXTemplate" href=3D"form1-jx-macro">Render for=
m using JXTemplate macros</sample>
+    <sample name=3D"form1 - FormsTransformer" href=3D"form1-cforms-transfo=
rmer">Render form using the FormsTransformer</sample>   =20
+  </group> =20
+=20
  <group name=3D"Experimental Flowscript API for Cocoon Forms">
   <note>
     The sample below demonstrates a proposal for a new Flowscript API, inc=
luding a multipage form with a back button.