Author: ugo Date: Mon Jan 24 07:47:03 2005 New Revision: 126295 URL: http://svn.apache.org/viewcvs?view=rev&rev=126295 Log: Removing XSP from CForms Added: cocoon/trunk/src/blocks/forms/samples/forms/carselector_success_jx.xml cocoon/trunk/src/blocks/forms/samples/forms/countryselector_success_jx.xml cocoon/trunk/src/blocks/forms/samples/forms/form1_success_jx.xml cocoon/trunk/src/blocks/forms/samples/forms/form_model_gui_success_jx.xml cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_success_jx.xml (contents, props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/model_success_jx.xml (contents, props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_success_jx.xml (contents, props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/template_success_jx.xml (contents, props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_success_jx.xml (contents, props changed) Removed: cocoon/trunk/src/blocks/forms/samples/forms/carselector_success.xsp cocoon/trunk/src/blocks/forms/samples/forms/countryselector_success.xsp cocoon/trunk/src/blocks/forms/samples/forms/form1_success.xsp cocoon/trunk/src/blocks/forms/samples/forms/form_model_gui_success.xsp cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_success.xsp cocoon/trunk/src/blocks/forms/samples/swan/forms/model_success.xsp cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_success.xsp cocoon/trunk/src/blocks/forms/samples/swan/forms/template_success.xsp cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_success.xsp Modified: cocoon/trunk/src/blocks/forms/WEB-INF/xconf/cocoon-forms.xconf cocoon/trunk/src/blocks/forms/samples/sitemap.xmap cocoon/trunk/src/blocks/forms/samples/swan/data/sitemap.xmap cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml (props changed) cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap
Modified: cocoon/trunk/src/blocks/forms/WEB-INF/xconf/cocoon-forms.xconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/WEB-INF/xconf/cocoon-forms.xconf?view=diff&rev=126295&p1=cocoon/trunk/src/blocks/forms/WEB-INF/xconf/cocoon-forms.xconf&r1=126294&p2=cocoon/trunk/src/blocks/forms/WEB-INF/xconf/cocoon-forms.xconf&r2=126295 ============================================================================== --- cocoon/trunk/src/blocks/forms/WEB-INF/xconf/cocoon-forms.xconf (original) +++ cocoon/trunk/src/blocks/forms/WEB-INF/xconf/cocoon-forms.xconf Mon Jan 24 07:47:03 2005 @@ -21,7 +21,7 @@ +--> <components> <!-- Include dependencies --> - <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/> + <include src="context://WEB-INF/xconf/cocoon-profiler.xconf"/> <!-- Include roles --> <include src="resource://org/apache/cocoon/forms/forms.roles"/> @@ -191,4 +191,4 @@ <transformer name="forms" logger="forms" src="org.apache.cocoon.forms.transformation.FormsTemplateTransformer"/> </transformers> -</components> \ No newline at end of file +</components> Deleted: /cocoon/trunk/src/blocks/forms/samples/forms/carselector_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/carselector_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/forms/carselector_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/carselector_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/forms/carselector_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,29 @@ +<?xml version="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. +--> + +<!-- + CVS $Id$ +--> + +<page> + <title>Car selector result</title> + <content> + You selected: maker ${request.getAttribute("carselectorform").lookupWidget("make").getValue()}, + type ${request.getAttribute("carselectorform").lookupWidget("type").getValue()}, + model ${request.getAttribute("carselectorform").lookupWidget("model").getValue()} + </content> +</page> Deleted: /cocoon/trunk/src/blocks/forms/samples/forms/countryselector_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/countryselector_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/forms/countryselector_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/countryselector_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/forms/countryselector_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,28 @@ +<?xml version="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. +--> + +<!-- + CVS $Id$ +--> + +<page> + <title>Country selector result</title> + <content> + You selected: ${request.getAttribute("countryselectorform").lookupWidget("us-nonus").getValue()} + country/state ${request.getAttribute("countryselectorform").lookupWidget("country").getValue()} + </content> +</page> Deleted: /cocoon/trunk/src/blocks/forms/samples/forms/form1_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/form1_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/forms/form1_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/form1_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/forms/form1_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,43 @@ +<?xml version="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. +--> + +<!-- + CVS $Id$ +--> + +<page> + <title>Sample form result</title> + <content> + <!-- + <xsp:logic> + // get reference to form and some of the widgets on it + Form form = (Form)request.getAttribute("form1"); + Field field = (Field)form.lookupWidget("email"); + BooleanField booleanField = (BooleanField)form.lookupWidget("somebool"); + Field field2 = (Field)((Repeater)form.lookupWidget("contacts")).getWidget(1, "firstname"); + </xsp:logic> + --> + email has the following value: + ${request.getAttribute("form1").lookupWidget("email").getValue()} + <br/> + Second person has this firstname: + ${request.getAttribute("form1").lookupWidget("contacts").getWidget(1, "firstname").getValue()} + <br/> + The value of the checkbox is: + ${request.getAttribute("form1").lookupWidget("somebool").getValue()} + </content> +</page> \ No newline at end of file Deleted: /cocoon/trunk/src/blocks/forms/samples/forms/form_model_gui_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/form_model_gui_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/forms/form_model_gui_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/forms/form_model_gui_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/forms/form_model_gui_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,27 @@ +<?xml version="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. +--> + +<!-- + CVS $Id: form_model_gui_success.xsp,v 1.3 2004/05/07 20:54:21 mpo Exp $ +--> + +<page> + <title>Sample form result</title> + <content> + Repeater has ${request.getAttribute("form_model_gui").lookupWidget("widgets").getSize()} row(s). + </content> +</page> Modified: cocoon/trunk/src/blocks/forms/samples/sitemap.xmap Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/sitemap.xmap?view=diff&rev=126295&p1=cocoon/trunk/src/blocks/forms/samples/sitemap.xmap&r1=126294&p2=cocoon/trunk/src/blocks/forms/samples/sitemap.xmap&r2=126295 ============================================================================== --- cocoon/trunk/src/blocks/forms/samples/sitemap.xmap (original) +++ cocoon/trunk/src/blocks/forms/samples/sitemap.xmap Mon Jan 24 07:47:03 2005 @@ -114,9 +114,9 @@ <!-- the content of this action is only executed in case validation succeeded, thus if the form handling is completed --> - <map:generate type="serverpages" src="forms/form1_success.xsp"/> + <map:generate type="jx" src="forms/form1_success_jx.xml"/> <map:call resource="simple-page2html"> - <map:parameter name="file" value="forms/form1_success.xsp"/> + <map:parameter name="file" value="forms/form1_success_jx.xml"/> </map:call> <map:serialize/> </map:act> @@ -196,9 +196,9 @@ | Display a success page using XSP --> <map:match pattern="*-success-pipeline.xsp"> - <map:generate type="serverpages" src="forms/{1}_success.xsp"/> + <map:generate type="jx" src="forms/{1}_success_jx.xml"/> <map:call resource="simple-page2html"> - <map:parameter name="file" value="forms/{1}_template.xsp"/> + <map:parameter name="file" value="forms/{1}_template_jx.xml"/> </map:call> <map:serialize/> </map:match> Modified: cocoon/trunk/src/blocks/forms/samples/swan/data/sitemap.xmap Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/data/sitemap.xmap?view=diff&rev=126295&p1=cocoon/trunk/src/blocks/forms/samples/swan/data/sitemap.xmap&r1=126294&p2=cocoon/trunk/src/blocks/forms/samples/swan/data/sitemap.xmap&r2=126295 ============================================================================== --- cocoon/trunk/src/blocks/forms/samples/swan/data/sitemap.xmap (original) +++ cocoon/trunk/src/blocks/forms/samples/swan/data/sitemap.xmap Mon Jan 24 07:47:03 2005 @@ -95,14 +95,6 @@ <map:serialize/> </map:match> - <map:match pattern="*-success-pipeline.xsp"> - <map:generate type="serverpages" src="forms/{1}_success.xsp"/> - <map:call resource="simple-page2html"> - <map:parameter name="file" value="forms/{1}_template.xsp"/> - </map:call> - <map:serialize/> - </map:match> - <map:match pattern="*-success-pipeline.jx"> <map:generate type="jx" src="forms/{1}_success_jx.xml"/> <map:call resource="simple-page2html"> Modified: cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js?view=diff&rev=126295&p1=cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js&r1=126294&p2=cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js&r2=126295 ============================================================================== --- cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js (original) +++ cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js Mon Jan 24 07:47:03 2005 @@ -94,7 +94,7 @@ // also store the form as a request attribute as the XSP isn't flow-aware cocoon.request.setAttribute("form_" + type + "_gui", form.getWidget()); - cocoon.sendPage(type + "-success-pipeline.xsp"); + cocoon.sendPage(type + "-success-pipeline.jx"); } function present(string, list) { Deleted: /cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,27 @@ +<?xml version="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. +--> + +<!-- + CVS $Id$ +--> + +<page> + <title>Sample form result</title> + <content> + Repeater has ${request.getAttribute("form_binding_gui").lookupWidget("items").getSize()} row(s). + </content> +</page> Deleted: /cocoon/trunk/src/blocks/forms/samples/swan/forms/model_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/model_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/swan/forms/model_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/model_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/swan/forms/model_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,27 @@ +<?xml version="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. +--> + + <!-- + CVS $Id$ + --> + +<page> + <title>Sample form result</title> + <content> + Repeater has ${request.getAttribute("form_model_gui").lookupWidget("items").getSize()} row(s). + </content> +</page> Deleted: /cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,27 @@ +<?xml version="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. +--> + +<!-- + CVS $Id$ +--> + +<page> + <title>Sample form result</title> + <content> + Repeater has ${request.getAttribute("form_sitemap_gui").lookupWidget("items").getSize()} row(s). + </content> +</page> Deleted: /cocoon/trunk/src/blocks/forms/samples/swan/forms/template_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/template_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/swan/forms/template_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/template_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/swan/forms/template_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,27 @@ +<?xml version="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. +--> + +<!-- + CVS $Id$ +--> + +<page> + <title>Sample form result</title> + <content> + Repeater has ${request.getAttribute("form_template_gui").lookupWidget("items").getSize()} row(s). + </content> +</page> Deleted: /cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_success.xsp Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_success.xsp?view=auto&rev=126294 ============================================================================== Added: cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_success_jx.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_success_jx.xml?view=auto&rev=126295 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_success_jx.xml Mon Jan 24 07:47:03 2005 @@ -0,0 +1,27 @@ +<?xml version="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. +--> + +<!-- + CVS $Id$ +--> + +<page> + <title>Sample form result</title> + <content> + Repeater has ${request.getAttribute("form_xreport_gui").lookupWidget("items").getSize()} row(s). + </content> +</page> Modified: cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap?view=diff&rev=126295&p1=cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap&r1=126294&p2=cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap&r2=126295 ============================================================================== --- cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap (original) +++ cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap Mon Jan 24 07:47:03 2005 @@ -125,14 +125,6 @@ <map:serialize/> </map:match> - <map:match pattern="*-success-pipeline.xsp"> - <map:generate type="serverpages" src="forms/{1}_success.xsp"/> - <map:call resource="simple-page2html"> - <map:parameter name="file" value="forms/{1}_template.xsp"/> - </map:call> - <map:serialize/> - </map:match> - <map:match pattern="*-success-pipeline.jx"> <map:generate type="jx" src="forms/{1}_success_jx.xml"/> <map:call resource="simple-page2html">
