cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron QuartzJobSchedulerEntry.java
Date Fri, 05 Sep 2003 07:04:36 GMT
cziegeler    2003/09/05 00:04:36

  Modified:    src/blocks/scratchpad/java/org/apache/cocoon/transformation
                        CastorTransformer.java
               src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained
                        AbstractConstrainedTransformer.java
                        XmlTreeConstraint.java ElementValueEvent.java
                        ElementEventAdapter.java
               src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom
                        DocumentAdapter.java
               src/blocks/scratchpad/java/org/apache/cocoon/generation
                        FlowVelocityGenerator.java
                        RequestAttributeGenerator.java TraxGenerator.java
               src/blocks/eventcache/java/org/apache/cocoon/generation
                        EventCacheGenerator.java
               src/blocks/scratchpad/java/org/apache/cocoon/acting
                        LinkTranslatorMapAction.java
               src/blocks/jsp/java/org/apache/cocoon/generation
                        JspGenerator.java
               src/blocks/scratchpad/java/org/apache/cocoon/samples/castor
                        TestBeanAction.java TestBean.java
               src/blocks/scratchpad/java/org/apache/cocoon/selection
                        DateSelector.java
               src/blocks/cron/java/org/apache/cocoon/components/cron
                        QuartzJobSchedulerEntry.java
  Log:
  Adding correct licence headers, code formatting, code cleanup
  
  Revision  Changes    Path
  1.2       +51 -1     cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/CastorTransformer.java
  
  Index: CastorTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/CastorTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CastorTransformer.java	4 Sep 2003 12:42:43 -0000	1.1
  +++ CastorTransformer.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -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  <stefano@apache.org>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.cocoon.transformation;
   
   import org.apache.avalon.framework.configuration.Configurable;
  
  
  
  1.2       +50 -39    cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java
  
  Index: AbstractConstrainedTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractConstrainedTransformer.java	4 Sep 2003 12:42:43 -0000	1.1
  +++ AbstractConstrainedTransformer.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -1,42 +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  <stefano@apache.org>. For more  information on the Apache
  - *  Software Foundation, please see <http://www.apache.org/>.
  - */
  +
  + ============================================================================
  +                   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  <stefano@apache.org>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.cocoon.transformation.constrained;
   
   import java.io.IOException;
  
  
  
  1.2       +50 -39    cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/XmlTreeConstraint.java
  
  Index: XmlTreeConstraint.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/XmlTreeConstraint.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XmlTreeConstraint.java	4 Sep 2003 12:42:43 -0000	1.1
  +++ XmlTreeConstraint.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -1,42 +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  <stefano@apache.org>. For more  information on the Apache
  - *  Software Foundation, please see <http://www.apache.org/>.
  - */
  +
  + ============================================================================
  +                   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  <stefano@apache.org>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.cocoon.transformation.constrained;
   
   import java.util.Arrays;
  
  
  
  1.2       +1 -2      cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/ElementValueEvent.java
  
  Index: ElementValueEvent.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/ElementValueEvent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ElementValueEvent.java	4 Sep 2003 12:42:43 -0000	1.1
  +++ ElementValueEvent.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -48,7 +48,6 @@
    Software Foundation, please see <http://www.apache.org/>.
   
   */
  -
   package org.apache.cocoon.transformation.constrained;
   
   import org.xml.sax.Attributes;
  
  
  
  1.2       +50 -39    cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/ElementEventAdapter.java
  
  Index: ElementEventAdapter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/ElementEventAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ElementEventAdapter.java	4 Sep 2003 12:42:43 -0000	1.1
  +++ ElementEventAdapter.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -1,42 +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  <stefano@apache.org>. For more  information on the Apache
  - *  Software Foundation, please see <http://www.apache.org/>.
  - */
  +
  + ============================================================================
  +                   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  <stefano@apache.org>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.cocoon.transformation.constrained;
   
   /**
  
  
  
  1.2       +1 -1      cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java
  
  Index: DocumentAdapter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DocumentAdapter.java	4 Sep 2003 12:42:45 -0000	1.1
  +++ DocumentAdapter.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  +/* 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  
  
  
  1.2       +2 -2      cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java
  
  Index: FlowVelocityGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FlowVelocityGenerator.java	4 Sep 2003 12:42:40 -0000	1.1
  +++ FlowVelocityGenerator.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  +/*
   
    ============================================================================
                      The Apache Software License, Version 1.1
  
  
  
  1.2       +4 -27     cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/RequestAttributeGenerator.java
  
  Index: RequestAttributeGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/RequestAttributeGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RequestAttributeGenerator.java	4 Sep 2003 12:42:40 -0000	1.1
  +++ RequestAttributeGenerator.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -86,51 +86,30 @@
    *   default="none"
    */
   public class RequestAttributeGenerator extends ServiceableGenerator {
  -    /**
  -     * The name of this class
  -     *
  -     * @since    1.0
  -     */
  -    public final static String CLASS = RequestAttributeGenerator.class.getName();
   
       /**
        * The config parameter for specifying name of the request attribute,
        * holding the name associated with the xml data, ie <code>attribute-name
        * </code>.
        *
  -     * @since    1.0
        */
       public final static String REQUEST_ATTRIBUTE_NAME = "attribute-name";
       /**
        * The default name of the request attribute name, storing xml-data,
        *  ie. <code>org.apache.cocoon.xml-data</code>.
        *
  -     * @since    1.0
        */
       public final static String REQUEST_ATTRIBUTE_NAME_DEFAULT = "org.apache.cocoon.xml-data";
   
   
       /**
  -     * Recycle this component.
  -     * All instance variables are set to <code>null</code>.
  -     *
  -     * @since    1.0
  -     */
  -    public void recycle() {
  -        super.recycle();
  -    }
  -
  -
  -    /**
        * Generate XML data out of request attribute, and send it into cocoon
        * pipeline.
        *
        * @exception  SAXException         Description of Exception
        * @exception  ProcessingException  Description of Exception
  -     * @since                           1.0
        */
       public void generate() throws SAXException, ProcessingException {
  -        SAXParser parser = null;
           String parameter = parameters.getParameter(REQUEST_ATTRIBUTE_NAME, REQUEST_ATTRIBUTE_NAME_DEFAULT);
           if (getLogger().isDebugEnabled()) {
               getLogger().debug("Expecting xml data in request-attribute " + parameter);
  @@ -147,6 +126,8 @@
               throw new ProcessingException("request-attribute " +
                       parameter + " is null, no xml-data for processing");
           }
  +
  +        SAXParser parser = null;
           try {
               String sXml = new String(xml_data);
               if (getLogger().isDebugEnabled()) {
  @@ -167,9 +148,7 @@
               getLogger().error("Could not get parser", e);
               throw new ProcessingException("Exception in RequestAttributeGenerator.generate()",
e);
           } finally {
  -            if (parser != null) {
  -                this.manager.release((Component)parser);
  -            }
  +            this.manager.release((Component)parser);
           }
       }
   
  @@ -188,7 +167,6 @@
        * @param  contentType  value associated with Content-Type HTTP header.
        * @param  res          Description of Parameter
        * @return              The characterEncoding value
  -     * @since 1.0
        */
       protected String getCharacterEncoding(Response res, String contentType) {
           String charencoding = null;
  @@ -232,7 +210,6 @@
        * @param  contentType  Description of Parameter
        * @param  idx          Description of Parameter
        * @return              Description of the Returned Value
  -     * @since 1.0
        */
       protected String extractCharset(String contentType, int idx) {
           String charencoding = null;
  
  
  
  1.2       +3 -3      cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/TraxGenerator.java
  
  Index: TraxGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/TraxGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TraxGenerator.java	4 Sep 2003 12:42:40 -0000	1.1
  +++ TraxGenerator.java	5 Sep 2003 07:04:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  +/*
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -167,11 +167,11 @@
       }
   
       public void setConsumer(XMLConsumer consumer) {
  -        xmlConsumer = consumer;
  +        this.xmlConsumer = consumer;
       }
   
       public void recycle() {
           super.recycle();
  -        doc = null;
  +        this.doc = null;
       }
   }
  
  
  
  1.2       +2 -2      cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/generation/EventCacheGenerator.java
  
  Index: EventCacheGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/generation/EventCacheGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EventCacheGenerator.java	28 Jul 2003 00:06:00 -0000	1.1
  +++ EventCacheGenerator.java	5 Sep 2003 07:04:35 -0000	1.2
  @@ -55,7 +55,6 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentSelector;
  @@ -116,7 +115,7 @@
    * @author Unico Hommes
    */
   public class EventCacheGenerator extends ComposerGenerator 
  -implements Configurable, Generator, CacheableProcessingComponent, Recyclable {
  +implements Configurable, CacheableProcessingComponent {
   
   
       // ---------------------------------------------------- constants
  @@ -229,6 +228,7 @@
           m_delegate = null;
           m_key = null;
           m_event = null;
  +        super.recycle();
       }
   
       
  
  
  
  1.2       +50 -54    cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java
  
  Index: LinkTranslatorMapAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LinkTranslatorMapAction.java	4 Sep 2003 12:42:42 -0000	1.1
  +++ LinkTranslatorMapAction.java	5 Sep 2003 07:04:35 -0000	1.2
  @@ -1,57 +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
  - *  <http://www.apache.org/>.
  - */
  +
  + ============================================================================
  +                   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  <stefano@apache.org>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.cocoon.acting;
   
   import java.util.HashMap;
  
  
  
  1.7       +2 -9      cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java
  
  Index: JspGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JspGenerator.java	4 Aug 2003 09:44:23 -0000	1.6
  +++ JspGenerator.java	5 Sep 2003 07:04:35 -0000	1.7
  @@ -51,9 +51,6 @@
   package org.apache.cocoon.generation;
   
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.jsp.JSPEngine;
   import org.apache.cocoon.environment.ObjectModelHelper;
  @@ -77,11 +74,7 @@
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @version CVS $Id$
    */
  -public class JspGenerator extends ServletGenerator implements Configurable {
  -
  -    public void configure(Configuration conf) throws ConfigurationException
  -    {
  -    }
  +public class JspGenerator extends ServletGenerator {
   
       /**
        * Generate XML data from JSP.
  
  
  
  1.2       +51 -1     cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/samples/castor/TestBeanAction.java
  
  Index: TestBeanAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/samples/castor/TestBeanAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestBeanAction.java	4 Sep 2003 12:42:44 -0000	1.1
  +++ TestBeanAction.java	5 Sep 2003 07:04:35 -0000	1.2
  @@ -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  <stefano@apache.org>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.cocoon.samples.castor;
   
   import org.apache.avalon.framework.parameters.Parameters;
  
  
  
  1.2       +51 -1     cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/samples/castor/TestBean.java
  
  Index: TestBean.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/samples/castor/TestBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestBean.java	4 Sep 2003 12:42:44 -0000	1.1
  +++ TestBean.java	5 Sep 2003 07:04:35 -0000	1.2
  @@ -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  <stefano@apache.org>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.cocoon.samples.castor;
   
   /**
  
  
  
  1.2       +2 -2      cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java
  
  Index: DateSelector.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DateSelector.java	4 Sep 2003 12:42:44 -0000	1.1
  +++ DateSelector.java	5 Sep 2003 07:04:35 -0000	1.2
  @@ -47,7 +47,7 @@
    Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache
    Software Foundation, please see <http://www.apache.org/>.
    
  - */
  +*/
   package org.apache.cocoon.selection;
   
   import java.text.SimpleDateFormat;
  
  
  
  1.2       +1 -2      cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobSchedulerEntry.java
  
  Index: QuartzJobSchedulerEntry.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobSchedulerEntry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- QuartzJobSchedulerEntry.java	4 Sep 2003 15:56:51 -0000	1.1
  +++ QuartzJobSchedulerEntry.java	5 Sep 2003 07:04:36 -0000	1.2
  @@ -52,7 +52,6 @@
   
   import org.quartz.JobDataMap;
   import org.quartz.JobDetail;
  -import org.quartz.JobExecutionContext;
   import org.quartz.Scheduler;
   import org.quartz.SchedulerException;
   import org.quartz.Trigger;
  
  
  

Mime
View raw message