bdelacretaz    2002/11/29 00:52:17

  Modified:    src/java/org/apache/cocoon/transformation Tag:
                        cocoon_2_0_3_branch XIncludeTransformer.java
               src/java/org/apache/cocoon/i18n Tag: cocoon_2_0_3_branch
                        XMLResourceBundle.java
               src/java/org/apache/cocoon/generation Tag:
                        cocoon_2_0_3_branch HTMLGenerator.java
               lib      Tag: cocoon_2_0_3_branch jars.xml
  Log:
  Use excalibur jars from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +2 -2      
xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- XIncludeTransformer.java  13 Mar 2002 16:28:02 -0000      1.11
  +++ XIncludeTransformer.java  29 Nov 2002 08:52:16 -0000      1.11.2.1
  @@ -351,6 +351,6 @@
   
       public void dispose()
       {
  -        this.manager.release(this.processor);
  +        this.manager.release((Component)this.processor);
       }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.2   +2 -2      
xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java
  
  Index: XMLResourceBundle.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- XMLResourceBundle.java    30 May 2002 11:56:46 -0000      1.7.2.1
  +++ XMLResourceBundle.java    29 Nov 2002 08:52:16 -0000      1.7.2.2
  @@ -122,7 +122,7 @@
   
       public void dispose()
       {
  -        this.manager.release(this.processor);
  +        this.manager.release((Component)this.processor);
           this.processor = null;
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.1  +3 -2      
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
  
  Index: HTMLGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- HTMLGenerator.java        21 Mar 2002 04:31:35 -0000      1.14
  +++ HTMLGenerator.java        29 Nov 2002 08:52:16 -0000      1.14.2.1
  @@ -51,6 +51,7 @@
   package org.apache.cocoon.generation;
   
   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.ComponentException;
   import org.apache.avalon.framework.parameters.Parameters;
  @@ -252,7 +253,7 @@
   
       public void dispose() {
           if (this.manager != null) {
  -            this.manager.release(this.processor);
  +            this.manager.release((Component)this.processor);
           }
           this.processor = null;
           super.dispose();
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.19 +148 -14   xml-cocoon2/lib/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
  retrieving revision 1.11.2.18
  retrieving revision 1.11.2.19
  diff -u -r1.11.2.18 -r1.11.2.19
  --- jars.xml  27 Nov 2002 06:15:53 -0000      1.11.2.18
  +++ jars.xml  29 Nov 2002 08:52:16 -0000      1.11.2.19
  @@ -8,37 +8,147 @@
    -->
   <jars>
    <file>
  -     <title>Avalon Excalibur</title>
  +     <title>Avalon Excalibur DataSource</title>
        <description>Part of jakarta-avalon, it is a set of classes and patterns that
  -       support high level server development. (This JAR has been compiled on Java 
1.3 to be run on JVM 1.3 or earlier.)
  -       The datasource package has been removed and is contained in a separate 
jar.</description>
  +       support high level server development. (This JAR has been compiled on Java 
1.3 to be run on JVM 1.3 or earlier.)</description>
        <used-by>Cocoon</used-by>
  -     <lib>core/jvm1.2/avalon-excalibur-vm12-20020705.jar</lib>
  +     <lib>core/jvm1.2/excalibur-datasource-vm12-20021121.jar</lib>
        <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
    </file>
    <file>
  -     <title>Avalon Excalibur</title>
  +     <title>Avalon Excalibur DataSource</title>
        <description>Part of jakarta-avalon, it is a set of classes and patterns that
  -       support high level server development. (This JAR has been compiled on Java 
1.4 to be run on JVM 1.4.)
  -       The datasource package has been removed and is contained in a separate 
jar.</description>
  +       support high level server development. (This JAR has been compiled on Java 
1.4 to be run on JVM 1.4.)</description>
        <used-by>Cocoon</used-by>
  -     <lib>core/jvm1.4/avalon-excalibur-vm14-20020705.jar</lib>
  +     <lib>core/jvm1.4/excalibur-datasource-vm14-20021121.jar</lib>
        <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
    </file>
    <file>
  -     <title>Avalon Excalibur DataSource</title>
  +     <title>Avalon Excalibur CLI</title>
        <description>Part of jakarta-avalon, it is a set of classes and patterns that
  -       support high level server development. (This JAR has been compiled on Java 
1.3 to be run on JVM 1.3 or earlier.)</description>
  +       support high level server development.</description>
        <used-by>Cocoon</used-by>
  -     <lib>core/jvm1.2/excalibur-datasource-vm12-20021121.jar</lib>
  +     <lib>core/excalibur-cli-1.0.jar</lib>
        <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
    </file>
    <file>
  -     <title>Avalon Excalibur DataSource</title>
  +     <title>Avalon Excalibur Collections</title>
        <description>Part of jakarta-avalon, it is a set of classes and patterns that
  -       support high level server development. (This JAR has been compiled on Java 
1.4 to be run on JVM 1.4.)</description>
  +       support high level server development.</description>
        <used-by>Cocoon</used-by>
  -     <lib>core/jvm1.4/excalibur-datasource-vm14-20021121.jar</lib>
  +     <lib>core/excalibur-collections-20020820.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Component</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-component-20020916.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Concurrent</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-concurrent-20020820.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur I18n</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-i18n-1.0.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Instrument</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-instrument-20021108.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Instrument Manager</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-instrument-manager-20021108.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Instrument Manager Interfaces</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-instrument-manager-interfaces-20021108.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur IO</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-io-1.1.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Logger</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-logger-20020820.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Monitor</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-monitor-20020820.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Naming</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-naming-1.0.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Pool</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-pool-20020820.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur SourceResolve</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-sourceresolve-20020820.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur Store</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-store-20020820.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  + <file>
  +     <title>Avalon Excalibur XMLUtil</title>
  +     <description>Part of jakarta-avalon, it is a set of classes and patterns that
  +       support high level server development.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>core/excalibur-xmlutil-20020820.jar</lib>
        <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
    </file>
    <file>
  @@ -49,7 +159,31 @@
        <lib>core/avalon-framework-20020627.jar</lib>
        <homepage>http://jakarta.apache.org/avalon/framework/</homepage>
    </file>
  +  <file>
  +     <title>Avalon AltRMI Common</title>
  +     <description>Part of jakarta-avalon for communicating with a remote
  +       server.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>optional/excalibur-altrmi-common-20020916.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/framework/</homepage>
  + </file>
    <file>
  +     <title>Avalon AltRMI Server implementation</title>
  +     <description>Part of jakarta-avalon for communicating with a remote
  +       server.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>optional/excalibur-altrmi-server-impl-20020916.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/framework/</homepage>
  + </file>
  + <file>
  +     <title>Avalon AltRMI Server interfaces</title>
  +     <description>Part of jakarta-avalon for communicating with a remote
  +       server.</description>
  +     <used-by>Cocoon</used-by>
  +     <lib>optional/excalibur-altrmi-server-interfaces-20020916.jar</lib>
  +     <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
  + </file>
  +<file>
        <title>Jakarta Commons Collections</title>
        <description>Common implementations of collection classes.</description>
        <used-by>Cocoon</used-by>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to