You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2001/10/11 10:52:04 UTC

cvs commit: xml-cocoon2/src/org/apache/cocoon/acting AbstractAction.java AbstractComplementaryConfigurableAction.java AbstractConfigurableAction.java AbstractDatabaseAction.java AbstractValidatorAction.java Action.java ComposerAction.java ConfigurableComposerAction.java DatabaseAddAction.java DatabaseAuthenticatorAction.java DatabaseDeleteAction.java DatabaseUpdateAction.java FormValidatorAction.java HelloAction.java HttpHeaderAction.java LangSelect.java LocaleAction.java OraAddAction.java OraUpdateAction.java RequestParamAction.java ResourceExistsAction.java SendmailAction.java SessionInvalidatorAction.java SessionIsValidAction.java SessionPropagatorAction.java SessionStateAction.java SessionValidatorAction.java

cziegeler    01/10/11 01:52:04

  Modified:    src/org/apache/cocoon/acting Tag: cocoon_20_branch
                        AbstractAction.java
                        AbstractComplementaryConfigurableAction.java
                        AbstractConfigurableAction.java
                        AbstractDatabaseAction.java
                        AbstractValidatorAction.java Action.java
                        ComposerAction.java ConfigurableComposerAction.java
                        DatabaseAddAction.java
                        DatabaseAuthenticatorAction.java
                        DatabaseDeleteAction.java DatabaseUpdateAction.java
                        FormValidatorAction.java HelloAction.java
                        HttpHeaderAction.java LangSelect.java
                        LocaleAction.java OraAddAction.java
                        OraUpdateAction.java RequestParamAction.java
                        ResourceExistsAction.java SendmailAction.java
                        SessionInvalidatorAction.java
                        SessionIsValidAction.java
                        SessionPropagatorAction.java
                        SessionStateAction.java SessionValidatorAction.java
  Log:
  Hopefully fixed line endings of source and added simple utility build task for this.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.7   +9 -9      xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java
  
  Index: AbstractAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java,v
  retrieving revision 1.2.2.6
  retrieving revision 1.2.2.7
  diff -u -r1.2.2.6 -r1.2.2.7
  --- AbstractAction.java	2001/10/08 20:18:50	1.2.2.6
  +++ AbstractAction.java	2001/10/11 08:52:03	1.2.2.7
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.activity.Disposable;
  -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.logger.AbstractLoggable;
  -
  -import java.util.Collections;
  -import java.util.Map;
  +import org.apache.avalon.framework.activity.Disposable;
  +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.logger.AbstractLoggable;
  +
  +import java.util.Collections;
  +import java.util.Map;
   import java.util.TreeMap;
   
   /**
  @@ -23,7 +23,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.2.2.7 $ $Date: 2001/10/11 08:52:03 $
    */
   public abstract class AbstractAction extends AbstractLoggable
   implements Action, Configurable, Disposable {
  
  
  
  1.3.2.9   +10 -10    xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
  
  Index: AbstractComplementaryConfigurableAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
  retrieving revision 1.3.2.8
  retrieving revision 1.3.2.9
  diff -u -r1.3.2.8 -r1.3.2.9
  --- AbstractComplementaryConfigurableAction.java	2001/10/08 20:18:50	1.3.2.8
  +++ AbstractComplementaryConfigurableAction.java	2001/10/11 08:52:03	1.3.2.9
  @@ -7,15 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.components.source.SourceHandler;
  -import org.apache.cocoon.environment.Source;
  -
  -import java.util.HashMap;
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.components.source.SourceHandler;
  +import org.apache.cocoon.environment.Source;
  +
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -26,7 +26,7 @@
    * effective.  The name of the root configuration element is irrelevant.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.9 $ $Date: 2001/10/11 08:52:03 $
    */
   public abstract class AbstractComplementaryConfigurableAction extends ConfigurableComposerAction {
       private static Map configurations = new HashMap();
  
  
  
  1.1.2.5   +4 -4      xml-cocoon2/src/org/apache/cocoon/acting/AbstractConfigurableAction.java
  
  Index: AbstractConfigurableAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractConfigurableAction.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- AbstractConfigurableAction.java	2001/10/08 20:18:50	1.1.2.4
  +++ AbstractConfigurableAction.java	2001/10/11 08:52:03	1.1.2.5
  @@ -7,9 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -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.configuration.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.cocoon.util.HashMap;
   
   /**
  @@ -17,7 +17,7 @@
    * deploying more Actions that take default parameters.
    *
    * @author <a href="mailto:haul@apache.org">Christian Haul</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/08 20:18:50 $ */
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:52:03 $ */
   public abstract class AbstractConfigurableAction extends AbstractAction implements Configurable {
   
       /**
  
  
  
  1.7.2.8   +19 -19    xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java
  
  Index: AbstractDatabaseAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
  retrieving revision 1.7.2.7
  retrieving revision 1.7.2.8
  diff -u -r1.7.2.7 -r1.7.2.8
  --- AbstractDatabaseAction.java	2001/10/08 20:18:50	1.7.2.7
  +++ AbstractDatabaseAction.java	2001/10/11 08:52:03	1.7.2.8
  @@ -7,24 +7,24 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentSelector;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -
  -import java.io.*;
  -import java.math.BigDecimal;
  -import java.sql.*;
  -import java.text.DateFormat;
  -import java.text.SimpleDateFormat;
  -import java.util.Collections;
  -import java.util.HashMap;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.ComponentSelector;
  +import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.generation.ImageDirectoryGenerator;
  +
  +import java.io.*;
  +import java.math.BigDecimal;
  +import java.sql.*;
  +import java.text.DateFormat;
  +import java.text.SimpleDateFormat;
  +import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -147,7 +147,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:balld@apache.org">Donald Ball</a>
  - * @version CVS $Revision: 1.7.2.7 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.7.2.8 $ $Date: 2001/10/11 08:52:03 $
    */
   public abstract class AbstractDatabaseAction extends AbstractComplementaryConfigurableAction implements Configurable, Disposable {
       protected Map files = new HashMap();
  
  
  
  1.4.2.8   +9 -9      xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java
  
  Index: AbstractValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java,v
  retrieving revision 1.4.2.7
  retrieving revision 1.4.2.8
  diff -u -r1.4.2.7 -r1.4.2.8
  --- AbstractValidatorAction.java	2001/10/08 20:18:50	1.4.2.7
  +++ AbstractValidatorAction.java	2001/10/11 08:52:03	1.4.2.8
  @@ -1,12 +1,12 @@
  -// $Id: AbstractValidatorAction.java,v 1.4.2.7 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: AbstractValidatorAction.java,v 1.4.2.8 2001/10/11 08:52:03 cziegeler Exp $
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.regexp.RE;
  -import org.apache.regexp.RESyntaxException;
  -
  +import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.regexp.RE;
  +import org.apache.regexp.RESyntaxException;
  +
   import java.util.Map;
   
   /**
  @@ -97,7 +97,7 @@
   * </table>
   * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
   * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  -* @version CVS $Revision: 1.4.2.7 $ $Date: 2001/10/08 20:18:50 $
  +* @version CVS $Revision: 1.4.2.8 $ $Date: 2001/10/11 08:52:03 $
   */
   public abstract class AbstractValidatorAction
   extends AbstractComplementaryConfigurableAction
  @@ -646,5 +646,5 @@
   
   }
   
  -// $Id: AbstractValidatorAction.java,v 1.4.2.7 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: AbstractValidatorAction.java,v 1.4.2.8 2001/10/11 08:52:03 cziegeler Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.3.2.5   +6 -6      xml-cocoon2/src/org/apache/cocoon/acting/Action.java
  
  Index: Action.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/Action.java,v
  retrieving revision 1.3.2.4
  retrieving revision 1.3.2.5
  diff -u -r1.3.2.4 -r1.3.2.5
  --- Action.java	2001/10/08 20:18:50	1.3.2.4
  +++ Action.java	2001/10/11 08:52:03	1.3.2.5
  @@ -7,17 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.SourceResolver;
  +
   import java.util.Map;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/10/11 08:52:03 $
    */
   public interface Action extends Component {
   
  
  
  
  1.1.1.1.2.3 +3 -3      xml-cocoon2/src/org/apache/cocoon/acting/ComposerAction.java
  
  Index: ComposerAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ComposerAction.java,v
  retrieving revision 1.1.1.1.2.2
  retrieving revision 1.1.1.1.2.3
  diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
  --- ComposerAction.java	2001/10/08 20:18:50	1.1.1.1.2.2
  +++ ComposerAction.java	2001/10/11 08:52:03	1.1.1.1.2.3
  @@ -7,8 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   
   /**
  @@ -16,7 +16,7 @@
    * that extends this to access SitemapComponents.
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:52:03 $
    */
   public abstract class ComposerAction extends AbstractAction implements Composable {
   
  
  
  
  1.1.2.5   +3 -3      xml-cocoon2/src/org/apache/cocoon/acting/ConfigurableComposerAction.java
  
  Index: ConfigurableComposerAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ConfigurableComposerAction.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- ConfigurableComposerAction.java	2001/10/08 20:18:50	1.1.2.4
  +++ ConfigurableComposerAction.java	2001/10/11 08:52:03	1.1.2.5
  @@ -7,8 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   
   /**
  @@ -20,7 +20,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:haul@apache.org">Christian Haul</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/08 20:18:50 $ */
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:52:03 $ */
   public abstract class ConfigurableComposerAction extends AbstractConfigurableAction implements Composable {
   
       /** The component manager instance */
  
  
  
  1.6.2.8   +16 -16    xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java
  
  Index: DatabaseAddAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v
  retrieving revision 1.6.2.7
  retrieving revision 1.6.2.8
  diff -u -r1.6.2.7 -r1.6.2.8
  --- DatabaseAddAction.java	2001/10/08 20:18:50	1.6.2.7
  +++ DatabaseAddAction.java	2001/10/11 08:52:03	1.6.2.8
  @@ -7,21 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
   import java.util.*;
   
   /**
  @@ -33,7 +33,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:balld@apache.org">Donald Ball</a>
  - * @version CVS $Revision: 1.6.2.7 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.6.2.8 $ $Date: 2001/10/11 08:52:03 $
    */
   public class DatabaseAddAction extends AbstractDatabaseAction implements ThreadSafe {
       protected static final Map addStatements = new HashMap();
  
  
  
  1.3.2.11  +18 -18    xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java
  
  Index: DatabaseAuthenticatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v
  retrieving revision 1.3.2.10
  retrieving revision 1.3.2.11
  diff -u -r1.3.2.10 -r1.3.2.11
  --- DatabaseAuthenticatorAction.java	2001/10/08 20:18:50	1.3.2.10
  +++ DatabaseAuthenticatorAction.java	2001/10/11 08:52:03	1.3.2.11
  @@ -1,21 +1,21 @@
  -// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.10 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.11 2001/10/11 08:52:03 cziegeler Exp $
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.sql.Connection;
  -import java.sql.ResultSet;
  -import java.sql.Statement;
  -import java.util.Collections;
  -import java.util.HashMap;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.sql.Connection;
  +import java.sql.ResultSet;
  +import java.sql.Statement;
  +import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -54,7 +54,7 @@
    * not verified.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.3.2.10 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.11 $ $Date: 2001/10/11 08:52:03 $
    */
   public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements ThreadSafe
   {
  @@ -272,5 +272,5 @@
       }
   }
   
  -// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.10 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.11 2001/10/11 08:52:03 cziegeler Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.3.2.9   +16 -16    xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java
  
  Index: DatabaseDeleteAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v
  retrieving revision 1.3.2.8
  retrieving revision 1.3.2.9
  diff -u -r1.3.2.8 -r1.3.2.9
  --- DatabaseDeleteAction.java	2001/10/08 20:18:50	1.3.2.8
  +++ DatabaseDeleteAction.java	2001/10/11 08:52:03	1.3.2.9
  @@ -7,21 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.SQLException;
  -import java.util.HashMap;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.SQLException;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -32,7 +32,7 @@
    * the keys.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.9 $ $Date: 2001/10/11 08:52:03 $
    */
   public final class DatabaseDeleteAction extends AbstractDatabaseAction implements ThreadSafe {
       private static final Map deleteStatements = new HashMap();
  
  
  
  1.3.2.10  +16 -16    xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java
  
  Index: DatabaseUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v
  retrieving revision 1.3.2.9
  retrieving revision 1.3.2.10
  diff -u -r1.3.2.9 -r1.3.2.10
  --- DatabaseUpdateAction.java	2001/10/08 20:18:50	1.3.2.9
  +++ DatabaseUpdateAction.java	2001/10/11 08:52:03	1.3.2.10
  @@ -7,21 +7,21 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.SQLException;
  -import java.util.HashMap;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.SQLException;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -29,7 +29,7 @@
    * only one table at a time to update.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3.2.9 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.10 $ $Date: 2001/10/11 08:52:03 $
    */
   public class DatabaseUpdateAction extends AbstractDatabaseAction implements ThreadSafe {
       private static final Map updateStatements = new HashMap();
  
  
  
  1.4.2.8   +13 -13    xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java
  
  Index: FormValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java,v
  retrieving revision 1.4.2.7
  retrieving revision 1.4.2.8
  diff -u -r1.4.2.7 -r1.4.2.8
  --- FormValidatorAction.java	2001/10/08 20:18:50	1.4.2.7
  +++ FormValidatorAction.java	2001/10/11 08:52:03	1.4.2.8
  @@ -1,16 +1,16 @@
  -// $Id: FormValidatorAction.java,v 1.4.2.7 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: FormValidatorAction.java,v 1.4.2.8 2001/10/11 08:52:03 cziegeler Exp $
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.util.Tokenizer;
  -
  -import java.util.HashMap;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.util.Tokenizer;
  +
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -55,7 +55,7 @@
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.4.2.7 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.4.2.8 $ $Date: 2001/10/11 08:52:03 $
    */
   public class FormValidatorAction extends AbstractValidatorAction implements ThreadSafe
   {
  @@ -205,5 +205,5 @@
       }
   }
   
  -// $Id: FormValidatorAction.java,v 1.4.2.7 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: FormValidatorAction.java,v 1.4.2.8 2001/10/11 08:52:03 cziegeler Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.3.2.4   +9 -9      xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java
  
  Index: HelloAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java,v
  retrieving revision 1.3.2.3
  retrieving revision 1.3.2.4
  diff -u -r1.3.2.3 -r1.3.2.4
  --- HelloAction.java	2001/10/08 20:18:50	1.3.2.3
  +++ HelloAction.java	2001/10/11 08:52:03	1.3.2.4
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +
   import java.util.Map;
   
   /**
  @@ -22,7 +22,7 @@
    * has been created or not.
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/11 08:52:03 $
    */
   public class HelloAction extends ComposerAction implements ThreadSafe {
   
  
  
  
  1.1.2.6   +11 -11    xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java
  
  Index: HttpHeaderAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- HttpHeaderAction.java	2001/10/08 20:18:50	1.1.2.5
  +++ HttpHeaderAction.java	2001/10/11 08:52:03	1.1.2.6
  @@ -7,17 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Response;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.util.Collections;
  -import java.util.HashMap;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Response;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  
  
  
  1.4.2.4   +8 -8      xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java
  
  Index: LangSelect.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java,v
  retrieving revision 1.4.2.3
  retrieving revision 1.4.2.4
  diff -u -r1.4.2.3 -r1.4.2.4
  --- LangSelect.java	2001/10/08 20:18:50	1.4.2.3
  +++ LangSelect.java	2001/10/11 08:52:03	1.4.2.4
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -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.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.*;
  -
  +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.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.*;
  +
   import java.util.*;
   
   /**
  
  
  
  1.1.2.6   +10 -10    xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java
  
  Index: LocaleAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- LocaleAction.java	2001/10/08 20:18:50	1.1.2.5
  +++ LocaleAction.java	2001/10/11 08:52:03	1.1.2.6
  @@ -7,16 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.*;
  -import org.apache.regexp.RE;
  -
  -import java.util.HashMap;
  -import java.util.Locale;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.*;
  +import org.apache.regexp.RE;
  +
  +import java.util.HashMap;
  +import java.util.Locale;
   import java.util.Map;
   
   /**
  
  
  
  1.3.2.5   +22 -22    xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java
  
  Index: OraAddAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java,v
  retrieving revision 1.3.2.4
  retrieving revision 1.3.2.5
  diff -u -r1.3.2.4 -r1.3.2.5
  --- OraAddAction.java	2001/10/08 20:18:50	1.3.2.4
  +++ OraAddAction.java	2001/10/11 08:52:03	1.3.2.5
  @@ -7,27 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import oracle.jdbc.OracleResultSet;
  -import oracle.sql.BLOB;
  -import oracle.sql.CLOB;
  -import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -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.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.generation.ImageDirectoryGenerator;
  -
  -import java.io.*;
  -import java.sql.Connection;
  -import java.sql.PreparedStatement;
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  +import oracle.jdbc.OracleResultSet;
  +import oracle.sql.BLOB;
  +import oracle.sql.CLOB;
  +import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  +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.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.generation.ImageDirectoryGenerator;
  +
  +import java.io.*;
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.util.ArrayList;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -35,7 +35,7 @@
    * only one table at a time to update.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/10/11 08:52:03 $
    */
   public class OraAddAction extends DatabaseAddAction {
       private static final Map selectLOBStatements = new HashMap();
  
  
  
  1.1.1.1.2.1 +2 -2      xml-cocoon2/src/org/apache/cocoon/acting/OraUpdateAction.java
  
  Index: OraUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/OraUpdateAction.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- OraUpdateAction.java	2001/05/09 20:50:07	1.1.1.1
  +++ OraUpdateAction.java	2001/10/11 08:52:03	1.1.1.1.2.1
  @@ -12,8 +12,8 @@
    * only one table at a time to update.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:50:07 $
  + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/10/11 08:52:03 $
    */
   public class OraUpdateAction extends DatabaseUpdateAction {
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.1.2.8   +10 -10    xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java
  
  Index: RequestParamAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- RequestParamAction.java	2001/10/08 20:18:50	1.1.2.7
  +++ RequestParamAction.java	2001/10/11 08:52:03	1.1.2.8
  @@ -14,15 +14,15 @@
   /*
    * Standard imports
    */
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.util.Enumeration;
  -import java.util.HashMap;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.Enumeration;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -78,7 +78,7 @@
    *
    * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
    * @author <a href="mailto:tcurdt@dff.st">Torsten Curdt</a>
  - * @version CVS $Revision: 1.1.2.7 $
  + * @version CVS $Revision: 1.1.2.8 $
    */
   public class RequestParamAction extends ComposerAction implements ThreadSafe {
   
  
  
  
  1.5.2.7   +9 -9      xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java
  
  Index: ResourceExistsAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java,v
  retrieving revision 1.5.2.6
  retrieving revision 1.5.2.7
  diff -u -r1.5.2.6 -r1.5.2.7
  --- ResourceExistsAction.java	2001/10/08 20:18:50	1.5.2.6
  +++ ResourceExistsAction.java	2001/10/11 08:52:03	1.5.2.7
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.util.Collections;
  -import java.util.HashMap;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -23,7 +23,7 @@
    * null otherwise. It has only been tested with context urls.
    *
    * @author <a href="mailto:balld@apache.org">Donald Ball</a>
  - * @version CVS $Revision: 1.5.2.6 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.5.2.7 $ $Date: 2001/10/11 08:52:03 $
    */
   public class ResourceExistsAction extends ComposerAction implements ThreadSafe {
   
  
  
  
  1.3.2.7   +9 -9      xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java
  
  Index: SendmailAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java,v
  retrieving revision 1.3.2.6
  retrieving revision 1.3.2.7
  diff -u -r1.3.2.6 -r1.3.2.7
  --- SendmailAction.java	2001/10/08 20:18:50	1.3.2.6
  +++ SendmailAction.java	2001/10/11 08:52:03	1.3.2.7
  @@ -7,15 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.SourceResolver;
  +
   import java.util.*;
   
   /**
  
  
  
  1.3.2.4   +13 -13    xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java
  
  Index: SessionInvalidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
  retrieving revision 1.3.2.3
  retrieving revision 1.3.2.4
  diff -u -r1.3.2.3 -r1.3.2.4
  --- SessionInvalidatorAction.java	2001/10/08 20:18:50	1.3.2.3
  +++ SessionInvalidatorAction.java	2001/10/11 08:52:03	1.3.2.4
  @@ -1,16 +1,16 @@
  -// $Id: SessionInvalidatorAction.java,v 1.3.2.3 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: SessionInvalidatorAction.java,v 1.3.2.4 2001/10/11 08:52:03 cziegeler Exp $
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.util.Collections;
  -import java.util.HashMap;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -18,7 +18,7 @@
    * empty map if everything is ok, null otherwise.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/11 08:52:03 $
    */
   public class SessionInvalidatorAction extends AbstractAction implements ThreadSafe
   {
  @@ -50,5 +50,5 @@
       }
   }
   
  -// $Id: SessionInvalidatorAction.java,v 1.3.2.3 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: SessionInvalidatorAction.java,v 1.3.2.4 2001/10/11 08:52:03 cziegeler Exp $
   // vim: set et ts=4 sw=4:
  
  
  
  1.1.2.5   +10 -10    xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java
  
  Index: SessionIsValidAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- SessionIsValidAction.java	2001/10/08 20:18:50	1.1.2.4
  +++ SessionIsValidAction.java	2001/10/11 08:52:03	1.1.2.5
  @@ -7,15 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.util.HashMap;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.HashMap;
   import java.util.Map;
   
   
  @@ -24,7 +24,7 @@
    * seesion is still valid.
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:52:03 $
    */
   
   public class SessionIsValidAction extends AbstractValidatorAction implements ThreadSafe
  
  
  
  1.3.2.5   +15 -15    xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java
  
  Index: SessionPropagatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java,v
  retrieving revision 1.3.2.4
  retrieving revision 1.3.2.5
  diff -u -r1.3.2.4 -r1.3.2.5
  --- SessionPropagatorAction.java	2001/10/08 20:18:50	1.3.2.4
  +++ SessionPropagatorAction.java	2001/10/11 08:52:03	1.3.2.5
  @@ -1,18 +1,18 @@
  -// $Id: SessionPropagatorAction.java,v 1.3.2.4 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: SessionPropagatorAction.java,v 1.3.2.5 2001/10/11 08:52:03 cziegeler Exp $
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.util.Collections;
  -import java.util.HashMap;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -29,7 +29,7 @@
    * </pre>
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/10/11 08:52:03 $
    */
   public class SessionPropagatorAction extends AbstractConfigurableAction implements ThreadSafe
   {
  @@ -115,6 +115,6 @@
       }
   }
   
  -// $Id: SessionPropagatorAction.java,v 1.3.2.4 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: SessionPropagatorAction.java,v 1.3.2.5 2001/10/11 08:52:03 cziegeler Exp $
   // vim: set et ts=4 sw=4:
   
  
  
  
  1.1.2.7   +12 -12    xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java
  
  Index: SessionStateAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- SessionStateAction.java	2001/10/08 20:18:50	1.1.2.6
  +++ SessionStateAction.java	2001/10/11 08:52:03	1.1.2.7
  @@ -7,17 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.SourceResolver;
  -
  -import java.util.HashMap;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -69,7 +69,7 @@
    * @see org.apache.cocoon.selection.SessionAttributeSelectorFactory
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Id: SessionStateAction.java,v 1.1.2.6 2001/10/08 20:18:50 bloritsch Exp $ */
  + * @version CVS $Id: SessionStateAction.java,v 1.1.2.7 2001/10/11 08:52:03 cziegeler Exp $ */
   public class SessionStateAction extends AbstractConfigurableAction implements ThreadSafe {
   
       protected String statekey = "org.apache.cocoon.SessionState";
  
  
  
  1.3.2.9   +15 -15    xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java
  
  Index: SessionValidatorAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java,v
  retrieving revision 1.3.2.8
  retrieving revision 1.3.2.9
  diff -u -r1.3.2.8 -r1.3.2.9
  --- SessionValidatorAction.java	2001/10/08 20:18:50	1.3.2.8
  +++ SessionValidatorAction.java	2001/10/11 08:52:03	1.3.2.9
  @@ -1,18 +1,18 @@
  -// $Id: SessionValidatorAction.java,v 1.3.2.8 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: SessionValidatorAction.java,v 1.3.2.9 2001/10/11 08:52:03 cziegeler Exp $
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Redirector;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.util.Tokenizer;
  -
  -import java.util.Collections;
  -import java.util.HashMap;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.util.Tokenizer;
  +
  +import java.util.Collections;
  +import java.util.HashMap;
   import java.util.Map;
   
   
  @@ -52,7 +52,7 @@
    * all validated parameters to the sitemap via {name} expression.
    *
    * @author Martin Man &lt;Martin.Man@seznam.cz&gt;
  - * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/10/08 20:18:50 $
  + * @version CVS $Revision: 1.3.2.9 $ $Date: 2001/10/11 08:52:03 $
    */
   public class SessionValidatorAction extends AbstractValidatorAction implements ThreadSafe
   {
  @@ -197,5 +197,5 @@
       }
   }
   
  -// $Id: SessionValidatorAction.java,v 1.3.2.8 2001/10/08 20:18:50 bloritsch Exp $
  +// $Id: SessionValidatorAction.java,v 1.3.2.9 2001/10/11 08:52:03 cziegeler Exp $
   // vim: set et ts=4 sw=4:
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org