mpo 2003/09/25 14:18:49
Modified: src/blocks/apples/samples sitemap.xmap
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples
BindingWoodyApple.java
Log:
Removing the references to the (old) FormHandler.
Same feature is now handled by event-handlers defined on the
level of the woody-definitions itself.
Revision Changes Path
1.5 +1 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 7 Sep 2003 06:11:39 -0000 1.4
+++ sitemap.xmap 25 Sep 2003 21:18:49 -0000 1.5
@@ -89,7 +89,6 @@
<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="formhandler"
value="org.apache.cocoon.woody.samples.Form1Handler"/>
<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"/>
1.5 +0 -7
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BindingWoodyApple.java 24 Sep 2003 22:21:07 -0000 1.4
+++ BindingWoodyApple.java 25 Sep 2003 21:18:49 -0000 1.5
@@ -67,7 +67,6 @@
import org.apache.cocoon.components.flow.apples.AppleRequest;
import org.apache.cocoon.components.flow.apples.AppleResponse;
import org.apache.cocoon.woody.FormContext;
-import org.apache.cocoon.woody.FormHandler;
import org.apache.cocoon.woody.FormManager;
import org.apache.cocoon.woody.binding.Binding;
import org.apache.cocoon.woody.binding.BindingManager;
@@ -128,7 +127,6 @@
String formURI = req.getSitemapParameter("form-src");
String bindURI = req.getSitemapParameter("binding-src");
this.backendURI = req.getSitemapParameter("documentURI");
- String formHandlerClassName = req.getSitemapParameter("formhandler");
this.formPipeURI = req.getSitemapParameter("form-pipe");
this.validPipeURI = req.getSitemapParameter("valid-pipe");
@@ -138,7 +136,6 @@
Source formSource = null;
Source bindSource = null;
Source documentSource = null;
- FormHandler formHandler = null;
try {
formManager = (FormManager)
this.serviceManager.lookup(FormManager.ROLE);
@@ -147,10 +144,6 @@
formSource = resolver.resolveURI(formURI);
this.form = formManager.createForm(formSource);
- formHandler = (FormHandler)
this.makeInstance(formHandlerClassName);
- // FIX THIS
- // formHandler.setup(this.form);
- this.form.setFormHandler(formHandler);
bindSource = resolver.resolveURI(bindURI);
this.binding = binderManager.createBinding(bindSource);
