[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/simple SimplePipelineStageFactory.java,1.3,1.4 SimplePipelineStageResolver.java,1.3,1.4

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/simple
In directory sc8-pr-cvs1:/tmp/cvs-serv700/src/com/babeldoc/core/pipeline/simple

Modified Files:
	SimplePipelineStageFactory.java 
	SimplePipelineStageResolver.java 
Log Message:
reformatted and updated license header

Index: SimplePipelineStageFactory.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/simple/SimplePipelineStageFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimplePipelineStageFactory.java	8 Jun 2003 18:23:46 -0000	1.3
--- SimplePipelineStageFactory.java	27 Jun 2003 02:19:59 -0000	1.4
***************
*** 1,22 ****
! /*
!  * $Header$
!  * $DateTime: 2002/07/24 18:15:55 $
   *
   *
!  * babeldoc:  universal document processor
   *
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version.
   *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  * GNU General Public License for more details.
   *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
  package com.babeldoc.core.pipeline.simple;
--- 1,66 ----
! /* ====================================================================
!  * The Apache Software License, Version 1.1
   *
+  * Copyright (c) 2000 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" 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 ap...@ap....
!  *
!  * 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/>.
!  *
!  * Portions of this software are based upon public domain software
!  * originally written at the National Center for Supercomputing Applications,
!  * University of Illinois, Urbana-Champaign.
!  * ====================================================================
!  *
!  * Babeldoc:  The Universal Document Processor
!  *
!  * $Header$
!  * $DateTime$
!  * $Author$
   *
   */
  package com.babeldoc.core.pipeline.simple;
***************
*** 24,52 ****
  import com.babeldoc.core.config.ConfigService;
  import com.babeldoc.core.config.IConfig;
- import com.babeldoc.core.pipeline.PipelineStageFactory;
  import com.babeldoc.core.pipeline.IPipelineStageFactory;
  
  import java.util.Map;
  
  /**
!  * This is a simple implementation of a pipeline stage factory - it uses the configuration
!  * server to resolve pipelinestage names to objects.  Most of the hard work / specific
!  * work is performed by the SimplePipelineResolver.
   *
   * @author Bmcdonald
   * @version 1.0
   */
! public class SimplePipelineStageFactory
!     extends PipelineStageFactory
      implements IPipelineStageFactory {
  
    /**
!    * Configuration constants
!    */
!   public final static String CONFIG_FILENAME = "configFile";
! 
!   /**
!    *  Set the options.  Extract the name of the configuration file
!    * and then do the setup.
     *
     * @param options
--- 68,93 ----
  import com.babeldoc.core.config.ConfigService;
  import com.babeldoc.core.config.IConfig;
  import com.babeldoc.core.pipeline.IPipelineStageFactory;
+ import com.babeldoc.core.pipeline.PipelineStageFactory;
  
  import java.util.Map;
  
+ 
  /**
!  * This is a simple implementation of a pipeline stage factory - it uses the
!  * configuration server to resolve pipelinestage names to objects.  Most of
!  * the hard work / specific work is performed by the SimplePipelineResolver.
   *
   * @author Bmcdonald
   * @version 1.0
   */
! public class SimplePipelineStageFactory extends PipelineStageFactory
      implements IPipelineStageFactory {
+   /** Configuration constants */
+   public static final String CONFIG_FILENAME = "configFile";
  
    /**
!    * Set the options.  Extract the name of the configuration file and then do
!    * the setup.
     *
     * @param options
***************
*** 54,59 ****
    public void setOptions(Map options) {
      String configFile = (String) options.get(CONFIG_FILENAME);
!     IConfig config = ConfigService.getInstance().
!         getConfig(configFile);
      setResolver(new SimplePipelineStageResolver(config));
    }
--- 95,99 ----
    public void setOptions(Map options) {
      String configFile = (String) options.get(CONFIG_FILENAME);
!     IConfig config = ConfigService.getInstance().getConfig(configFile);
      setResolver(new SimplePipelineStageResolver(config));
    }

Index: SimplePipelineStageResolver.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/simple/SimplePipelineStageResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimplePipelineStageResolver.java	8 Jun 2003 18:28:56 -0000	1.3
--- SimplePipelineStageResolver.java	27 Jun 2003 02:19:59 -0000	1.4
***************
*** 1,26 ****
! /*
!  * $Header$
!  * $DateTime: 2002/07/24 18:15:55 $
   *
   *
!  * babeldoc:  universal document processor
   *
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version.
   *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  * GNU General Public License for more details.
   *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
  package com.babeldoc.core.pipeline.simple;
  
  import com.Ostermiller.util.StringTokenizer;
  import com.babeldoc.core.config.IConfig;
  import com.babeldoc.core.pipeline.IPipelineStageResolver;
--- 1,71 ----
! /* ====================================================================
!  * The Apache Software License, Version 1.1
   *
+  * Copyright (c) 2000 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" 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 ap...@ap....
!  *
!  * 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/>.
!  *
!  * Portions of this software are based upon public domain software
!  * originally written at the National Center for Supercomputing Applications,
!  * University of Illinois, Urbana-Champaign.
!  * ====================================================================
!  *
!  * Babeldoc:  The Universal Document Processor
!  *
!  * $Header$
!  * $DateTime$
!  * $Author$
   *
   */
  package com.babeldoc.core.pipeline.simple;
  
  import com.Ostermiller.util.StringTokenizer;
+ 
  import com.babeldoc.core.config.IConfig;
  import com.babeldoc.core.pipeline.IPipelineStageResolver;
***************
*** 30,51 ****
  import java.util.Iterator;
  
  /**
   * The SimplePipelineResolver class to resolve references for pipeline factory
!  * and the pipeline stages in a sytstem independant fashion.  This pipeline configuration
!  * is stored in configuration property objects.  Most of the work in this class is the
!  * transformation of the configuration information into pipeline configuration information.
   *
   * @author Bmcdonald
   * @version 1.0
   */
! public class SimplePipelineStageResolver
!     extends PipelineStageResolver
      implements IPipelineStageResolver {
! 
!   /**
!    * configuration constants
!    */
!   public final static String CONNECTION = "connection";
!   public final static String GLUE = ".";
  
    /**
--- 75,94 ----
  import java.util.Iterator;
  
+ 
  /**
   * The SimplePipelineResolver class to resolve references for pipeline factory
!  * and the pipeline stages in a sytstem independant fashion.  This pipeline
!  * configuration is stored in configuration property objects.  Most of the
!  * work in this class is the transformation of the configuration information
!  * into pipeline configuration information.
   *
   * @author Bmcdonald
   * @version 1.0
   */
! public class SimplePipelineStageResolver extends PipelineStageResolver
      implements IPipelineStageResolver {
!   /** configuration constants */
!   public static final String CONNECTION = "connection";
!   public static final String GLUE = ".";
  
    /**
***************
*** 67,73 ****
  
    /**
!    * Load the configuration data for this pipeline into the
!    * three hashtables:  name - class name mappings, stage and
!    * next stage mappings and the configuration information.
     *
     * @param config
--- 110,116 ----
  
    /**
!    * Load the configuration data for this pipeline into the three hashtables:
!    * name - class name mappings, stage and next stage mappings and the
!    * configuration information.
     *
     * @param config
***************
*** 75,78 ****
--- 118,122 ----
    protected void setupConfigData(IConfig config) {
      stageConfig = new PipelineStageConfig("root");
+ 
      for (Iterator keys = config.keys().iterator(); keys.hasNext();) {
        String key = (String) keys.next();
***************
*** 88,92 ****
        // Also handle connections
        else if (key.endsWith(NEXT_STAGE)) {
!         String source = key.substring(0, key.length() - NEXT_STAGE.length() - 1);
          setupNextStages(source, value);
        } else if (key.equals(ENTRY_STAGE)) {
--- 132,137 ----
        // Also handle connections
        else if (key.endsWith(NEXT_STAGE)) {
!         String source = key.substring(0, key.length() - NEXT_STAGE.length() -
!             1);
          setupNextStages(source, value);
        } else if (key.equals(ENTRY_STAGE)) {
***************
*** 103,106 ****
--- 148,152 ----
  
        int i = 1;
+ 
        while (st.hasMoreTokens()) {
          String token = st.nextToken();
***************
*** 109,112 ****
--- 155,159 ----
            working.put(token, new PipelineStageConfig(token));
          }
+ 
          working = working.get(token);