cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript JavascriptLanguage.java
Date Thu, 11 Oct 2001 07:20:26 GMT
cziegeler    01/10/11 00:20:26

  Modified:    src/org/apache/cocoon/components/language
                        LanguageException.java
               src/org/apache/cocoon/components/language/generator
                        CompiledComponent.java GeneratorSelector.java
                        ProgramGenerator.java ProgramGeneratorImpl.java
               src/org/apache/cocoon/components/language/markup
                        AbstractMarkupLanguage.java Logicsheet.java
                        LogicsheetCodeGenerator.java
                        MarkupCodeGenerator.java MarkupLanguage.java
                        NamedLogicsheet.java
               src/org/apache/cocoon/components/language/markup/sitemap
                        SitemapMarkupLanguage.java
               src/org/apache/cocoon/components/language/markup/xsp
                        XSPCookieHelper.java XSPFormValidatorHelper.java
                        XSPGenerator.java XSPMarkupLanguage.java
                        XSPObjectHelper.java XSPRequestHelper.java
                        XSPResponseHelper.java XSPUtil.java
               src/org/apache/cocoon/components/language/programming
                        AbstractProgrammingLanguage.java
                        CompiledProgrammingLanguage.java
                        LanguageCompiler.java ProgrammingLanguage.java
               src/org/apache/cocoon/components/language/programming/java
                        AbstractJavaCompiler.java JavaLanguage.java
                        Jikes.java JstyleFormatter.java
               src/org/apache/cocoon/components/language/programming/javascript
                        JavascriptLanguage.java
  Log:
  Hopefully fixed line endings of source and added simple utility build task for this.
  
  Revision  Changes    Path
  1.4       +4 -4      xml-cocoon2/src/org/apache/cocoon/components/language/LanguageException.java
  
  Index: LanguageException.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/LanguageException.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LanguageException.java	2001/10/08 20:03:12	1.3
  +++ LanguageException.java	2001/10/11 07:20:25	1.4
  @@ -7,16 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language;
   
  -import org.apache.avalon.framework.CascadingException;
  -
  -import java.io.PrintStream;
  +import org.apache.avalon.framework.CascadingException;
  +
  +import java.io.PrintStream;
   import java.io.PrintWriter;
   
   /**
    * The language exception.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/10/11 07:20:25 $
    */
   public class LanguageException extends CascadingException {
       /**
  
  
  
  1.3       +3 -3      xml-cocoon2/src/org/apache/cocoon/components/language/generator/CompiledComponent.java
  
  Index: CompiledComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/CompiledComponent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CompiledComponent.java	2001/10/08 20:03:12	1.2
  +++ CompiledComponent.java	2001/10/11 07:20:25	1.3
  @@ -7,8 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.generator;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.Composable;
   import org.apache.cocoon.Modifiable;
   
   /**
  @@ -16,7 +16,7 @@
    * includes Sitemaps and XSP Pages
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.3 $ $Date: 2001/10/11 07:20:25 $
    */
   public interface CompiledComponent extends Component, Composable, Modifiable {
   }
  
  
  
  1.11      +15 -15    xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java
  
  Index: GeneratorSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- GeneratorSelector.java	2001/10/08 20:03:12	1.10
  +++ GeneratorSelector.java	2001/10/11 07:20:25	1.11
  @@ -7,20 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.generator;
   
  -import org.apache.avalon.excalibur.component.ComponentHandler;
  -import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
  -import org.apache.avalon.excalibur.component.RoleManager;
  -import org.apache.avalon.excalibur.logger.LogKitManager;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.configuration.DefaultConfiguration;
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.components.classloader.ClassLoaderManager;
  -
  -import java.io.File;
  +import org.apache.avalon.excalibur.component.ComponentHandler;
  +import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
  +import org.apache.avalon.excalibur.component.RoleManager;
  +import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.configuration.DefaultConfiguration;
  +import org.apache.avalon.framework.context.Context;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.components.classloader.ClassLoaderManager;
  +
  +import java.io.File;
   import java.util.*;
   
   /**
  @@ -28,7 +28,7 @@
    * includes Sitemaps and XSP Pages
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.11 $ $Date: 2001/10/11 07:20:25 $
    */
   public class GeneratorSelector extends ExcaliburComponentSelector implements Disposable {
   
  
  
  
  1.8       +3 -3      xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java
  
  Index: ProgramGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ProgramGenerator.java	2001/10/08 20:03:12	1.7
  +++ ProgramGenerator.java	2001/10/11 07:20:25	1.8
  @@ -7,8 +7,8 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.generator;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.environment.SourceResolver;
   
   /**
  @@ -16,7 +16,7 @@
    * documents writeen in a <code>MarkupLanguage</code>
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/10/11 07:20:25 $
    */
   public interface ProgramGenerator extends Component {
   
  
  
  
  1.21      +27 -27    xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
  
  Index: ProgramGeneratorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ProgramGeneratorImpl.java	2001/10/08 20:03:12	1.20
  +++ ProgramGeneratorImpl.java	2001/10/11 07:20:25	1.21
  @@ -8,38 +8,38 @@
   
   package org.apache.cocoon.components.language.generator;
   
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.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.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -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.components.classloader.ClassLoaderManager;
  -import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.components.language.markup.MarkupLanguage;
  -import org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage;
  -import org.apache.cocoon.components.language.programming.CodeFormatter;
  -import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  -import org.apache.cocoon.components.store.Store;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.util.IOUtils;
  -import org.xml.sax.InputSource;
  -
  -import java.io.File;
  +import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.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.avalon.framework.context.Context;
  +import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +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.components.classloader.ClassLoaderManager;
  +import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.components.language.markup.MarkupLanguage;
  +import org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage;
  +import org.apache.cocoon.components.language.programming.CodeFormatter;
  +import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  +import org.apache.cocoon.components.store.Store;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.util.IOUtils;
  +import org.xml.sax.InputSource;
  +
  +import java.io.File;
   import java.net.MalformedURLException;
   
   /**
    * The default implementation of <code>ProgramGenerator</code>
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.20 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.21 $ $Date: 2001/10/11 07:20:25 $
    */
   public class ProgramGeneratorImpl extends AbstractLoggable
       implements ProgramGenerator, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
  
  
  
  1.13      +21 -21    xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
  
  Index: AbstractMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AbstractMarkupLanguage.java	2001/10/08 20:03:12	1.12
  +++ AbstractMarkupLanguage.java	2001/10/11 07:20:25	1.13
  @@ -8,26 +8,26 @@
   
   package org.apache.cocoon.components.language.markup;
   
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  -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 org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  -import org.apache.cocoon.components.store.Store;
  -import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.xml.sax.*;
  -import org.xml.sax.helpers.XMLFilterImpl;
  -import org.xml.sax.helpers.XMLReaderFactory;
  -
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  +import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.Composable;
  +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 org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  +import org.apache.cocoon.components.store.Store;
  +import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.xml.sax.*;
  +import org.xml.sax.helpers.XMLFilterImpl;
  +import org.xml.sax.helpers.XMLReaderFactory;
  +
  +import java.io.IOException;
  +import java.net.MalformedURLException;
   import java.util.*;
   
   /**
  @@ -38,7 +38,7 @@
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
  - * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.13 $ $Date: 2001/10/11 07:20:25 $
    */
   public abstract class AbstractMarkupLanguage extends AbstractLoggable
     implements MarkupLanguage, Composable, Configurable
  
  
  
  1.9       +21 -21    xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java
  
  Index: Logicsheet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Logicsheet.java	2001/10/08 20:03:12	1.8
  +++ Logicsheet.java	2001/10/11 07:20:25	1.9
  @@ -8,26 +8,26 @@
   
   package org.apache.cocoon.components.language.markup;
   
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.components.source.URLSource;
  -import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.cocoon.components.xslt.XSLTProcessor;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.environment.URLFactorySourceResolver;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.XMLFilter;
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.helpers.XMLFilterImpl;
  -
  -import javax.xml.transform.sax.TransformerHandler;
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.HashMap;
  +import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.components.source.URLSource;
  +import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.components.xslt.XSLTProcessor;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.environment.URLFactorySourceResolver;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.XMLFilter;
  +import org.xml.sax.XMLReader;
  +import org.xml.sax.helpers.XMLFilterImpl;
  +
  +import javax.xml.transform.sax.TransformerHandler;
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -41,7 +41,7 @@
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/10/11 07:20:25 $
    */
   public class Logicsheet extends AbstractLoggable
   {
  
  
  
  1.5       +15 -15    xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java
  
  Index: LogicsheetCodeGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LogicsheetCodeGenerator.java	2001/10/08 20:03:12	1.4
  +++ LogicsheetCodeGenerator.java	2001/10/11 07:20:25	1.5
  @@ -7,20 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.util.TraxErrorHandler;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.XMLReader;
  -
  -import javax.xml.transform.OutputKeys;
  -import javax.xml.transform.TransformerConfigurationException;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.sax.SAXResult;
  -import javax.xml.transform.sax.SAXTransformerFactory;
  -import javax.xml.transform.sax.TransformerHandler;
  -import javax.xml.transform.stream.StreamResult;
  -import java.io.StringWriter;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.util.TraxErrorHandler;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.XMLReader;
  +
  +import javax.xml.transform.OutputKeys;
  +import javax.xml.transform.TransformerConfigurationException;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.sax.SAXResult;
  +import javax.xml.transform.sax.SAXTransformerFactory;
  +import javax.xml.transform.sax.TransformerHandler;
  +import javax.xml.transform.stream.StreamResult;
  +import java.io.StringWriter;
   import java.util.Properties;
   
   /**
  @@ -28,7 +28,7 @@
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/10/11 07:20:25 $
    */
   public class LogicsheetCodeGenerator extends AbstractLoggable implements MarkupCodeGenerator {
   
  
  
  
  1.4       +2 -2      xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupCodeGenerator.java
  
  Index: MarkupCodeGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupCodeGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MarkupCodeGenerator.java	2001/10/08 20:03:12	1.3
  +++ MarkupCodeGenerator.java	2001/10/11 07:20:25	1.4
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import org.xml.sax.InputSource;
  +import org.xml.sax.InputSource;
   import org.xml.sax.XMLReader;
   
   /**
    * This interfaces defines the functionality of a source code generator
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/10/11 07:20:25 $
    */
   public interface MarkupCodeGenerator {
       /**
  
  
  
  1.6       +4 -4      xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java
  
  Index: MarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MarkupLanguage.java	2001/10/08 20:03:12	1.5
  +++ MarkupLanguage.java	2001/10/11 07:20:25	1.6
  @@ -7,9 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  -import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  +import org.apache.cocoon.environment.SourceResolver;
   import org.xml.sax.InputSource;
   
   /**
  @@ -18,7 +18,7 @@
    * document augmenting it with dynamic content
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/10/11 07:20:25 $
    */
   public interface MarkupLanguage extends Component {
   
  
  
  
  1.5       +5 -5      xml-cocoon2/src/org/apache/cocoon/components/language/markup/NamedLogicsheet.java
  
  Index: NamedLogicsheet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/NamedLogicsheet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NamedLogicsheet.java	2001/10/08 20:03:12	1.4
  +++ NamedLogicsheet.java	2001/10/11 07:20:25	1.5
  @@ -7,10 +7,10 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup;
   
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.cocoon.components.url.URLFactory;
  -
  -import java.io.IOException;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.cocoon.components.url.URLFactory;
  +
  +import java.io.IOException;
   import java.net.MalformedURLException;
   
   /**
  @@ -21,7 +21,7 @@
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/10/11 07:20:25 $
    */
   public class NamedLogicsheet extends Logicsheet {
       /**
  
  
  
  1.6       +17 -17    xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java
  
  Index: SitemapMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SitemapMarkupLanguage.java	2001/10/08 20:03:12	1.5
  +++ SitemapMarkupLanguage.java	2001/10/11 07:20:26	1.6
  @@ -7,22 +7,22 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.sitemap;
   
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
  -import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
  -import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.log.Logger;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.XMLFilter;
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.helpers.XMLFilterImpl;
  -
  -import java.io.File;
  -import java.io.IOException;
  +import org.apache.avalon.framework.logger.Loggable;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
  +import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
  +import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.log.Logger;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.XMLFilter;
  +import org.xml.sax.XMLReader;
  +import org.xml.sax.helpers.AttributesImpl;
  +import org.xml.sax.helpers.XMLFilterImpl;
  +
  +import java.io.File;
  +import java.io.IOException;
   import java.util.*;
   
   /**
  @@ -30,7 +30,7 @@
    * <a href="http://xml.apache.org/cocoon/sitemap.html">Sitemap</a>.
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/10/11 07:20:26 $
    */
   public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
   
  
  
  
  1.10      +9 -9      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
  
  Index: XSPCookieHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XSPCookieHelper.java	2001/10/08 20:03:12	1.9
  +++ XSPCookieHelper.java	2001/10/11 07:20:26	1.10
  @@ -39,15 +39,15 @@
   
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Cookie;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Response;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Cookie;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Response;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
  +
  +import java.util.Enumeration;
  +import java.util.Hashtable;
   import java.util.Map;
   
   public class XSPCookieHelper extends XSPObjectHelper {
  
  
  
  1.14      +15 -15    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java
  
  Index: XSPFormValidatorHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XSPFormValidatorHelper.java	2001/10/08 20:03:12	1.13
  +++ XSPFormValidatorHelper.java	2001/10/11 07:20:26	1.14
  @@ -7,27 +7,27 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
  -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.acting.ConfigurationHelper;
  -import org.apache.cocoon.acting.ValidatorActionResult;
  -import org.apache.cocoon.components.source.SourceHandler;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.log.Logger;
  -
  -import java.util.HashMap;
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentManager;
  +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.acting.ConfigurationHelper;
  +import org.apache.cocoon.acting.ValidatorActionResult;
  +import org.apache.cocoon.components.source.SourceHandler;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Source;
  +import org.apache.log.Logger;
  +
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
    * The <code>ValidatorActionResult</code> object helper
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.13 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.14 $ $Date: 2001/10/11 07:20:26 $
    */
   public class XSPFormValidatorHelper {
     /**
  
  
  
  1.9       +8 -8      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
  
  Index: XSPGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XSPGenerator.java	2001/10/08 20:03:12	1.8
  +++ XSPGenerator.java	2001/10/11 07:20:26	1.9
  @@ -7,20 +7,20 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -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.context.Context;
  -import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
  +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.context.Context;
  +import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.generation.AbstractServerPage;
   
   /**
    * Base class for XSP-generated <code>ServerPagesGenerator</code> classes
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/10/11 07:20:26 $
    */
   public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Recyclable {
     protected Context avalonContext = null;
  
  
  
  1.6       +17 -17    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
  
  Index: XSPMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XSPMarkupLanguage.java	2001/10/08 20:03:12	1.5
  +++ XSPMarkupLanguage.java	2001/10/11 07:20:26	1.6
  @@ -7,22 +7,22 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
  -import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
  -import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.log.Logger;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.XMLFilter;
  -import org.xml.sax.helpers.AttributesImpl;
  -import org.xml.sax.helpers.XMLFilterImpl;
  -
  -import java.io.File;
  -import java.io.IOException;
  +import org.apache.avalon.framework.logger.Loggable;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
  +import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
  +import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
  +import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.log.Logger;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.XMLFilter;
  +import org.xml.sax.helpers.AttributesImpl;
  +import org.xml.sax.helpers.XMLFilterImpl;
  +
  +import java.io.File;
  +import java.io.IOException;
   import java.util.*;
   
   /**
  @@ -31,7 +31,7 @@
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:ssahuc@apache.org">Sebastien Sahuc</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/10/11 07:20:26 $
    */
   public class XSPMarkupLanguage extends AbstractMarkupLanguage {
   
  
  
  
  1.7       +10 -10    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
  
  Index: XSPObjectHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSPObjectHelper.java	2001/10/08 20:03:12	1.6
  +++ XSPObjectHelper.java	2001/10/11 07:20:26	1.7
  @@ -7,15 +7,15 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.xml.XMLizable;
  -import org.apache.cocoon.xml.dom.DOMStreamer;
  -import org.w3c.dom.Node;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import java.util.Collection;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.xml.XMLizable;
  +import org.apache.cocoon.xml.dom.DOMStreamer;
  +import org.w3c.dom.Node;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
  +
  +import java.util.Collection;
   import java.util.Iterator;
   
   /**
  @@ -24,7 +24,7 @@
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
    *         (Cocoon1 <code>xspExpr()</code> methods port)
  - * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/10/11 07:20:26 $
    */
   public class XSPObjectHelper {
     /**
  
  
  
  1.11      +11 -11    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
  
  Index: XSPRequestHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XSPRequestHelper.java	2001/10/08 20:03:12	1.10
  +++ XSPRequestHelper.java	2001/10/11 07:20:26	1.11
  @@ -7,23 +7,23 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.environment.Session;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import java.util.ArrayList;
  -import java.util.Enumeration;
  -import java.util.List;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Request;
  +import org.apache.cocoon.environment.Session;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
  +
  +import java.util.ArrayList;
  +import java.util.Enumeration;
  +import java.util.List;
   import java.util.Map;
   
   /**
    * The <code>Request</code> object helper
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:12 $
  + * @version CVS $Revision: 1.11 $ $Date: 2001/10/11 07:20:26 $
    */
   public class XSPRequestHelper {
     /**
  
  
  
  1.5       +4 -4      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java
  
  Index: XSPResponseHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSPResponseHelper.java	2001/10/08 20:03:13	1.4
  +++ XSPResponseHelper.java	2001/10/11 07:20:26	1.5
  @@ -7,16 +7,16 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Response;
  -
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.environment.Response;
  +
   import java.util.Map;
   
   /**
    * The XSP <code>Response</code> object helper
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:13 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/10/11 07:20:26 $
    */
   public class XSPResponseHelper {
     /**
  
  
  
  1.7       +16 -16    xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
  
  Index: XSPUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSPUtil.java	2001/10/08 20:03:13	1.6
  +++ XSPUtil.java	2001/10/11 07:20:26	1.7
  @@ -7,28 +7,28 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.apache.cocoon.components.url.URLFactory;
  -import org.apache.cocoon.environment.Context;
  -import org.apache.cocoon.environment.Session;
  -import org.apache.cocoon.util.NetUtils;
  -import org.apache.cocoon.util.Tokenizer;
  -import org.apache.cocoon.xml.IncludeXMLConsumer;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  -
  -import java.io.*;
  -import java.text.SimpleDateFormat;
  -import java.util.Date;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.components.parser.Parser;
  +import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.environment.Context;
  +import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.util.NetUtils;
  +import org.apache.cocoon.util.Tokenizer;
  +import org.apache.cocoon.xml.IncludeXMLConsumer;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
  +
  +import java.io.*;
  +import java.text.SimpleDateFormat;
  +import java.util.Date;
   import java.util.Map;
   
   /**
    * The XSP <code>Utility</code> object helper
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @author <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
  - * @version $Revision: 1.6 $ $Date: 2001/10/08 20:03:13 $
  + * @version $Revision: 1.7 $ $Date: 2001/10/11 07:20:26 $
    */
   public class XSPUtil {
       public static String pathComponent(String filename) {
  
  
  
  1.4       +9 -9      xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java
  
  Index: AbstractProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractProgrammingLanguage.java	2001/10/08 20:03:13	1.3
  +++ AbstractProgrammingLanguage.java	2001/10/11 07:20:26	1.4
  @@ -7,14 +7,14 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming;
   
  -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 org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.util.ClassUtils;
  -
  +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 org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.util.ClassUtils;
  +
   import java.io.File;
   
   /**
  @@ -23,7 +23,7 @@
    * unloading.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/10/11 07:20:26 $
    */
   public abstract class AbstractProgrammingLanguage extends AbstractLoggable
     implements ProgrammingLanguage, Configurable
  
  
  
  1.8       +10 -10    xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java
  
  Index: CompiledProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CompiledProgrammingLanguage.java	2001/10/08 20:03:13	1.7
  +++ CompiledProgrammingLanguage.java	2001/10/11 07:20:26	1.8
  @@ -7,22 +7,22 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming;
   
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.IOUtils;
  -
  +import org.apache.avalon.framework.context.Context;
  +import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.Constants;
  +import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.cocoon.util.IOUtils;
  +
   import java.io.File;
   
   /**
    * A compiled programming language. This class extends <code>AbstractProgrammingLanguage</code> adding support for compilation
    * and object program files
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:13 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/10/11 07:20:26 $
    */
   public abstract class CompiledProgrammingLanguage extends AbstractProgrammingLanguage implements Contextualizable {
       /** The compiler */
  
  
  
  1.4       +4 -4      xml-cocoon2/src/org/apache/cocoon/components/language/programming/LanguageCompiler.java
  
  Index: LanguageCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/LanguageCompiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LanguageCompiler.java	2001/10/08 20:03:13	1.3
  +++ LanguageCompiler.java	2001/10/11 07:20:26	1.4
  @@ -8,16 +8,16 @@
   
   package org.apache.cocoon.components.language.programming;
   
  -import org.apache.avalon.framework.component.Component;
  -
  -import java.io.IOException;
  +import org.apache.avalon.framework.component.Component;
  +
  +import java.io.IOException;
   import java.util.List;
   
   /**
    * This interface defines a compiler's functionality for all
    * (Java-based) compiled languages
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
  + * @version $Revision: 1.4 $ $Date: 2001/10/11 07:20:26 $
    * @since 2.0
    */
   public interface LanguageCompiler extends Component {
  
  
  
  1.5       +5 -5      xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java
  
  Index: ProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProgrammingLanguage.java	2001/10/08 20:03:13	1.4
  +++ ProgrammingLanguage.java	2001/10/11 07:20:26	1.5
  @@ -7,17 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
  -
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.components.language.generator.CompiledComponent;
  +
   import java.io.File;
   
   /**
    * This interface states the functionality of a programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:13 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/10/11 07:20:26 $
    */
   public interface ProgrammingLanguage extends Component {
   
  
  
  
  1.4       +9 -9      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java
  
  Index: AbstractJavaCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractJavaCompiler.java	2001/10/08 20:03:13	1.3
  +++ AbstractJavaCompiler.java	2001/10/11 07:20:26	1.4
  @@ -8,20 +8,20 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.components.language.programming.LanguageCompiler;
  -
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  +import org.apache.avalon.excalibur.pool.Recyclable;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.components.language.programming.LanguageCompiler;
  +
  +import java.io.BufferedReader;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
   import java.util.List;
   
   /**
    * This class implements the functionality common to all Java compilers.
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
  + * @version $Revision: 1.4 $ $Date: 2001/10/11 07:20:26 $
    * @since 2.0
    */
   public abstract class AbstractJavaCompiler extends AbstractLoggable implements LanguageCompiler, Recyclable {
  
  
  
  1.10      +18 -18    xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
  
  Index: JavaLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JavaLanguage.java	2001/10/08 20:03:13	1.9
  +++ JavaLanguage.java	2001/10/11 07:20:26	1.10
  @@ -8,30 +8,30 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.components.classloader.ClassLoaderManager;
  -import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.components.language.generator.CompiledComponent;
  -import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
  -import org.apache.cocoon.components.language.programming.CompilerError;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.JavaArchiveFilter;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.List;
  +import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.thread.ThreadSafe;
  +import org.apache.cocoon.components.classloader.ClassLoaderManager;
  +import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.components.language.generator.CompiledComponent;
  +import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
  +import org.apache.cocoon.components.language.programming.CompilerError;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.cocoon.util.JavaArchiveFilter;
  +
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.List;
   import java.util.StringTokenizer;
   
   /**
    * The Java programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/10/08 20:03:13 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/10/11 07:20:26 $
    */
   public class JavaLanguage extends CompiledProgrammingLanguage implements ThreadSafe, Composable, Disposable {
   
  
  
  
  1.8       +6 -6      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Jikes.java	2001/10/08 20:03:13	1.7
  +++ Jikes.java	2001/10/11 07:20:26	1.8
  @@ -8,18 +8,18 @@
   
   package org.apache.cocoon.components.language.programming.java;
   
  -import org.apache.cocoon.components.language.programming.CompilerError;
  -
  -import java.io.*;
  -import java.util.ArrayList;
  -import java.util.List;
  +import org.apache.cocoon.components.language.programming.CompilerError;
  +
  +import java.io.*;
  +import java.util.ArrayList;
  +import java.util.List;
   import java.util.StringTokenizer;
   
   /**
    * This class wraps IBM's <i>Jikes</i> Java compiler
    * NOTE: inspired by the Apache Jasper implementation.
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.7 $ $Date: 2001/10/08 20:03:13 $
  + * @version $Revision: 1.8 $ $Date: 2001/10/11 07:20:26 $
    * @since 2.0
    */
   
  
  
  
  1.4       +6 -6      xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java
  
  Index: JstyleFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JstyleFormatter.java	2001/10/08 20:03:13	1.3
  +++ JstyleFormatter.java	2001/10/11 07:20:26	1.4
  @@ -7,11 +7,11 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming.java;
   
  -import jstyle.JSBeautifier;
  -import jstyle.JSFormatter;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  -import org.apache.cocoon.components.language.programming.CodeFormatter;
  -
  +import jstyle.JSBeautifier;
  +import jstyle.JSFormatter;
  +import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.cocoon.components.language.programming.CodeFormatter;
  +
   import java.io.*;
   
   /**
  @@ -20,7 +20,7 @@
    * beautifier. This implementation is very improvised...
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/10/11 07:20:26 $
    */
   public class JstyleFormatter extends AbstractLoggable implements CodeFormatter {
     /**
  
  
  
  1.4       +5 -5      xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java
  
  Index: JavascriptLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavascriptLanguage.java	2001/10/08 20:03:13	1.3
  +++ JavascriptLanguage.java	2001/10/11 07:20:26	1.4
  @@ -7,17 +7,17 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.programming.javascript;
   
  -import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.components.language.programming.java.JavaLanguage;
  -import org.mozilla.javascript.tools.jsc.Main;
  -
  +import org.apache.cocoon.components.language.LanguageException;
  +import org.apache.cocoon.components.language.programming.java.JavaLanguage;
  +import org.mozilla.javascript.tools.jsc.Main;
  +
   import java.io.File;
   
   /**
    * The compiled Javascript (Rhino) programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/10/11 07:20:26 $
    */
   public class JavascriptLanguage extends JavaLanguage
   {
  
  
  

----------------------------------------------------------------------
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


Mime
View raw message