cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.2/src/java/org/apache/cocoon Cocoon.java
Date Wed, 15 Oct 2003 20:09:51 GMT
cziegeler    2003/10/15 13:09:51

  Modified:    src/java/org/apache/cocoon/acting ResourceExistsAction.java
                        LocaleAction.java ClearCacheAction.java
                        HelloAction.java RequestParamAction.java
                        ClearPersistentStoreAction.java
                        SetCharacterEncodingAction.java
               src/java/org/apache/cocoon/transformation/helpers
                        PreemptiveLoaderAction.java
               src/java/org/apache/cocoon Cocoon.java
  Log:
  Syncing
  
  Revision  Changes    Path
  1.3       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java
  
  Index: ResourceExistsAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourceExistsAction.java	19 Mar 2003 06:19:38 -0000	1.2
  +++ ResourceExistsAction.java	15 Oct 2003 20:09:50 -0000	1.3
  @@ -72,7 +72,7 @@
    * @author <a href="mailto:balld@apache.org">Donald Ball</a>
    * @version CVS $Id$
    */
  -public class ResourceExistsAction extends ComposerAction implements ThreadSafe {
  +public class ResourceExistsAction extends ServiceableAction implements ThreadSafe {
   
       public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String
source, Parameters parameters) throws Exception {
           String urlstring = parameters.getParameter("url", source);
  
  
  
  1.2       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/acting/LocaleAction.java
  
  Index: LocaleAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/LocaleAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocaleAction.java	9 Mar 2003 00:08:39 -0000	1.1
  +++ LocaleAction.java	15 Oct 2003 20:09:50 -0000	1.2
  @@ -147,7 +147,7 @@
    * @author <a href="mailto:lassi.immonen@valkeus.com">Lassi Immonen</a>
    * @version CVS $Id$
    */
  -public class LocaleAction extends ComposerAction implements ThreadSafe, Configurable {
  +public class LocaleAction extends ServiceableAction implements ThreadSafe, Configurable
{
   
       /**
        * Constant representing the language parameter
  
  
  
  1.3       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/acting/ClearCacheAction.java
  
  Index: ClearCacheAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ClearCacheAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClearCacheAction.java	7 Aug 2003 13:28:50 -0000	1.2
  +++ ClearCacheAction.java	15 Oct 2003 20:09:50 -0000	1.3
  @@ -65,7 +65,7 @@
    * @author <a href="mailto:Michael.Melhem@managesoft.com">Michael Melhem</a>
    * @version CVS $Id$
    */
  -public class ClearCacheAction extends ComposerAction implements ThreadSafe {
  +public class ClearCacheAction extends ServiceableAction implements ThreadSafe {
   
       public Map act(Redirector redirector,
                       SourceResolver resolver,
  
  
  
  1.2       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/acting/HelloAction.java
  
  Index: HelloAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/HelloAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HelloAction.java	9 Mar 2003 00:08:39 -0000	1.1
  +++ HelloAction.java	15 Oct 2003 20:09:50 -0000	1.2
  @@ -67,7 +67,7 @@
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @version CVS $Id$
    */
  -public class HelloAction extends ComposerAction implements ThreadSafe {
  +public class HelloAction extends ServiceableAction implements ThreadSafe {
   
       /**
        * A simple Action that logs if the <code>Session</code> object
  
  
  
  1.3       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParamAction.java
  
  Index: RequestParamAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RequestParamAction.java	7 Aug 2003 12:37:04 -0000	1.2
  +++ RequestParamAction.java	15 Oct 2003 20:09:50 -0000	1.3
  @@ -117,7 +117,7 @@
    * @author <a href="mailto:tcurdt@dff.st">Torsten Curdt</a>
    * @version CVS $Id$
    */
  -public class RequestParamAction extends ComposerAction implements ThreadSafe {
  +public class RequestParamAction extends ServiceableAction implements ThreadSafe {
   
       public final static String MAP_URI         = "requestURI";
       public final static String MAP_QUERY       = "requestQuery";
  
  
  
  1.2       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
  
  Index: ClearPersistentStoreAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClearPersistentStoreAction.java	9 Mar 2003 00:08:38 -0000	1.1
  +++ ClearPersistentStoreAction.java	15 Oct 2003 20:09:50 -0000	1.2
  @@ -64,7 +64,7 @@
    * @author <a href="mailto:g-froehlich@gmx.de">Gerhard Froehlich</a>
    * @version CVS $Id$
    */
  -public class ClearPersistentStoreAction extends ComposerAction implements ThreadSafe {
  +public class ClearPersistentStoreAction extends ServiceableAction implements ThreadSafe
{
   
       public Map act(Redirector redirector,
                       SourceResolver resolver,
  
  
  
  1.3       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
  
  Index: SetCharacterEncodingAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetCharacterEncodingAction.java	16 Mar 2003 17:49:11 -0000	1.2
  +++ SetCharacterEncodingAction.java	15 Oct 2003 20:09:50 -0000	1.3
  @@ -77,7 +77,7 @@
    * @author <a href="mailto:miyabe@jzf.co.jp">MIYABE Tatsuhiko</a>
    * @version CVS $Id$
    */
  -public class SetCharacterEncodingAction extends ComposerAction implements ThreadSafe, Parameterizable
{
  +public class SetCharacterEncodingAction extends ServiceableAction implements ThreadSafe,
Parameterizable {
       private String global_form_encoding = null;
   
       public void parameterize(Parameters parameters)
  
  
  
  1.3       +2 -3      cocoon-2.2/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java
  
  Index: PreemptiveLoaderAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PreemptiveLoaderAction.java	11 Mar 2003 16:33:37 -0000	1.2
  +++ PreemptiveLoaderAction.java	15 Oct 2003 20:09:51 -0000	1.3
  @@ -54,7 +54,6 @@
   
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.acting.ComposerAction;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.SourceResolver;
   
  @@ -66,7 +65,7 @@
    *  @since   2.1
    */
   public class PreemptiveLoaderAction 
  -    extends ComposerAction
  +    extends ServiceableAction
       implements ThreadSafe {
   
       /**
  
  
  
  1.18      +16 -6     cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Cocoon.java	8 Oct 2003 20:18:34 -0000	1.17
  +++ Cocoon.java	15 Oct 2003 20:09:51 -0000	1.18
  @@ -66,6 +66,7 @@
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   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.component.Composable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -101,6 +102,7 @@
   import org.apache.excalibur.instrument.InstrumentManageable;
   import org.apache.excalibur.instrument.InstrumentManager;
   import org.apache.excalibur.source.Source;
  +import org.apache.excalibur.source.SourceResolver;
   import org.apache.excalibur.source.impl.URLSource;
   import org.apache.excalibur.xml.impl.XercesParser;
   import org.apache.excalibur.xml.sax.SAXParser;
  @@ -165,8 +167,11 @@
       private volatile int activeRequestCount = 0;
   
       /** the Processor if it is ThreadSafe */
  -    private Processor threadSafeProcessor = null;
  +    private Processor threadSafeProcessor;
   
  +    /** The source resolver */
  +    protected SourceResolver sourceResolver;
  +    
       /**
        * Creates a new <code>Cocoon</code> instance.
        *
  @@ -183,7 +188,8 @@
        *
        * @param manager the parent component manager. May be <code>null</code>
        */
  -    public void compose(ComponentManager manager) {
  +    public void compose(ComponentManager manager)
  +    throws ComponentException {
           this.parentComponentManager = manager;
       }
   
  @@ -340,6 +346,7 @@
               this.componentManager.release(processor);
           }
   
  +        this.sourceResolver = (SourceResolver)this.componentManager.lookup(SourceResolver.ROLE);
       }
   
       /** Dump System Properties */
  @@ -505,8 +512,11 @@
               this.componentManager.release(this.threadSafeProcessor);
               this.threadSafeProcessor = null;
               
  +            this.componentManager.release(this.sourceResolver);
  +            this.sourceResolver = null;
  +
               ContainerUtil.dispose(this.componentManager);
  -            this.componentManager = null;
  +            this.componentManager = null;            
           }
           
           this.context = null;
  @@ -738,7 +748,7 @@
               }
   
               programGenerator = (ProgramGenerator) this.componentManager.lookup(ProgramGenerator.ROLE);
  -            source = environment.resolveURI(fileName);
  +            source = this.sourceResolver.resolveURI(fileName);
               CompiledComponent xsp = programGenerator.load(this.componentManager,
                       source,
                       markupLanguage, programmingLanguage, environment);
  @@ -746,7 +756,7 @@
                   getLogger().debug("XSP generation complete:" + xsp);
               }
           } finally {
  -            environment.release(source);
  +            this.sourceResolver.release(source);
               this.componentManager.release(programGenerator);
           }
       }
  
  
  

Mime
View raw message