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/scratchpad/src/org/apache/cocoon/sunshine/xml XMLUtil.java
Date Fri, 07 Jun 2002 09:34:27 GMT
cziegeler    2002/06/07 02:34:27

  Modified:    src/java/org/apache/cocoon Tag: cocoon_2_0_3_branch
                        Cocoon.java Main.java cocoon.roles
               src/java/org/apache/cocoon/acting Tag: cocoon_2_0_3_branch
                        ServerPagesAction.java
               src/java/org/apache/cocoon/components Tag:
                        cocoon_2_0_3_branch CocoonComponentManager.java
               src/java/org/apache/cocoon/components/language/generator
                        Tag: cocoon_2_0_3_branch GeneratorSelector.java
               src/java/org/apache/cocoon/components/language/programming
                        Tag: cocoon_2_0_3_branch Program.java
               src/java/org/apache/cocoon/components/language/programming/java
                        Tag: cocoon_2_0_3_branch JavaProgram.java
               src/java/org/apache/cocoon/components/language/programming/javascript
                        Tag: cocoon_2_0_3_branch JavascriptProgram.java
               src/java/org/apache/cocoon/components/source Tag:
                        cocoon_2_0_3_branch AbstractStreamSource.java
                        URLSource.java
               src/java/org/apache/cocoon/environment Tag:
                        cocoon_2_0_3_branch AbstractEnvironment.java
                        Environment.java SourceResolver.java
                        URLFactorySourceResolver.java
               src/java/org/apache/cocoon/sitemap Tag: cocoon_2_0_3_branch
                        Handler.java
               src/java/org/apache/cocoon/transformation Tag:
                        cocoon_2_0_3_branch AbstractSAXTransformer.java
               src/java/org/apache/cocoon/transformation/helpers Tag:
                        cocoon_2_0_3_branch ParametersRecorder.java
               src/scratchpad/src/org/apache/cocoon/sunshine/components
                        Tag: cocoon_2_0_3_branch
                        AbstractSunShineComponent.java
               src/scratchpad/src/org/apache/cocoon/sunshine/connector Tag:
                        cocoon_2_0_3_branch Resource.java
                        ResourceConnector.java ResourceConnectorImpl.java
                        XMLLoader.java XMLSaver.java
               src/scratchpad/src/org/apache/cocoon/sunshine/context Tag:
                        cocoon_2_0_3_branch RequestSessionContext.java
                        ResponseSessionContext.java SessionContext.java
                        SimpleSessionContext.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise Tag:
                        cocoon_2_0_3_branch ApplicationHandler.java
                        Handler.java SunRise.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/acting
                        Tag: cocoon_2_0_3_branch LoginAction.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/context
                        Tag: cocoon_2_0_3_branch SessionContextImpl.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot Tag:
                        cocoon_2_0_3_branch SunSpot.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context
                        Tag: cocoon_2_0_3_branch SessionContextImpl.java
                        SessionContextProviderImpl.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/sunlet
                        Tag: cocoon_2_0_3_branch SunLetThread.java
                        Sunlet.java
               src/scratchpad/src/org/apache/cocoon/sunshine/transformation
                        Tag: cocoon_2_0_3_branch
                        AbstractSunShineTransformer.java
                        SunShineConnectTransformer.java
                        SunShinePostTransformer.java
                        SunShinePreTransformer.java
               src/scratchpad/src/org/apache/cocoon/sunshine/xml Tag:
                        cocoon_2_0_3_branch XMLUtil.java
  Added:       lib/core Tag: cocoon_2_0_3_branch
                        avalon-excalibur-20020603.jar
                        avalon-framework-20020603.jar logkit-20020529.jar
  Removed:     lib/core Tag: cocoon_2_0_3_branch
                        avalon-excalibur-20020402.jar
                        avalon-excalibur-scratchpad-20020408.jar
                        avalon-framework-4.1.2.jar logkit-1.0.1.jar
  Log:
  Updated to latest excalibur for compatibility and removed experimental source resolving stuff which was only meant for 2.1
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +0 -0      xml-cocoon2/lib/core/avalon-excalibur-20020603.jar
  
  	<<Binary file>>
  
  
  1.1.2.1   +0 -0      xml-cocoon2/lib/core/avalon-framework-20020603.jar
  
  	<<Binary file>>
  
  
  1.1.2.1   +0 -0      xml-cocoon2/lib/core/logkit-20020529.jar
  
  	<<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.22.2.1  +1 -9      xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- Cocoon.java	8 Apr 2002 14:36:34 -0000	1.22
  +++ Cocoon.java	7 Jun 2002 09:34:22 -0000	1.22.2.1
  @@ -99,7 +99,7 @@
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a> (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Id: Cocoon.java,v 1.22 2002/04/08 14:36:34 cziegeler Exp $
  + * @version CVS $Id: Cocoon.java,v 1.22.2.1 2002/06/07 09:34:22 cziegeler Exp $
    */
   public class Cocoon
           extends AbstractLoggable
  @@ -146,9 +146,6 @@
       /** the Processor if it is ThreadSafe */
       private Processor threadSafeProcessor = null;
   
  -    /** The Source Resolver */
  -    private org.apache.avalon.excalibur.source.SourceResolver sourceResolver;
  -
       /**
        * Creates a new <code>Cocoon</code> instance.
        *
  @@ -287,7 +284,6 @@
               this.componentManager.release(processor);
           }
   
  -        this.sourceResolver = (org.apache.avalon.excalibur.source.SourceResolver)this.componentManager.lookup(org.apache.avalon.excalibur.source.SourceResolver.ROLE);
       }
   
       /** Dump System Properties */
  @@ -449,8 +445,6 @@
        */
       public void dispose() {
           this.componentManager.release(this.threadSafeProcessor);
  -        this.componentManager.release(this.sourceResolver);
  -        this.sourceResolver = null;
           this.componentManager.dispose();
           if (this.configurationFile != null) {
               this.configurationFile.recycle();
  @@ -571,7 +565,6 @@
               throw new IllegalStateException("You cannot process a Disposed Cocoon engine.");
           }
   
  -        environment.setSourceResolver( this.sourceResolver );
           try {
               if (this.getLogger().isDebugEnabled()) {
                   ++activeRequestCount;
  @@ -595,7 +588,6 @@
               if (this.getLogger().isDebugEnabled()) {
                   --activeRequestCount;
               }
  -            environment.setSourceResolver( null );
           }
       }
   
  
  
  
  1.17.2.1  +7 -5      xml-cocoon2/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- Main.java	22 Feb 2002 07:03:48 -0000	1.17
  +++ Main.java	7 Jun 2002 09:34:22 -0000	1.17.2.1
  @@ -94,7 +94,7 @@
    * Command line entry point.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Id: Main.java,v 1.17 2002/02/22 07:03:48 cziegeler Exp $
  + * @version CVS $Id: Main.java,v 1.17.2.1 2002/06/07 09:34:22 cziegeler Exp $
    */
   public class Main {
   
  @@ -124,11 +124,11 @@
           new CLOptionDescriptor("brokenLinkFile",
                                  CLOptionDescriptor.ARGUMENT_REQUIRED,
                                  BROKEN_LINK_FILE,
  -                               "send a list of broken links to a file (1 uri per line)"),
  +                               "send a list of broken links to a file (one URI per line)"),
           new CLOptionDescriptor("uriFile",
                                  CLOptionDescriptor.ARGUMENT_REQUIRED,
                                  URI_FILE,
  -                               "use a text file with uris to process (1 uri per line)"),
  +                               "use a text file with uris to process (one URI per line)"),
           new CLOptionDescriptor("help",
                                  CLOptionDescriptor.ARGUMENT_DISALLOWED,
                                  HELP_OPT,
  @@ -181,7 +181,7 @@
           new CLOptionDescriptor("configFile",
                                  CLOptionDescriptor.ARGUMENT_REQUIRED,
                                  CONFIG_FILE,
  -                               "specify alternate locatin of the configuration"
  +                               "specify alternate location of the configuration"
                                  + "file (default is ${contextDir}/cocoon.xconf)")
       };
   
  @@ -220,7 +220,6 @@
        * @exception Exception if an error occurs
        */
       public static void main(String[] args) throws Exception {
  -
           String destDir = Constants.DEFAULT_DEST_DIR;
           String contextDir = Constants.DEFAULT_CONTEXT_DIR;
           String configFile = null;
  @@ -381,6 +380,9 @@
                   } else {
                       log = logKitManager.getLogger("cocoon");
                   }
  +            } else {
  +                logKitManager = new DefaultLogKitManager(Hierarchy.getDefaultHierarchy());
  +                logKitManager.setLogger(log);
               }
               appContext.put(Constants.CONTEXT_CLASSPATH, getClassPath(contextDir));
               appContext.put(Constants.CONTEXT_WORK_DIR, work);
  
  
  
  1.18.2.1  +0 -8      xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- cocoon.roles	8 Apr 2002 14:36:34 -0000	1.18
  +++ cocoon.roles	7 Jun 2002 09:34:23 -0000	1.18.2.1
  @@ -110,14 +110,6 @@
           shorthand="source-handler"
           default-class="org.apache.cocoon.components.source.SourceHandlerImpl"/>
   
  -  <role name="org.apache.avalon.excalibur.source.SourceFactorySelector"
  -        shorthand="source-factories"
  -        default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
  -
  -  <role name="org.apache.avalon.excalibur.source.SourceResolver"
  -        shorthand="source-resolver"
  -        default-class="org.apache.avalon.excalibur.source.SourceResolverImpl"/>
  -
     <role name="org.apache.cocoon.components.sax.XMLSerializer"
           shorthand="xml-serializer"
           default-class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
  
  Index: ServerPagesAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- ServerPagesAction.java	22 Feb 2002 06:59:26 -0000	1.6
  +++ ServerPagesAction.java	7 Jun 2002 09:34:23 -0000	1.6.2.1
  @@ -105,7 +105,7 @@
    * </pre>
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Id: ServerPagesAction.java,v 1.6 2002/02/22 06:59:26 cziegeler Exp $
  + * @version CVS $Id: ServerPagesAction.java,v 1.6.2.1 2002/06/07 09:34:23 cziegeler Exp $
    */
   public class ServerPagesAction
           extends ConfigurableComposerAction
  @@ -128,7 +128,7 @@
                   this.manager,
                   null, // Context
                   null,  // RoleManager
  -                this.logKitManager  // LogKitManager
  +                null  // LogKitManager
               );
   
               this.generatorHandler.setLogger(getLogger());
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.1  +1 -60     xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
  
  Index: CocoonComponentManager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- CocoonComponentManager.java	8 Apr 2002 07:57:06 -0000	1.13
  +++ CocoonComponentManager.java	7 Jun 2002 09:34:23 -0000	1.13.2.1
  @@ -63,8 +63,6 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Environment;
   import java.net.MalformedURLException;
  -import org.apache.avalon.excalibur.source.Source;
  -import org.apache.avalon.excalibur.source.SourceResolver;
   
   import org.xml.sax.SAXException;
   
  @@ -72,21 +70,16 @@
    * Cocoon Component Manager.
    * This manager extends the <code>ExcaliburComponentManager</code>
    * by a special lifecycle handling for a RequestLifecycleComponent
  - * and by handling the lookup of the <code>SourceResolver</code> (in development)
    *
    * @author <a href="mailto:cziegeler@org.com">Carsten Ziegeler</a>
  - * @version CVS $Id: CocoonComponentManager.java,v 1.13 2002/04/08 07:57:06 cziegeler Exp $
  + * @version CVS $Id: CocoonComponentManager.java,v 1.13.2.1 2002/06/07 09:34:23 cziegeler Exp $
    */
   public final class CocoonComponentManager
   extends ExcaliburComponentManager
  -implements SourceResolver
   {
       /** The environment information */
       private static InheritableThreadLocal environmentStack = new InheritableThreadLocal();
   
  -    /** The configured <code>SourceResolver</code> */
  -    private SourceResolver sourceResolver;
  -
       /** Create the ComponentManager */
       public CocoonComponentManager()
       {
  @@ -158,13 +151,6 @@
        */
       public Component lookup( final String role )
       throws ComponentException {
  -        if ( role.equals(SourceResolver.ROLE) ) {
  -            if ( null == this.sourceResolver ) {
  -                this.sourceResolver = (SourceResolver) super.lookup( role );
  -            }
  -            return this;
  -        }
  -
           final Stack stack = (Stack)environmentStack.get();
           if ( null != stack && !stack.empty()) {
               final Object[] objects = (Object[])stack.peek();
  @@ -211,59 +197,14 @@
           if ( component instanceof RequestLifecycleComponent) {
               return;
           }
  -        if ( component == this ) {
  -            return;
  -        }
           super.release( component);
       }
   
       /**
  -     * Dispose
  -     */
  -    public void dispose() {
  -        if ( null != this.sourceResolver ) {
  -            super.release( this.sourceResolver );
  -            this.sourceResolver = null;
  -        }
  -        super.dispose();
  -    }
  -
  -    /**
        * Release a RequestLifecycleComponent
        */
       protected void releaseRLComponent( final Component component ) {
           super.release( component );
       }
   
  -    /**
  -     * Get a <code>Source</code> object.
  -     */
  -    public Source resolveURI(final String location)
  -    throws MalformedURLException, IOException, ComponentException {
  -        return this.resolveURI(location, null, null);
  -    }
  -
  -    /**
  -     * Get a <code>Source</code> object.
  -     */
  -    public Source resolveURI(final String location,
  -                             String baseURI,
  -                             final Map    parameters)
  -    throws MalformedURLException, IOException, ComponentException {
  -        if (baseURI == null) {
  -            final Stack stack = (Stack)environmentStack.get();
  -            if ( null != stack && !stack.empty()) {
  -                final Object[] objects = (Object[])stack.peek();
  -                baseURI = ((Environment)objects[0]).getContext().toExternalForm();
  -            }
  -        }
  -        return this.sourceResolver.resolveURI(location, baseURI, parameters);
  -    }
  -
  -    /**
  -     * Releases a resolved resource
  -     */
  -    public void release( final Source source ) {
  -        this.sourceResolver.release( source );
  -    }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.1   +23 -6     xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
  
  Index: GeneratorSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- GeneratorSelector.java	28 Feb 2002 14:26:43 -0000	1.9
  +++ GeneratorSelector.java	7 Jun 2002 09:34:23 -0000	1.9.2.1
  @@ -53,7 +53,9 @@
   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.component.LogkitLoggerManager;
   import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -77,7 +79,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Id: GeneratorSelector.java,v 1.9 2002/02/28 14:26:43 vgritsenko Exp $
  + * @version CVS $Id: GeneratorSelector.java,v 1.9.2.1 2002/06/07 09:34:23 cziegeler Exp $
    */
   public class GeneratorSelector extends ExcaliburComponentSelector implements Disposable {
   
  @@ -88,7 +90,7 @@
       /** The component manager */
       protected ComponentManager manager;
   
  -    private LogKitManager logKitManager;
  +    private LogkitLoggerManager logKitManager;
   
       protected Context context;
   
  @@ -110,9 +112,24 @@
           this.roles = roleMgr;
       }
   
  -    public void setLogKitManager(LogKitManager logKitMgr) {
  -        super.setLogKitManager(logKitMgr);
  -        this.logKitManager = logKitMgr;
  +    /**
  +     * Configure the LogKitManager
  +     */
  +    public void setLogKitManager( final LogKitManager logkit ) {
  +        super.setLogKitManager(logkit);
  +        if( null == this.logKitManager ) {
  +             this.logKitManager = new LogkitLoggerManager( null, logkit );
  +        }
  +    }
  +
  +    /**
  +     * Configure the LoggerManager.
  +     */
  +    public void setLoggerManager( final LoggerManager logkit ) {
  +        super.setLoggerManager(logkit);
  +        if( null ==  this.logKitManager ) {
  +             this.logKitManager = new LogkitLoggerManager( logkit, null );
  +        }
       }
   
       public void compose (ComponentManager manager) throws ComponentException {
  @@ -166,7 +183,7 @@
           try {
               final ComponentHandler handler =
                       generator.getHandler(newManager, this.context, this.roles, this.logKitManager);
  -            handler.setLogger(getLogger());
  +            handler.setLogger(getLogkitLogger());
               handler.initialize();
               this.componentHandlers.put(hint, handler);
               if (getLogger().isDebugEnabled()) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +3 -3      xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/Program.java
  
  Index: Program.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/Program.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- Program.java	22 Feb 2002 07:00:09 -0000	1.2
  +++ Program.java	7 Jun 2002 09:34:23 -0000	1.2.2.1
  @@ -55,7 +55,7 @@
   
   import org.apache.avalon.excalibur.component.ComponentHandler;
   import org.apache.avalon.excalibur.component.RoleManager;
  -import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.excalibur.component.LogkitLoggerManager;
   
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   
  @@ -64,7 +64,7 @@
    * For compilable languages this is the wrapper for a Java Class object.
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Id: Program.java,v 1.2 2002/02/22 07:00:09 cziegeler Exp $
  + * @version CVS $Id: Program.java,v 1.2.2.1 2002/06/07 09:34:23 cziegeler Exp $
    */
   public interface Program {
   
  @@ -79,7 +79,7 @@
       ComponentHandler getHandler(ComponentManager manager,
                                   Context context,
                                   RoleManager roles,
  -                                LogKitManager logKitManager) throws Exception;
  +                                LogkitLoggerManager logKitManager) throws Exception;
   
       /**
        * Create new instance of the program.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +3 -3      xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java
  
  Index: JavaProgram.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- JavaProgram.java	22 Feb 2002 07:00:09 -0000	1.2
  +++ JavaProgram.java	7 Jun 2002 09:34:23 -0000	1.2.2.1
  @@ -56,7 +56,7 @@
   
   import org.apache.avalon.excalibur.component.ComponentHandler;
   import org.apache.avalon.excalibur.component.RoleManager;
  -import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.excalibur.component.LogkitLoggerManager;
   
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.programming.Program;
  @@ -66,7 +66,7 @@
    * It wraps Java Class object.
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  - * @version CVS $Id: JavaProgram.java,v 1.2 2002/02/22 07:00:09 cziegeler Exp $
  + * @version CVS $Id: JavaProgram.java,v 1.2.2.1 2002/06/07 09:34:23 cziegeler Exp $
    */
   public class JavaProgram implements Program {
   
  @@ -83,7 +83,7 @@
       public ComponentHandler getHandler(ComponentManager manager,
                                          Context context,
                                          RoleManager roles,
  -                                       LogKitManager logKitManager)
  +                                       LogkitLoggerManager logKitManager)
               throws Exception {
   
           return ComponentHandler.getComponentHandler(
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +8 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java
  
  Index: JavascriptProgram.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- JavascriptProgram.java	22 Feb 2002 07:00:10 -0000	1.3
  +++ JavascriptProgram.java	7 Jun 2002 09:34:23 -0000	1.3.2.1
  @@ -57,7 +57,7 @@
   
   import org.apache.avalon.excalibur.component.ComponentHandler;
   import org.apache.avalon.excalibur.component.RoleManager;
  -import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.excalibur.component.LogkitLoggerManager;
   
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.programming.Program;
  @@ -66,6 +66,12 @@
   import java.util.Collection;
   import java.util.Iterator;
   
  +/**
  + * This class represents program in the Javascript language.
  + *
  + * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  + * @version CVS $Id: JavascriptProgram.java,v 1.3.2.1 2002/06/07 09:34:23 cziegeler Exp $
  + */
   public class JavascriptProgram implements Program {
   
       protected File file;
  @@ -97,7 +103,7 @@
       public ComponentHandler getHandler(ComponentManager manager,
                                          Context context,
                                          RoleManager roles,
  -                                       LogKitManager logKitManager)
  +                                       LogkitLoggerManager logKitManager)
               throws Exception {
   
           return ComponentHandler.getComponentHandler(
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +9 -9      xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractStreamSource.java
  
  Index: AbstractStreamSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractStreamSource.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- AbstractStreamSource.java	14 Mar 2002 12:55:10 -0000	1.2
  +++ AbstractStreamSource.java	7 Jun 2002 09:34:23 -0000	1.2.2.1
  @@ -56,8 +56,8 @@
   package org.apache.cocoon.components.source;
   
   import org.apache.avalon.excalibur.xml.Parser;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  -import org.apache.avalon.excalibur.source.SourceUtil;
  +import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceUtil;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
  @@ -100,7 +100,7 @@
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: AbstractStreamSource.java,v 1.2 2002/03/14 12:55:10 sylvain Exp $
  + * @version $Id: AbstractStreamSource.java,v 1.2.2.1 2002/06/07 09:34:23 cziegeler Exp $
    */
   
   public abstract class AbstractStreamSource extends AbstractLoggable
  @@ -141,7 +141,7 @@
       protected AbstractStreamSource(ComponentManager manager) {
           this.manager = manager;
       }
  -    
  +
       /**
        * Does this source contain HTML ? If true, JTidy will be used (if available) to
        * parse the input as XML.
  @@ -157,7 +157,7 @@
        * Return a new <code>InputSource</code> object
        */
       public InputSource getInputSource() throws IOException, ProcessingException {
  -        
  +
           InputStream stream = this.getInputStream();
           if (jtidyClass != null && isHTMLContent()) {
               try {
  @@ -214,7 +214,7 @@
               if (parser != null) this.manager.release(parser);
           }
       }
  -    
  +
       /**
        * Override this method to set the Content Length
        *
  @@ -230,7 +230,7 @@
       public long getLastModified() {
         return 0;
       }
  -    
  +
       /**
        * Returns <code>true</code> if <code>getInputStream()</code> succeeds.
        * Subclasses can provide a more efficient implementation.
  @@ -244,13 +244,13 @@
               return false;
           }
       }
  -    
  +
       /**
        * To be overriden in concrete subclasses if needed.
        */
       public void recycle() {
       }
  -    
  +
       /**
        * To be overriden in concrete subclasses if needed.
        */
  
  
  
  1.13.2.2  +3 -3      xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java
  
  Index: URLSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- URLSource.java	3 Jun 2002 06:27:13 -0000	1.13.2.1
  +++ URLSource.java	7 Jun 2002 09:34:23 -0000	1.13.2.2
  @@ -51,8 +51,8 @@
   package org.apache.cocoon.components.source;
   
   import org.apache.avalon.excalibur.xml.Parser;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  -import org.apache.avalon.excalibur.source.SourceUtil;
  +import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceUtil;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  @@ -88,7 +88,7 @@
    * Description of a source which is described by an URL.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: URLSource.java,v 1.13.2.1 2002/06/03 06:27:13 cziegeler Exp $
  + * @version CVS $Id: URLSource.java,v 1.13.2.2 2002/06/07 09:34:23 cziegeler Exp $
    */
   
   public class URLSource extends AbstractStreamSource {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.2  +1 -37     xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- AbstractEnvironment.java	19 Apr 2002 23:54:21 -0000	1.12.2.1
  +++ AbstractEnvironment.java	7 Jun 2002 09:34:24 -0000	1.12.2.2
  @@ -70,7 +70,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: AbstractEnvironment.java,v 1.12.2.1 2002/04/19 23:54:21 vgritsenko Exp $
  + * @version CVS $Id: AbstractEnvironment.java,v 1.12.2.2 2002/06/07 09:34:24 cziegeler Exp $
    */
   public abstract class AbstractEnvironment extends AbstractLoggable implements Environment {
   
  @@ -98,9 +98,6 @@
       /** The source handler for the current environment */
       protected SourceHandler sourceHandler;
   
  -    /** The real source resolver */
  -    protected org.apache.avalon.excalibur.source.SourceResolver sourceResolver;
  -
       /** The attributes */
       private Map attributes = new HashMap();
   
  @@ -163,13 +160,6 @@
           this.sourceHandler = sourceHandler;
       }
   
  -    /**
  -     * Set the <code>SourceResolver</code>
  -     */
  -    public void setSourceResolver(org.apache.avalon.excalibur.source.SourceResolver resolver) {
  -        this.sourceResolver = resolver;
  -    }
  -
       // Sitemap methods
   
       /**
  @@ -413,32 +403,6 @@
       */
       public boolean tryResetResponse() {
           return false;
  -    }
  -
  -    /**
  -     * Get a <code>Source</code> object.
  -     */
  -    public org.apache.avalon.excalibur.source.Source resolveURI(final String location)
  -    throws MalformedURLException, IOException, ComponentException
  -    {
  -        return this.resolveURI(location, null, null);
  -    }
  -
  -    /**
  -     * Get a <code>Source</code> object.
  -     */
  -    public org.apache.avalon.excalibur.source.Source resolveURI(final String location,
  -                                                                String baseURI,
  -                                                                final Map    parameters)
  -    throws MalformedURLException, IOException, ComponentException {
  -        return this.sourceResolver.resolveURI(location, baseURI, parameters);
  -    }
  -
  -    /**
  -     * Releases a resolved resource
  -     */
  -    public void release( final org.apache.avalon.excalibur.source.Source source ) {
  -        this.sourceResolver.release( source );
       }
   
   }
  
  
  
  1.6.2.1   +1 -6      xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- Environment.java	8 Apr 2002 14:36:34 -0000	1.6
  +++ Environment.java	7 Jun 2002 09:34:24 -0000	1.6.2.1
  @@ -63,7 +63,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: Environment.java,v 1.6 2002/04/08 14:36:34 cziegeler Exp $
  + * @version CVS $Id: Environment.java,v 1.6.2.1 2002/06/07 09:34:24 cziegeler Exp $
    */
   
   public interface Environment extends SourceResolver {
  @@ -77,11 +77,6 @@
        * Set the <code>SourceHandler</code> for the current request
        */
       void setSourceHandler(SourceHandler sourceHandler);
  -
  -    /**
  -     * Set the <code>SourceResolver</code>
  -     */
  -    void setSourceResolver(org.apache.avalon.excalibur.source.SourceResolver resolver);
   
       /**
        * Get the URI to process. The prefix is stripped off.
  
  
  
  1.5.2.1   +2 -3      xml-cocoon2/src/java/org/apache/cocoon/environment/SourceResolver.java
  
  Index: SourceResolver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/SourceResolver.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- SourceResolver.java	8 Apr 2002 12:28:24 -0000	1.5
  +++ SourceResolver.java	7 Jun 2002 09:34:24 -0000	1.5.2.1
  @@ -58,11 +58,10 @@
    * Base interface for resolving a source by system identifiers.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: SourceResolver.java,v 1.5 2002/04/08 12:28:24 cziegeler Exp $
  + * @version CVS $Id: SourceResolver.java,v 1.5.2.1 2002/06/07 09:34:24 cziegeler Exp $
    */
   
  -public interface SourceResolver
  -extends org.apache.avalon.excalibur.source.SourceResolver {
  +public interface SourceResolver {
   
       /**
        * Resolve the source.
  
  
  
  1.5.2.1   +4 -4      xml-cocoon2/src/java/org/apache/cocoon/environment/URLFactorySourceResolver.java
  
  Index: URLFactorySourceResolver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/URLFactorySourceResolver.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- URLFactorySourceResolver.java	8 Apr 2002 12:28:24 -0000	1.5
  +++ URLFactorySourceResolver.java	7 Jun 2002 09:34:24 -0000	1.5.2.1
  @@ -66,7 +66,7 @@
    * A <code>SourceResolver</code> based on a <code>URLFactory</code>.
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Id: URLFactorySourceResolver.java,v 1.5 2002/04/08 12:28:24 cziegeler Exp $
  + * @version CVS $Id: URLFactorySourceResolver.java,v 1.5.2.1 2002/06/07 09:34:24 cziegeler Exp $
    */
   
   public class URLFactorySourceResolver implements SourceResolver {
  @@ -112,7 +112,7 @@
       /**
        * Get a <code>Source</code> object.
        */
  -    public org.apache.avalon.excalibur.source.Source resolveURI(final String location)
  +    public org.apache.excalibur.source.Source resolveURI(final String location)
       throws MalformedURLException, IOException, ComponentException
       {
           return this.resolveURI(location, null, null);
  @@ -121,7 +121,7 @@
       /**
        * Get a <code>Source</code> object.
        */
  -    public org.apache.avalon.excalibur.source.Source resolveURI(final String location,
  +    public org.apache.excalibur.source.Source resolveURI(final String location,
                                                                   String baseURI,
                                                                   final Map    parameters)
       throws MalformedURLException, IOException, ComponentException {
  @@ -131,7 +131,7 @@
       /**
        * Releases a resolved resource
        */
  -    public void release( final org.apache.avalon.excalibur.source.Source source ) {
  +    public void release( final org.apache.excalibur.source.Source source ) {
           throw new RuntimeException("URLFactorySourceResolver.release() is not implemented yet.");
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.1  +4 -4      xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/Handler.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- Handler.java	8 Apr 2002 12:28:24 -0000	1.14
  +++ Handler.java	7 Jun 2002 09:34:24 -0000	1.14.2.1
  @@ -86,7 +86,7 @@
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Id: Handler.java,v 1.14 2002/04/08 12:28:24 cziegeler Exp $
  + * @version CVS $Id: Handler.java,v 1.14.2.1 2002/06/07 09:34:24 cziegeler Exp $
    */
   public class Handler extends AbstractLoggable
   implements Runnable, Contextualizable, Composable, Processor, Disposable, SourceResolver {
  @@ -357,7 +357,7 @@
       /**
        * Get a <code>Source</code> object.
        */
  -    public org.apache.avalon.excalibur.source.Source resolveURI(final String location)
  +    public org.apache.excalibur.source.Source resolveURI(final String location)
       throws MalformedURLException, IOException, ComponentException
       {
           return this.resolveURI(location, null, null);
  @@ -366,7 +366,7 @@
       /**
        * Get a <code>Source</code> object.
        */
  -    public org.apache.avalon.excalibur.source.Source resolveURI(final String location,
  +    public org.apache.excalibur.source.Source resolveURI(final String location,
                                                                   String baseURI,
                                                                   final Map    parameters)
       throws MalformedURLException, IOException, ComponentException {
  @@ -376,7 +376,7 @@
       /**
        * Releases a resolved resource
        */
  -    public void release( final org.apache.avalon.excalibur.source.Source source ) {
  +    public void release( final org.apache.excalibur.source.Source source ) {
           throw new RuntimeException("Handler.release() is not implemented yet.");
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
  
  Index: AbstractSAXTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- AbstractSAXTransformer.java	5 Apr 2002 10:59:12 -0000	1.2
  +++ AbstractSAXTransformer.java	7 Jun 2002 09:34:24 -0000	1.2.2.1
  @@ -53,7 +53,7 @@
   import java.io.*;
   import java.util.*;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -124,7 +124,7 @@
    *
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: AbstractSAXTransformer.java,v 1.2 2002/04/05 10:59:12 cziegeler Exp $
  + * @version CVS $Id: AbstractSAXTransformer.java,v 1.2.2.1 2002/06/07 09:34:24 cziegeler Exp $
   */
   public abstract class AbstractSAXTransformer
   extends AbstractTransformer
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
  
  Index: ParametersRecorder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- ParametersRecorder.java	2 Apr 2002 14:13:34 -0000	1.1
  +++ ParametersRecorder.java	7 Jun 2002 09:34:24 -0000	1.1.2.1
  @@ -53,7 +53,7 @@
   import java.util.Iterator;
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.parameters.Parameters;
   
   import org.xml.sax.Attributes;
  @@ -67,7 +67,7 @@
    * <partwo>value_two<partwo>
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: ParametersRecorder.java,v 1.1 2002/04/02 14:13:34 cziegeler Exp $
  + * @version CVS $Id: ParametersRecorder.java,v 1.1.2.1 2002/06/07 09:34:24 cziegeler Exp $
   */
   public final class ParametersRecorder
   extends NOPRecorder {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/components/Attic/AbstractSunShineComponent.java
  
  Index: AbstractSunShineComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/components/Attic/AbstractSunShineComponent.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- AbstractSunShineComponent.java	22 Feb 2002 06:57:17 -0000	1.2
  +++ AbstractSunShineComponent.java	7 Jun 2002 09:34:24 -0000	1.2.2.1
  @@ -51,7 +51,7 @@
   package org.apache.cocoon.sunshine.components;
   
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -77,7 +77,7 @@
    * The base class for all components
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: AbstractSunShineComponent.java,v 1.2 2002/02/22 06:57:17 cziegeler Exp $
  + * @version CVS $Id: AbstractSunShineComponent.java,v 1.2.2.1 2002/06/07 09:34:24 cziegeler Exp $
   */
   public abstract class AbstractSunShineComponent
   extends AbstractLoggable
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/Resource.java
  
  Index: Resource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/Resource.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- Resource.java	22 Feb 2002 06:57:17 -0000	1.3
  +++ Resource.java	7 Jun 2002 09:34:24 -0000	1.3.2.1
  @@ -52,7 +52,7 @@
   
   import java.io.IOException;
   import java.io.Serializable;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
  @@ -63,7 +63,7 @@
    * parameters.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: Resource.java,v 1.3 2002/02/22 06:57:17 cziegeler Exp $
  + * @version CVS $Id: Resource.java,v 1.3.2.1 2002/06/07 09:34:24 cziegeler Exp $
   */
   public final class Resource
   implements Serializable {
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/ResourceConnector.java
  
  Index: ResourceConnector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/ResourceConnector.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ResourceConnector.java	22 Feb 2002 06:57:17 -0000	1.2
  +++ ResourceConnector.java	7 Jun 2002 09:34:24 -0000	1.2.2.1
  @@ -54,7 +54,7 @@
   
   import org.w3c.dom.DocumentFragment;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  @@ -70,7 +70,7 @@
    *  identifies the resource itself (filename, http-address etc).
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: ResourceConnector.java,v 1.2 2002/02/22 06:57:17 cziegeler Exp $
  + * @version CVS $Id: ResourceConnector.java,v 1.2.2.1 2002/06/07 09:34:24 cziegeler Exp $
   */
   public interface ResourceConnector
   extends Component {
  
  
  
  1.4.2.2   +3 -3      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/ResourceConnectorImpl.java
  
  Index: ResourceConnectorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/ResourceConnectorImpl.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- ResourceConnectorImpl.java	3 Jun 2002 06:27:13 -0000	1.4.2.1
  +++ ResourceConnectorImpl.java	7 Jun 2002 09:34:24 -0000	1.4.2.2
  @@ -55,8 +55,8 @@
   import java.util.*;
   
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  -import org.apache.avalon.excalibur.source.SourceUtil;
  +import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceUtil;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -98,7 +98,7 @@
    * The Component for loading and saving xml to external resource connectors.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: ResourceConnectorImpl.java,v 1.4.2.1 2002/06/03 06:27:13 cziegeler Exp $
  + * @version CVS $Id: ResourceConnectorImpl.java,v 1.4.2.2 2002/06/07 09:34:24 cziegeler Exp $
   */
   public final class ResourceConnectorImpl
   extends AbstractLoggable
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/XMLLoader.java
  
  Index: XMLLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/XMLLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- XMLLoader.java	22 Feb 2002 06:57:17 -0000	1.2
  +++ XMLLoader.java	7 Jun 2002 09:34:24 -0000	1.2.2.1
  @@ -51,7 +51,7 @@
   package org.apache.cocoon.sunshine.connector;
   
   import java.util.Map;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.w3c.dom.DocumentFragment;
   
   import org.apache.cocoon.ProcessingException;
  @@ -60,7 +60,7 @@
    * Interface for loading xml - NOT USED YET
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: XMLLoader.java,v 1.2 2002/02/22 06:57:17 cziegeler Exp $
  + * @version CVS $Id: XMLLoader.java,v 1.2.2.1 2002/06/07 09:34:24 cziegeler Exp $
   */
   public interface XMLLoader {
   
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/XMLSaver.java
  
  Index: XMLSaver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/connector/Attic/XMLSaver.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- XMLSaver.java	22 Feb 2002 06:57:17 -0000	1.2
  +++ XMLSaver.java	7 Jun 2002 09:34:24 -0000	1.2.2.1
  @@ -52,7 +52,7 @@
   
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.w3c.dom.DocumentFragment;
   
   import org.apache.cocoon.ProcessingException;
  @@ -61,7 +61,7 @@
    * Interface for saving xml - NOT USED YET
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: XMLSaver.java,v 1.2 2002/02/22 06:57:17 cziegeler Exp $
  + * @version CVS $Id: XMLSaver.java,v 1.2.2.1 2002/06/07 09:34:24 cziegeler Exp $
   */
   public interface XMLSaver {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/RequestSessionContext.java
  
  Index: RequestSessionContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/RequestSessionContext.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- RequestSessionContext.java	11 Mar 2002 11:15:26 -0000	1.4
  +++ RequestSessionContext.java	7 Jun 2002 09:34:25 -0000	1.4.2.1
  @@ -54,7 +54,7 @@
   import java.util.*;
   
   import org.apache.avalon.excalibur.xml.Parser;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.cocoon.ProcessingException;
  @@ -145,7 +145,7 @@
    *  - getLocales()
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: RequestSessionContext.java,v 1.4 2002/03/11 11:15:26 cziegeler Exp $
  + * @version CVS $Id: RequestSessionContext.java,v 1.4.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class RequestSessionContext
   implements SessionContext {
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/ResponseSessionContext.java
  
  Index: ResponseSessionContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/ResponseSessionContext.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ResponseSessionContext.java	22 Feb 2002 06:57:17 -0000	1.2
  +++ ResponseSessionContext.java	7 Jun 2002 09:34:25 -0000	1.2.2.1
  @@ -53,7 +53,7 @@
   import java.io.IOException;
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.ProcessingException;
  @@ -92,7 +92,7 @@
    * both have the same effect.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: ResponseSessionContext.java,v 1.2 2002/02/22 06:57:17 cziegeler Exp $
  + * @version CVS $Id: ResponseSessionContext.java,v 1.2.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class ResponseSessionContext
   implements SessionContext {
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/SessionContext.java
  
  Index: SessionContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/SessionContext.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- SessionContext.java	22 Feb 2002 06:57:17 -0000	1.2
  +++ SessionContext.java	7 Jun 2002 09:34:25 -0000	1.2.2.1
  @@ -61,7 +61,7 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.ext.LexicalHandler;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.SourceResolver;
  @@ -78,7 +78,7 @@
    *  As this context is used in a web context, all methods must be synchronized.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SessionContext.java,v 1.2 2002/02/22 06:57:17 cziegeler Exp $
  + * @version CVS $Id: SessionContext.java,v 1.2.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public interface SessionContext
   extends Serializable {
  
  
  
  1.3.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/SimpleSessionContext.java
  
  Index: SimpleSessionContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/Attic/SimpleSessionContext.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- SimpleSessionContext.java	11 Mar 2002 11:15:26 -0000	1.3
  +++ SimpleSessionContext.java	7 Jun 2002 09:34:25 -0000	1.3.2.1
  @@ -69,7 +69,7 @@
   import org.apache.xml.utils.PrefixResolverDefault;
   import org.apache.xpath.objects.XObject;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
  @@ -83,7 +83,7 @@
    *  This is a simple implementation of the session context.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SimpleSessionContext.java,v 1.3 2002/03/11 11:15:26 cziegeler Exp $
  + * @version CVS $Id: SimpleSessionContext.java,v 1.3.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class SimpleSessionContext
   implements SessionContext {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/ApplicationHandler.java
  
  Index: ApplicationHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/ApplicationHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- ApplicationHandler.java	13 Mar 2002 15:45:30 -0000	1.3
  +++ ApplicationHandler.java	7 Jun 2002 09:34:25 -0000	1.3.2.1
  @@ -52,7 +52,7 @@
   
   import java.io.IOException;
   import java.util.*;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   
  @@ -67,7 +67,7 @@
    * inside a handler configuration.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: ApplicationHandler.java,v 1.3 2002/03/13 15:45:30 cziegeler Exp $
  + * @version CVS $Id: ApplicationHandler.java,v 1.3.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class ApplicationHandler
   implements java.io.Serializable {
  
  
  
  1.4.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/Handler.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- Handler.java	2 Apr 2002 06:35:00 -0000	1.4
  +++ Handler.java	7 Jun 2002 09:34:25 -0000	1.4.2.1
  @@ -53,7 +53,7 @@
   import java.io.IOException;
   import java.util.*;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   
  @@ -68,7 +68,7 @@
    * The sunRise Handler.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: Handler.java,v 1.4 2002/04/02 06:35:00 cziegeler Exp $
  + * @version CVS $Id: Handler.java,v 1.4.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class Handler
   implements java.io.Serializable {
  
  
  
  1.5.2.1   +3 -3      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/SunRise.java
  
  Index: SunRise.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/SunRise.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- SunRise.java	2 Apr 2002 14:23:44 -0000	1.5
  +++ SunRise.java	7 Jun 2002 09:34:25 -0000	1.5.2.1
  @@ -53,8 +53,8 @@
   import java.io.IOException;
   import java.util.*;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  -import org.apache.avalon.excalibur.source.SourceUtil;
  +import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceUtil;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -97,7 +97,7 @@
    *  This is the basis sunShine component.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SunRise.java,v 1.5 2002/04/02 14:23:44 cziegeler Exp $
  + * @version CVS $Id: SunRise.java,v 1.5.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class SunRise
   extends AbstractSunShineComponent
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/acting/Attic/LoginAction.java
  
  Index: LoginAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/acting/Attic/LoginAction.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- LoginAction.java	22 Feb 2002 06:57:18 -0000	1.2
  +++ LoginAction.java	7 Jun 2002 09:34:25 -0000	1.2.2.1
  @@ -54,7 +54,7 @@
   import java.util.HashMap;
   import java.util.Iterator;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -74,7 +74,7 @@
    *  This action logs the current user into a given handler
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: LoginAction.java,v 1.2 2002/02/22 06:57:18 cziegeler Exp $
  + * @version CVS $Id: LoginAction.java,v 1.2.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class LoginAction
   extends ComposerAction
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/context/Attic/SessionContextImpl.java
  
  Index: SessionContextImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/context/Attic/SessionContextImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- SessionContextImpl.java	8 Apr 2002 14:36:09 -0000	1.3
  +++ SessionContextImpl.java	7 Jun 2002 09:34:25 -0000	1.3.2.1
  @@ -61,7 +61,7 @@
   import org.xml.sax.ContentHandler;
   import org.xml.sax.ext.LexicalHandler;
   import org.xml.sax.helpers.AttributesImpl;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
  @@ -75,7 +75,7 @@
   /**
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SessionContextImpl.java,v 1.3 2002/04/08 14:36:09 cziegeler Exp $
  + * @version CVS $Id: SessionContextImpl.java,v 1.3.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class SessionContextImpl
   implements SessionContext {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/Attic/SunSpot.java
  
  Index: SunSpot.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/Attic/SunSpot.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- SunSpot.java	2 Apr 2002 14:23:45 -0000	1.5
  +++ SunSpot.java	7 Jun 2002 09:34:25 -0000	1.5.2.1
  @@ -58,7 +58,7 @@
   import java.util.List;
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -105,7 +105,7 @@
    *  This is the basis sunSpot component
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SunSpot.java,v 1.5 2002/04/02 14:23:45 cziegeler Exp $
  + * @version CVS $Id: SunSpot.java,v 1.5.2.1 2002/06/07 09:34:25 cziegeler Exp $
   */
   public final class SunSpot
   extends AbstractSunShineComponent {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context/Attic/SessionContextImpl.java
  
  Index: SessionContextImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context/Attic/SessionContextImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- SessionContextImpl.java	11 Mar 2002 11:15:26 -0000	1.3
  +++ SessionContextImpl.java	7 Jun 2002 09:34:26 -0000	1.3.2.1
  @@ -66,7 +66,7 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.ObjectModelHelper;
  @@ -101,7 +101,7 @@
    * &lt;/configuration&gt;
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SessionContextImpl.java,v 1.3 2002/03/11 11:15:26 cziegeler Exp $
  + * @version CVS $Id: SessionContextImpl.java,v 1.3.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public final class SessionContextImpl
   implements SessionContext {
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context/Attic/SessionContextProviderImpl.java
  
  Index: SessionContextProviderImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context/Attic/SessionContextProviderImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- SessionContextProviderImpl.java	22 Feb 2002 06:57:19 -0000	1.2
  +++ SessionContextProviderImpl.java	7 Jun 2002 09:34:26 -0000	1.2.2.1
  @@ -54,7 +54,7 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
  @@ -75,7 +75,7 @@
    *  Context provider for the sunSpot context
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SessionContextProviderImpl.java,v 1.2 2002/02/22 06:57:19 cziegeler Exp $
  + * @version CVS $Id: SessionContextProviderImpl.java,v 1.2.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public final class SessionContextProviderImpl
   implements SessionContextProvider {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/sunlet/Attic/SunLetThread.java
  
  Index: SunLetThread.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/sunlet/Attic/SunLetThread.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- SunLetThread.java	11 Mar 2002 11:15:26 -0000	1.3
  +++ SunLetThread.java	7 Jun 2002 09:34:26 -0000	1.3.2.1
  @@ -60,7 +60,7 @@
   import org.xml.sax.ContentHandler;
   import org.xml.sax.ext.LexicalHandler;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentSelector;
  @@ -88,7 +88,7 @@
    * This is the thread for loading one sunlet in the background.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SunLetThread.java,v 1.3 2002/03/11 11:15:26 cziegeler Exp $
  + * @version CVS $Id: SunLetThread.java,v 1.3.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public final class SunLetThread implements Runnable {
   
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/sunlet/Attic/Sunlet.java
  
  Index: Sunlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/sunlet/Attic/Sunlet.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- Sunlet.java	22 Feb 2002 06:57:19 -0000	1.2
  +++ Sunlet.java	7 Jun 2002 09:34:26 -0000	1.2.2.1
  @@ -55,14 +55,14 @@
   import org.xml.sax.ContentHandler;
   import org.xml.sax.ext.LexicalHandler;
   import org.xml.sax.SAXException;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.cocoon.ProcessingException;
   
   /**
    * The sunLet interface
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: Sunlet.java,v 1.2 2002/02/22 06:57:19 cziegeler Exp $
  + * @version CVS $Id: Sunlet.java,v 1.2.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public interface Sunlet {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/AbstractSunShineTransformer.java
  
  Index: AbstractSunShineTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/AbstractSunShineTransformer.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- AbstractSunShineTransformer.java	2 Apr 2002 14:23:45 -0000	1.5
  +++ AbstractSunShineTransformer.java	7 Jun 2002 09:34:26 -0000	1.5.2.1
  @@ -53,7 +53,7 @@
   import java.io.*;
   import java.util.*;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -93,7 +93,7 @@
    *  This class is the basis for all sunShine transformers.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: AbstractSunShineTransformer.java,v 1.5 2002/04/02 14:23:45 cziegeler Exp $
  + * @version CVS $Id: AbstractSunShineTransformer.java,v 1.5.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public abstract class AbstractSunShineTransformer
   extends AbstractSAXTransformer {
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/SunShineConnectTransformer.java
  
  Index: SunShineConnectTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/SunShineConnectTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- SunShineConnectTransformer.java	22 Feb 2002 06:57:19 -0000	1.2
  +++ SunShineConnectTransformer.java	7 Jun 2002 09:34:26 -0000	1.2.2.1
  @@ -54,7 +54,7 @@
   import java.util.Map;
   import java.util.Properties;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.sunshine.connector.*;
  @@ -72,7 +72,7 @@
    * this class.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SunShineConnectTransformer.java,v 1.2 2002/02/22 06:57:19 cziegeler Exp $
  + * @version CVS $Id: SunShineConnectTransformer.java,v 1.2.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public abstract class SunShineConnectTransformer
   extends AbstractSunShineTransformer{
  
  
  
  1.2.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/SunShinePostTransformer.java
  
  Index: SunShinePostTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/SunShinePostTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- SunShinePostTransformer.java	22 Feb 2002 06:57:19 -0000	1.2
  +++ SunShinePostTransformer.java	7 Jun 2002 09:34:26 -0000	1.2.2.1
  @@ -53,7 +53,7 @@
   import java.io.IOException;
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.sunshine.SunShineConstants;
  @@ -74,7 +74,7 @@
    * implementation of the SunShineTransformer would be very unperformant.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SunShinePostTransformer.java,v 1.2 2002/02/22 06:57:19 cziegeler Exp $
  + * @version CVS $Id: SunShinePostTransformer.java,v 1.2.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public class SunShinePostTransformer
   extends SunShinePreTransformer {
  
  
  
  1.4.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/SunShinePreTransformer.java
  
  Index: SunShinePreTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/Attic/SunShinePreTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- SunShinePreTransformer.java	2 Apr 2002 14:23:45 -0000	1.4
  +++ SunShinePreTransformer.java	7 Jun 2002 09:34:26 -0000	1.4.2.1
  @@ -52,7 +52,7 @@
   
   import java.io.IOException;
   import java.util.Map;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.parameters.Parameters;
  @@ -73,7 +73,7 @@
    * pipeline.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: SunShinePreTransformer.java,v 1.4 2002/04/02 14:23:45 cziegeler Exp $
  + * @version CVS $Id: SunShinePreTransformer.java,v 1.4.2.1 2002/06/07 09:34:26 cziegeler Exp $
   */
   public class SunShinePreTransformer
   extends SunShineConnectTransformer {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.1   +2 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/xml/Attic/XMLUtil.java
  
  Index: XMLUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/xml/Attic/XMLUtil.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- XMLUtil.java	2 Apr 2002 14:13:35 -0000	1.8
  +++ XMLUtil.java	7 Jun 2002 09:34:27 -0000	1.8.2.1
  @@ -57,7 +57,7 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.xml.dom.DOMBuilder;
  -import org.apache.avalon.excalibur.source.SourceParameters;
  +import org.apache.excalibur.source.SourceParameters;
   import org.apache.xpath.XPathAPI;
   import org.w3c.dom.*;
   import org.w3c.dom.traversal.NodeIterator;
  @@ -95,7 +95,7 @@
    * @deprecated Do not use this class! We will provide a better solution for most methods soon.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: XMLUtil.java,v 1.8 2002/04/02 14:13:35 cziegeler Exp $
  + * @version CVS $Id: XMLUtil.java,v 1.8.2.1 2002/06/07 09:34:27 cziegeler Exp $
   */
   public final class XMLUtil {
   
  
  
  

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