You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/03/18 22:04:41 UTC
cvs commit: cocoon-2.1/src/blocks/apples/samples sitemap.xmap
joerg 2004/03/18 13:04:41
Modified: src/blocks/forms/java/org/apache/cocoon/forms/transformation
WidgetReplacingPipe.java
EffectWidgetReplacingPipe.java
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples
BindingWoodyApple.java
src/blocks/forms/java/org/apache/cocoon/forms/acting
HandleFormSubmitAction.java
src/blocks/forms/samples/v2 sitemap.xmap
src/blocks/forms/samples sitemap.xmap
src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript
Form.js
src/blocks/forms/java/org/apache/cocoon/forms/samples
InitForm1Action.java
src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2
Form.js
src/blocks/forms/conf forms-transformator.xmap
forms-generator.xmap
src/blocks/petstore/samples sitemap.xmap
src/blocks/forms/samples/aggregate sitemap.xmap
src/blocks/forms/java/org/apache/cocoon/forms Constants.java
tools/targets upgrade-build.xml
src/blocks/apples/samples sitemap.xmap
Added: src/blocks/forms/java/org/apache/cocoon/forms/transformation
FormsTemplateTransformer.java
FormsPipelineConfig.java
src/blocks/forms/samples/messages FormsMessages_fr.xml
FormsMessages.xml FormsMessages_it_IT.xml
src/blocks/forms/java/org/apache/cocoon/forms/acting
AbstractFormsAction.java
src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript
FormsFlowHelper.java
src/blocks/forms/java/org/apache/cocoon/forms/generation
FormsGenerator.java
Removed: src/blocks/forms/java/org/apache/cocoon/forms/transformation
FormPipelineConfig.java
FormTemplateTransformer.java
src/blocks/forms/samples/messages FormMessages_fr.xml
FormMessages.xml FormMessages_it_IT.xml
src/blocks/forms/java/org/apache/cocoon/forms/acting
AbstractFormAction.java
src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript
FormFlowHelper.java
src/blocks/forms/java/org/apache/cocoon/forms/generation
FormGenerator.java
Log:
reverting the renaming from forms to form - sorry for any confusion
Revision Changes Path
1.5 +3 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java
Index: WidgetReplacingPipe.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WidgetReplacingPipe.java 11 Mar 2004 02:56:32 -0000 1.4
+++ WidgetReplacingPipe.java 18 Mar 2004 21:04:39 -0000 1.5
@@ -92,7 +92,7 @@
protected boolean repeaterWidget;
protected WidgetReplacingPipe.InsertStylingContentHandler stylingHandler = new WidgetReplacingPipe.InsertStylingContentHandler();
- protected FormPipelineConfig pipeContext;
+ protected FormsPipelineConfig pipeContext;
/**
* Have we encountered a <wi:style> element in a widget ?
@@ -105,7 +105,7 @@
protected String namespacePrefix;
- public void init(Widget newContextWidget, FormPipelineConfig newPipeContext) {
+ public void init(Widget newContextWidget, FormsPipelineConfig newPipeContext) {
contextWidget = newContextWidget;
inWidgetElement = false;
elementNestingCounter = 0;
1.7 +4 -4 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
Index: EffectWidgetReplacingPipe.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EffectWidgetReplacingPipe.java 15 Mar 2004 21:33:20 -0000 1.6
+++ EffectWidgetReplacingPipe.java 18 Mar 2004 21:04:39 -0000 1.7
@@ -66,7 +66,7 @@
* Form location attribute on <code>ft:form-template</code> element, containing
* JXPath expression which should result in Form object.
*
- * @see FormPipelineConfig#findForm
+ * @see FormsPipelineConfig#findForm
*/
private static final String LOCATION = "location";
@@ -114,7 +114,7 @@
*/
private final Map templates = new HashMap(12, 1);
- protected FormPipelineConfig pipeContext;
+ protected FormsPipelineConfig pipeContext;
/**
* Have we encountered a <wi:style> element in a widget ?
@@ -147,7 +147,7 @@
throw new SAXException("EffectFormTemplateTransformer: " + message);
}
- public void init(Widget contextWidget, FormPipelineConfig pipeContext) {
+ public void init(Widget contextWidget, FormsPipelineConfig pipeContext) {
super.init();
this.pipeContext = pipeContext;
1.3 +1 -1 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsTemplateTransformer.java
1.3 +12 -14 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
1.3 +1 -1 cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages_fr.xml
1.3 +1 -1 cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages.xml
1.3 +1 -1 cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages_it_IT.xml
1.10 +2 -2 cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
Index: BindingWoodyApple.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BindingWoodyApple.java 11 Mar 2004 17:12:13 -0000 1.9
+++ BindingWoodyApple.java 18 Mar 2004 21:04:39 -0000 1.10
@@ -41,7 +41,7 @@
import org.apache.cocoon.forms.binding.Binding;
import org.apache.cocoon.forms.binding.BindingManager;
import org.apache.cocoon.forms.formmodel.Form;
-import org.apache.cocoon.forms.transformation.FormPipelineConfig;
+import org.apache.cocoon.forms.transformation.FormsPipelineConfig;
import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.Source;
@@ -195,7 +195,7 @@
if (this.wrapperContextMap == null) {
if (this.form != null) {
this.wrapperContextMap = new HashMap();
- this.wrapperContextMap.put(FormPipelineConfig.COCOONFORM, this.form);
+ this.wrapperContextMap.put(FormsPipelineConfig.CFORMSKEY, this.form);
}
}
return this.wrapperContextMap;
1.3 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java
Index: HandleFormSubmitAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandleFormSubmitAction.java 11 Mar 2004 02:56:33 -0000 1.2
+++ HandleFormSubmitAction.java 18 Mar 2004 21:04:39 -0000 1.3
@@ -47,7 +47,7 @@
*
* @version $Id$
*/
-public class HandleFormSubmitAction extends AbstractFormAction implements Action, ThreadSafe {
+public class HandleFormSubmitAction extends AbstractFormsAction implements Action, ThreadSafe {
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String src, Parameters parameters)
throws Exception {
1.3 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/acting/AbstractFormsAction.java
1.6 +2 -2 cocoon-2.1/src/blocks/forms/samples/v2/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/v2/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 13 Mar 2004 03:30:07 -0000 1.5
+++ sitemap.xmap 18 Mar 2004 21:04:40 -0000 1.6
@@ -20,7 +20,7 @@
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
<catalogue id="other" name="OtherMessages" location="../messages"/>
- <catalogue id="form" name="FormMessages" location="../messages"/>
+ <catalogue id="forms" name="FormsMessages" location="../messages"/>
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
@@ -73,7 +73,7 @@
<map:match pattern="*-display-pipeline">
<!-- pipeline to show the form -->
<map:generate type="jx" src="{1}_template.xml"/>
- <map:transform type="form"/>
+ <map:transform type="forms"/>
<map:transform type="i18n">
<map:parameter name="locale" value="en-US"/>
</map:transform>
1.6 +5 -5 cocoon-2.1/src/blocks/forms/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 13 Mar 2004 03:30:07 -0000 1.5
+++ sitemap.xmap 18 Mar 2004 21:04:40 -0000 1.6
@@ -23,7 +23,7 @@
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
<catalogue id="other" name="OtherMessages" location="messages"/>
- <catalogue id="form" name="FormMessages" location="messages"/>
+ <catalogue id="forms" name="FormsMessages" location="messages"/>
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
@@ -125,7 +125,7 @@
<!-- pipeline to show the form -->
<map:generate src="forms/form1_template_action.xml"/>
- <map:transform type="form">
+ <map:transform type="forms">
<map:parameter name="attribute-name" value="form1"/>
</map:transform>
<map:transform type="i18n">
@@ -157,7 +157,7 @@
<map:match pattern="*-display-pipeline">
<!-- pipeline to show the form -->
<map:generate src="forms/{1}_template.xml"/>
- <map:transform type="form"/>
+ <map:transform type="forms"/>
<map:transform type="i18n">
<map:parameter name="locale" value="en-US"/>
</map:transform>
@@ -325,7 +325,7 @@
<map:match pattern="htmlarea-display-pipeline">
<map:generate src="forms/htmlarea_template.xml"/>
- <map:transform type="form"/>
+ <map:transform type="forms"/>
<map:transform type="i18n">
<map:parameter name="locale" value="en-US"/>
</map:transform>
@@ -388,7 +388,7 @@
</map:match>
<map:match pattern="binding.form">
- <map:generate type="form">
+ <map:generate type="forms">
<map:parameter name="form-action" value="#\{$continuation/id}.continue" />
</map:generate>
<!--TODO: fix xsl for use with FormGenerator -->
1.4 +4 -4 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js
Index: Form.js
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Form.js 18 Mar 2004 14:03:43 -0000 1.3
+++ Form.js 18 Mar 2004 21:04:40 -0000 1.4
@@ -82,12 +82,12 @@
*
* @parameter uri the page uri (like in cocoon.sendPageAndWait())
* @parameter bizdata some business data for the view (like in cocoon.sendPageAndWait()).
- * The "CocoonForm" and "locale" properties are added to this object.
+ * The "{FormsPipelineConfig.CFORMSKEY}" and "locale" properties are added to this object.
*/
Form.prototype.showForm = function(uri, bizData) {
if (bizData == undefined) bizData = new Object();
- bizData[Packages.org.apache.cocoon.forms.transformation.FormPipelineConfig.COCOONFORM] = this.form;
+ bizData[Packages.org.apache.cocoon.forms.transformation.FormsPipelineConfig.CFORMSKEY] = this.form;
if (this.locale == null)
this.locale = java.util.Locale.getDefault();
@@ -104,7 +104,7 @@
if (result == null) result = k;
var formContext =
- Packages.org.apache.cocoon.forms.flow.javascript.FormFlowHelper.getFormContext(cocoon, this.locale);
+ Packages.org.apache.cocoon.forms.flow.javascript.FormsFlowHelper.getFormContext(cocoon, this.locale);
// Prematurely add the bizData as a request attribute so that event listeners can use it
// (the same is done by cocoon.sendPage())
1.3 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/FormsFlowHelper.java
1.3 +3 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/samples/InitForm1Action.java
Index: InitForm1Action.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/samples/InitForm1Action.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InitForm1Action.java 11 Mar 2004 02:56:32 -0000 1.2
+++ InitForm1Action.java 18 Mar 2004 21:04:40 -0000 1.3
@@ -19,7 +19,7 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.forms.acting.AbstractFormAction;
+import org.apache.cocoon.forms.acting.AbstractFormsAction;
import org.apache.cocoon.forms.formmodel.Field;
import org.apache.cocoon.forms.formmodel.Form;
import org.apache.cocoon.forms.formmodel.Repeater;
@@ -36,7 +36,7 @@
*
* @version $Id$
*/
-public class InitForm1Action extends AbstractFormAction {
+public class InitForm1Action extends AbstractFormsAction {
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String source, Parameters parameters)
throws Exception {
String formSource = parameters.getParameter("form-definition");
1.4 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/Form.js
Index: Form.js
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/Form.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Form.js 18 Mar 2004 13:59:20 -0000 1.3
+++ Form.js 18 Mar 2004 21:04:40 -0000 1.4
@@ -103,8 +103,8 @@
var FormContext = Packages.org.apache.cocoon.forms.FormContext;
// this is needed by the FormTemplateTransformer:
var javaWidget = this.formWidget_.unwrap();;
- this.formWidget_["CocoonForm"] = javaWidget;
- cocoon.request.setAttribute("CocoonForm", javaWidget);
+ this.formWidget_["CocoonFormsInstance"] = javaWidget;
+ cocoon.request.setAttribute(Packages.org.apache.cocoon.forms.transformation.CFORMSKEY, javaWidget);
var wk = cocoon.sendPageAndWait(uri, this.formWidget_, fun, ttl);
var formContext =
new FormContext(cocoon.request, javaWidget.getLocale());
1.2 +3 -3 cocoon-2.1/src/blocks/forms/conf/forms-transformator.xmap
Index: forms-transformator.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/conf/forms-transformator.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forms-transformator.xmap 11 Mar 2004 11:23:36 -0000 1.1
+++ forms-transformator.xmap 18 Mar 2004 21:04:40 -0000 1.2
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xmap xpath="/sitemap/components/transformers" unless="transformer[@name='form']">
- <map:transformer name="form" logger="forms"
- src="org.apache.cocoon.forms.transformation.FormTemplateTransformer"/>
+<xmap xpath="/sitemap/components/transformers" unless="transformer[@name='forms']">
+ <map:transformer name="forms" logger="forms"
+ src="org.apache.cocoon.forms.transformation.FormsTemplateTransformer"/>
</xmap>
1.2 +3 -3 cocoon-2.1/src/blocks/forms/conf/forms-generator.xmap
Index: forms-generator.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/conf/forms-generator.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forms-generator.xmap 11 Mar 2004 11:23:36 -0000 1.1
+++ forms-generator.xmap 18 Mar 2004 21:04:40 -0000 1.2
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xmap xpath="/sitemap/components/generators" unless="generator[@name='form']">
- <map:generator name="form" logger="forms"
- src="org.apache.cocoon.forms.generation.FormGenerator"/>
+<xmap xpath="/sitemap/components/generators" unless="generator[@name='forms']">
+ <map:generator name="forms" logger="forms"
+ src="org.apache.cocoon.forms.generation.FormsGenerator"/>
</xmap>
1.5 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/generation/FormsGenerator.java
1.12 +1 -1 cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.11
+++ sitemap.xmap 18 Mar 2004 21:04:41 -0000 1.12
@@ -81,7 +81,7 @@
</map:match>
<map:match pattern="view/*.cforms">
<map:generate src="view/forms/{1}_t.xml" label="debug"/>
- <map:transform type="form" label="debug1"/>
+ <map:transform type="forms" label="debug1"/>
<map:call resource="html"/>
</map:match>
</map:pipeline>
1.3 +2 -2 cocoon-2.1/src/blocks/forms/samples/aggregate/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/aggregate/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 11 Mar 2004 02:56:33 -0000 1.2
+++ sitemap.xmap 18 Mar 2004 21:04:41 -0000 1.3
@@ -63,7 +63,7 @@
<map:match pattern="*-display-pipeline">
<!-- pipeline to show the form -->
<map:generate type="jx" src="template-{1}.xml"/>
- <map:transform type="form"/>
+ <map:transform type="forms"/>
<map:call resource="simple-page2html">
<map:parameter name="file" value="{1}_template.xml"/>
</map:call>
1.6 +3 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/Constants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Constants.java 13 Mar 2004 03:25:26 -0000 1.5
+++ Constants.java 18 Mar 2004 21:04:41 -0000 1.6
@@ -16,7 +16,7 @@
package org.apache.cocoon.forms;
/**
- * Various constants used in the form framework.
+ * Various constants used in the Cocoon Forms framework.
*
* @version $Id$
*/
@@ -48,6 +48,6 @@
public static final String DEFINITION_PREFIX_COLON = "fd:";
/** I18n catalogue containing the built-in messages. */
- public static final String I18N_CATALOGUE = "form";
+ public static final String I18N_CATALOGUE = "forms";
}
1.8 +4 -7 cocoon-2.1/tools/targets/upgrade-build.xml
Index: upgrade-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/upgrade-build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- upgrade-build.xml 17 Mar 2004 20:39:42 -0000 1.7
+++ upgrade-build.xml 18 Mar 2004 21:04:41 -0000 1.8
@@ -141,9 +141,9 @@
<include name="**/*.xmap"/>
<!--+
| - Woody(Generator|TemplateTransformer|Messages)
- | -> Form(Generator|TemplateTransformer|Messages)
+ | -> Forms(Generator|TemplateTransformer|Messages)
+-->
- <replacefilter token="Woody" value="Form"/>
+ <replacefilter token="Woody" value="Forms"/>
<!--+
| - stylesheet names
+-->
@@ -156,14 +156,11 @@
<replacefilter token="woody-" value=""/>
<!--+
| - package name: o.a.c.woody.* -> o.a.c.forms.*
- +-->
- <replacefilter token=".woody." value=".forms."/>
- <!--+
- | - hints for FormTemplateTransformer and FormGenerator
+ | - hints for FormsTemplateTransformer and FormsGenerator
| - logger
| - i18n catalogue
+-->
- <replacefilter token="woody" value="form"/>
+ <replacefilter token="woody" value="forms"/>
</replace>
<!-- updating flowscripts -->
1.9 +2 -2 cocoon-2.1/src/blocks/apples/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/sitemap.xmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sitemap.xmap 11 Mar 2004 17:12:14 -0000 1.8
+++ sitemap.xmap 18 Mar 2004 21:04:41 -0000 1.9
@@ -28,7 +28,7 @@
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="forms">
<catalogue id="other" name="OtherMessages" location="messages"/>
- <catalogue id="forms" name="FormMessages" location="messages"/>
+ <catalogue id="forms" name="FormsMessages" location="messages"/>
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>