diff --git a/src/blocks/swf/java/org/apache/cocoon/generation/SWFGenerator.java b/src/blocks/swf/java/org/apache/cocoon/generation/SWFGenerator.java index 02a33564a3c..d470b738d90 100644 --- a/src/blocks/swf/java/org/apache/cocoon/generation/SWFGenerator.java +++ b/src/blocks/swf/java/org/apache/cocoon/generation/SWFGenerator.java @@ -55,9 +55,6 @@ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- import de.tivano.flash.swf.parser.SWFVerboseDefineFont2Reader; import de.tivano.flash.swf.parser.SWFVerboseDefineFontReader; -import org.apache.avalon.framework.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.SourceResolver; @@ -72,21 +69,15 @@ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- * uses the project http://developer.berlios.de/projects/spark-xml/ * * @author Torsten Curdt - * @version CVS $Id: SWFGenerator.java,v 1.2 2003/03/16 17:49:07 vgritsenko Exp $ + * @version CVS $Id: SWFGenerator.java,v 1.3 2003/09/05 07:40:20 cziegeler Exp $ */ -public class SWFGenerator extends FileGenerator implements Configurable { +public class SWFGenerator extends FileGenerator { + private boolean pVerbose = false; private SWFReader parser; - public void configure(Configuration configuration) throws ConfigurationException { - pVerbose = false; - } - - - public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par) - throws ProcessingException, SAXException, IOException - { + throws ProcessingException, SAXException, IOException { super.setup(resolver, objectModel, src, par); parser = new SWFReader(); if (pVerbose) { @@ -96,8 +87,7 @@ public void setup(SourceResolver resolver, Map objectModel, String src, Paramete } public void generate() - throws IOException, SAXException, ProcessingException - { + throws IOException, SAXException, ProcessingException { try { if (this.getLogger().isDebugEnabled()) { @@ -128,12 +118,4 @@ public void generate() } } - public void recycle() { - super.recycle(); - } - - public void dispose() { - super.dispose(); - } - } diff --git a/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java b/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java index b91ae203efb..6b09468b661 100644 --- a/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java +++ b/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java @@ -53,10 +53,6 @@ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- import java.io.OutputStream; -import org.apache.avalon.framework.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; - import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -66,17 +62,14 @@ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- * uses the project http://developer.berlios.de/projects/spark-xml/ * * @author Torsten Curdt - * @version CVS $Id: SWFSerializer.java,v 1.2 2003/03/16 17:49:08 vgritsenko Exp $ + * @version CVS $Id: SWFSerializer.java,v 1.3 2003/09/05 07:40:20 cziegeler Exp $ */ -public class SWFSerializer extends AbstractSerializer implements Configurable { +public class SWFSerializer extends AbstractSerializer { + private final static String mimeType = "application/x-shockwave-flash"; private SWFWriter handler; - public void configure(Configuration configuration) throws ConfigurationException { - getLogger().debug("configured the SWF serializer"); - } - public String getMimeType() { return(mimeType); } diff --git a/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java b/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java index 3e88b4ef4e4..15c925d4a94 100644 --- a/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java +++ b/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java @@ -1,4 +1,4 @@ -/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* ============================================================================ The Apache Software License, Version 1.1 @@ -174,7 +174,7 @@ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- * element. The prefix '<name>.resource.loader.' is * automatically added to the property name. * - * @version CVS $Id: VelocityGenerator.java,v 1.8 2003/09/04 09:38:33 cziegeler Exp $ + * @version CVS $Id: VelocityGenerator.java,v 1.9 2003/09/05 07:40:21 cziegeler Exp $ */ public class VelocityGenerator extends ServiceableGenerator implements Initializable, Configurable, LogSystem { diff --git a/src/blocks/web3/java/org/apache/cocoon/transformation/Web3RfcTransformer.java b/src/blocks/web3/java/org/apache/cocoon/transformation/Web3RfcTransformer.java index 2c6c8dec8f9..fd554c680ae 100644 --- a/src/blocks/web3/java/org/apache/cocoon/transformation/Web3RfcTransformer.java +++ b/src/blocks/web3/java/org/apache/cocoon/transformation/Web3RfcTransformer.java @@ -84,7 +84,7 @@ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- * * @author Michael Gerzabek * @since 2.1 - * @version CVS $Id: Web3RfcTransformer.java,v 1.6 2003/07/10 22:14:33 reinhard Exp $ + * @version CVS $Id: Web3RfcTransformer.java,v 1.7 2003/09/05 07:40:20 cziegeler Exp $ */ public class Web3RfcTransformer extends AbstractTransformer implements Composable, Disposable, Configurable, Poolable, Recyclable { @@ -149,15 +149,15 @@ public void recycle() { this.streamer = null; this.error = false; this.startcount = 0; + super.recycle(); } /** Free all ressources */ public void dispose() { - this.recycle(); - this.manager = null; - this.attributes = null; - this.web3source = null; - this.tags = null; + this.manager = null; + this.attributes = null; + this.web3source = null; + this.tags = null; } /** diff --git a/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java b/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java index a5da19f3849..5514515f457 100644 --- a/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java +++ b/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java @@ -1,58 +1,53 @@ /* - * The Apache Software License, Version 1.1 - * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache Cocoon" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - */ + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be + used to endorse or promote products derived from this software without + prior written permission. For written permission, please contact + apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation and was originally created by + Stefano Mazzocchi . For more information on the Apache + Software Foundation, please see . + +*/ package org.apache.cocoon.acting; import org.apache.avalon.framework.configuration.Configuration; @@ -127,7 +122,7 @@ * @author Christian Zoffoli * @author Martin Man * @since 2002/02/03 - * @version CVS $Id: DbXMLAuthenticatorAction.java,v 1.3 2003/03/24 14:33:54 stefano Exp $ + * @version CVS $Id: DbXMLAuthenticatorAction.java,v 1.4 2003/09/05 07:40:21 cziegeler Exp $ * * based on DatabaseAuthenticatorAction created by Martin Man */ diff --git a/src/blocks/xmldb/java/org/apache/cocoon/transformation/XMLDBTransformer.java b/src/blocks/xmldb/java/org/apache/cocoon/transformation/XMLDBTransformer.java index cb3196d474b..399bcfede59 100644 --- a/src/blocks/xmldb/java/org/apache/cocoon/transformation/XMLDBTransformer.java +++ b/src/blocks/xmldb/java/org/apache/cocoon/transformation/XMLDBTransformer.java @@ -156,10 +156,10 @@ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- * * * @author Vadim Gritsenko - * @version CVS $Id: XMLDBTransformer.java,v 1.4 2003/08/07 13:34:46 joerg Exp $ + * @version CVS $Id: XMLDBTransformer.java,v 1.5 2003/09/05 07:40:21 cziegeler Exp $ */ public class XMLDBTransformer extends AbstractTransformer - implements Disposable, CacheableProcessingComponent, Configurable, Initializable { + implements CacheableProcessingComponent, Configurable, Initializable { private static String XMLDB_URI = "http://apache.org/cocoon/xmldb/1.0"; private static String XMLDB_QUERY_ELEMENT = "query"; @@ -635,11 +635,7 @@ public void recycle() { getLogger().error("Failed to close collection " + base + ". Error " + e.errorCode, e); } collection = null; + super.recycle(); } - /** - * dispose - */ - public void dispose() { - } } diff --git a/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UsageFeedbackAction.java b/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UsageFeedbackAction.java index 65ae6ba893f..6022ef26df0 100644 --- a/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UsageFeedbackAction.java +++ b/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UsageFeedbackAction.java @@ -1,64 +1,53 @@ /* - * $Revision: 1.1 $ - * $Date: 2003/04/25 08:34:57 $ - * - * ==================================================================== - * The Apache Software License, Version 1.1 - * - * - * - * Copyright (c) 1999-2001 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Commons", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, Plotnix, Inc, - * . - * For more information on the Apache Software Foundation, please see - * . - */ + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be + used to endorse or promote products derived from this software without + prior written permission. For written permission, please contact + apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation and was originally created by + Stefano Mazzocchi . For more information on the Apache + Software Foundation, please see . + +*/ package org.apache.cocoon.samples.xmlform; import java.util.Map; @@ -68,7 +57,7 @@ * This action implements a REST web service * * @author Ivelin Ivanov - * @version CVS $Id: UsageFeedbackAction.java,v 1.1 2003/04/25 08:34:57 stephan Exp $ + * @version CVS $Id: UsageFeedbackAction.java,v 1.2 2003/09/05 07:40:21 cziegeler Exp $ */ public class UsageFeedbackAction extends AbstractXMLFormAction diff --git a/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UserBean.java b/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UserBean.java index a023dda6322..36525dd904d 100644 --- a/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UserBean.java +++ b/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UserBean.java @@ -1,3 +1,53 @@ +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be + used to endorse or promote products derived from this software without + prior written permission. For written permission, please contact + apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation and was originally created by + Stefano Mazzocchi . For more information on the Apache + Software Foundation, please see . + +*/ package org.apache.cocoon.samples.xmlform; import org.apache.avalon.framework.CascadingRuntimeException; @@ -19,7 +69,7 @@ * DOM Nodes, which are handled correctly by the * framework when referenced via XPath. * - * @version CVS $Id: UserBean.java,v 1.1 2003/04/25 08:34:57 stephan Exp $ + * @version CVS $Id: UserBean.java,v 1.2 2003/09/05 07:40:21 cziegeler Exp $ */ public class UserBean { diff --git a/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/WizardAction.java b/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/WizardAction.java index d06ea3cf9e2..bba3f130df3 100644 --- a/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/WizardAction.java +++ b/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/WizardAction.java @@ -1,64 +1,53 @@ -/* - * $Revision: 1.1 $ - * $Date: 2003/04/25 08:34:57 $ - * - * ==================================================================== - * The Apache Software License, Version 1.1 - * - * - * - * Copyright (c) 1999-2001 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Commons", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, Plotnix, Inc, - * . - * For more information on the Apache Software Foundation, please see - * . - */ +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be + used to endorse or promote products derived from this software without + prior written permission. For written permission, please contact + apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation and was originally created by + Stefano Mazzocchi . For more information on the Apache + Software Foundation, please see . + +*/ package org.apache.cocoon.samples.xmlform; import org.apache.cocoon.acting.AbstractXMLFormAction; @@ -72,7 +61,7 @@ * a relatively complex form handling scenario. * * @author Ivelin Ivanov - * @version CVS $Id: WizardAction.java,v 1.1 2003/04/25 08:34:57 stephan Exp $ + * @version CVS $Id: WizardAction.java,v 1.2 2003/09/05 07:40:21 cziegeler Exp $ */ public class WizardAction extends AbstractXMLFormAction