stephan 2004/03/11 09:12:15
Modified:
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples
BindingWoodyApple.java
src/blocks/apples/samples sitemap.xmap welcome.xml
Log:
woody -> cforms
Revision Changes Path
1.9 +2 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BindingWoodyApple.java 9 Mar 2004 10:21:28 -0000 1.8
+++ BindingWoodyApple.java 11 Mar 2004 17:12:13 -0000 1.9
@@ -41,6 +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.xml.dom.DOMStreamer;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.Source;
@@ -194,7 +195,7 @@
if (this.wrapperContextMap == null) {
if (this.form != null) {
this.wrapperContextMap = new HashMap();
- this.wrapperContextMap.put("woody-form", this.form);
+ this.wrapperContextMap.put(FormPipelineConfig.COCOONFORM,
this.form);
}
}
return this.wrapperContextMap;
1.8 +10 -14 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sitemap.xmap 11 Mar 2004 16:25:46 -0000 1.7
+++ sitemap.xmap 11 Mar 2004 17:12:14 -0000 1.8
@@ -24,15 +24,11 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:components>
- <map:generators default="file">
- <map:generator name="woody"
src="org.apache.cocoon.woody.generation.WoodyGenerator" logger="woody"/>
- </map:generators>
<map:transformers default="xalan">
- <map:transformer name="woody"
src="org.apache.cocoon.woody.transformation.WoodyTemplateTransformer"
logger="woody"/>
<map:transformer name="i18n"
src="org.apache.cocoon.transformation.I18nTransformer">
- <catalogues default="other">
- <catalogue id="other" name="OtherMessages"
location="context://samples/woody/messages"/>
- <catalogue id="woody" name="WoodyMessages"
location="context://samples/woody/messages"/>
+ <catalogues default="forms">
+ <catalogue id="other" name="OtherMessages" location="messages"/>
+ <catalogue id="forms" name="FormMessages" location="messages"/>
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
@@ -91,16 +87,16 @@
<!--+
- | Binding form sample, reuses pipelines stolen from woody
+ | Binding form sample, reuses pipelines stolen from Cocoon Forms
+-->
<map:match pattern="form2xml.flow">
<map:call
function="org.apache.cocoon.components.flow.apples.samples.BindingWoodyApple">
- <map:parameter name="form-src"
value="context://samples/woody/forms/form2_model.xml"/>
- <map:parameter name="binding-src"
value="context://samples/woody/forms/form2_bind_xml.xml"/>
- <map:parameter name="documentURI"
value="context://samples/woody/forms/form2_data.xml"/>
- <map:parameter name="form-pipe"
value="/samples/woody/form2-display-pipeline"/>
- <map:parameter name="valid-pipe"
value="/samples/woody/form2-success-pipeline"/>
+ <map:parameter name="form-src"
value="context://samples/forms/forms/form2_model.xml"/>
+ <map:parameter name="binding-src"
value="context://samples/forms/forms/form2_bind_xml.xml"/>
+ <map:parameter name="documentURI"
value="context://samples/forms/forms/form2_data.xml"/>
+ <map:parameter name="form-pipe"
value="/samples/forms/form2-display-pipeline"/>
+ <map:parameter name="valid-pipe"
value="/samples/forms/form2-success-pipeline"/>
</map:call>
</map:match>
1.4 +4 -4 cocoon-2.1/src/blocks/apples/samples/welcome.xml
Index: welcome.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/welcome.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- welcome.xml 6 Mar 2004 02:26:12 -0000 1.3
+++ welcome.xml 11 Mar 2004 17:12:14 -0000 1.4
@@ -29,10 +29,10 @@
</group>
<group name="Apples Samples">
- <sample name="Woody XML Binding." href="form2xml.flow">An Apple
controlling a form for just editing an XML file.</sample>
- <sample name="Calculation." href="calc.flow">Simplistic
calculator implementation.</sample>
- <sample name="Number Guessing." href="guess.flow">Number Guessing
game.</sample>
- <sample name="Tower of Hanoi puzzle." href="hanoi.flow">The popular mind
puzzle.</sample>
+ <sample name="Cocoon Forms XML Binding." href="form2xml.flow">An Apple
controlling a form for just editing an XML file.</sample>
+ <sample name="Calculation." href="calc.flow">Simplistic
calculator implementation.</sample>
+ <sample name="Number Guessing." href="guess.flow">Number Guessing
game.</sample>
+ <sample name="Tower of Hanoi puzzle." href="hanoi.flow">The popular
mind puzzle.</sample>
</group>
</samples>
