cvs commit: xml-cocoon2/src/org/apache/cocoon/servlet CocoonServlet.java

[bloritsch]

bloritsch    01/12/12 12:36:47

  Modified:    src/org/apache/cocoon/components/resolver ResolverImpl.java
               src/org/apache/cocoon/servlet CocoonServlet.java
  Added:       lib      avalon-excalibur-20011212.jar
  Removed:     lib      avalon-excalibur-20011126.jar
  Log:
  Update Excalibur with a repaired version--and converted Resolver to Parameterizable
  
  Revision  Changes    Path
  1.1                  xml-cocoon2/lib/avalon-excalibur-20011212.jar
  
        <<Binary file>>
  
  
  1.10      +6 -8      
xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java
  
  Index: ResolverImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ResolverImpl.java 2001/11/28 01:44:03     1.9
  +++ ResolverImpl.java 2001/12/12 20:36:47     1.10
  @@ -13,9 +13,9 @@
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.parameters.Parameterizable;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  @@ -44,10 +44,10 @@
    * &lt;/resolver&gt;
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/11/28 01:44:03 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/12/12 20:36:47 $
    */
   public class ResolverImpl extends AbstractLoggable
  -        implements Resolver, Contextualizable, Composable, Configurable, 
ThreadSafe, Disposable {
  +        implements Resolver, Contextualizable, Composable, Parameterizable, 
ThreadSafe, Disposable {
   
       /** The catalog resolver */
       protected CatalogResolver catalogResolver = new CatalogResolver();
  @@ -70,9 +70,7 @@
        * @param conf The configuration information
        * @exception ConfigurationException
        */
  -    public void configure(Configuration conf) throws ConfigurationException {
  -        Parameters params = Parameters.fromConfiguration(conf);
  -
  +    public void parameterize(Parameters params) throws ParameterException {
           // Over-ride the debug level that is set by CatalogManager.properties
           int debugLevel = Debug.getDebug();
           // getLogger().debug("Current Catalog verbosity level is "
  
  
  
  1.55      +2 -2      xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- CocoonServlet.java        2001/11/23 14:41:22     1.54
  +++ CocoonServlet.java        2001/12/12 20:36:47     1.55
  @@ -62,7 +62,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
  - * @version CVS $Revision: 1.54 $ $Date: 2001/11/23 14:41:22 $
  + * @version CVS $Revision: 1.55 $ $Date: 2001/12/12 20:36:47 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -583,7 +583,7 @@
               Hierarchy.getDefaultHierarchy().log("Could not set up Cocoon Logger, 
will use screen instead", e);
           }
   
  -        final String cocoonLogger = getInitParameter("servlet-logger");
  +        final String cocoonLogger = getInitParameter("cocoon-logger");
           if (cocoonLogger != null) {
               this.log = logKitManager.getLogger(cocoonLogger);
           } else {
  
  
  

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