cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r306633 - in /cocoon/branches/BRANCH_2_1_X: ./ lib/ lib/core/ lib/optional/ src/blocks/axis/java/org/apache/cocoon/webservices/instrument/ src/blocks/portal/java/org/apache/cocoon/portlet/ src/java/org/apache/cocoon/components/ src/java/org...
Date Thu, 06 Oct 2005 13:20:35 GMT
Author: vgritsenko
Date: Thu Oct  6 06:19:23 2005
New Revision: 306633

URL: http://svn.apache.org/viewcvs?rev=306633&view=rev
Log:
      Update Avalon framework to 4.3, Avalon LogKit to 2.1, Excalibur Instrument to 2.1,
      Excalibur Logger to 2.1, Excalibur Pool to 2.1, Excalibur SourceResolve to 2.1,
      Excalibur Store to 2.1, Excalibur XMLUtils to 2.1 and Excalibur Database to 2.1.


Added:
    cocoon/branches/BRANCH_2_1_X/lib/core/avalon-framework-api-4.3.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/avalon-framework-api-4.3.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/avalon-framework-impl-4.3.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/avalon-framework-impl-4.3.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/avalon-logkit-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/avalon-logkit-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-api-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-instrument-api-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-api-2.1.jar   (with props)
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-http-2.1.jar   (with props)
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-impl-2.1.jar   (with props)
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-logger-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-logger-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-pool-api-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-pool-api-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-pool-impl-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-pool-impl-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-pool-instrumented-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-pool-instrumented-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-sourceresolve-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-sourceresolve-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-store-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-store-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-xmlutil-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/core/excalibur-xmlutil-2.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/optional/excalibur-datasource-2.1.jar
      - copied unchanged from r294867, cocoon/trunk/lib/optional/excalibur-datasource-2.1.jar
Removed:
    cocoon/branches/BRANCH_2_1_X/lib/core/altrmi-common-0.9.2.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/altrmi-registry-0.9.2.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/altrmi-server-impl-0.9.2.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/altrmi-server-interfaces-0.9.2.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/avalon-framework-api-4.1.5.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/avalon-framework-impl-4.1.5.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-1.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-manager-1.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-manager-interfaces-1.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-logger-1.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-pool-api-2.0.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-pool-impl-2.0.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-pool-instrumented-2.0.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-sourceresolve-1.1.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-store-1.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-xmlutil-1.0.jar
    cocoon/branches/BRANCH_2_1_X/lib/core/logkit-1.2.2.jar
    cocoon/branches/BRANCH_2_1_X/lib/optional/excalibur-datasource-1.2.0.jar
Modified:
    cocoon/branches/BRANCH_2_1_X/lib/core/javacApi-0.9.jar   (props changed)
    cocoon/branches/BRANCH_2_1_X/lib/core/javacImpl-0.9.jar   (props changed)
    cocoon/branches/BRANCH_2_1_X/lib/jars.xml
    cocoon/branches/BRANCH_2_1_X/lib/optional/icu4j-2.8.jar   (props changed)
    cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationServiceImpl.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/ChainedConfiguration.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
    cocoon/branches/BRANCH_2_1_X/status.xml
    cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml

Added: cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-api-2.1.jar
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-api-2.1.jar?rev=306633&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-api-2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-http-2.1.jar
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-http-2.1.jar?rev=306633&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-http-2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-impl-2.1.jar
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-impl-2.1.jar?rev=306633&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-instrument-mgr-impl-2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/javacApi-0.9.jar
            ('svn:executable' removed)

Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/javacImpl-0.9.jar
            ('svn:executable' removed)

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=306633&r1=306632&r2=306633&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Thu Oct  6 06:19:23 2005
@@ -42,7 +42,7 @@
       support high level server development. 
     </description>
     <used-by>Cocoon</used-by>
-    <lib>optional/excalibur-datasource-1.2.0.jar</lib>
+    <lib>optional/excalibur-datasource-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -86,7 +86,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-instrument-1.0.jar</lib>
+    <lib>core/excalibur-instrument-api-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -97,18 +97,29 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-instrument-manager-1.0.jar</lib>
+    <lib>core/excalibur-instrument-mgr-api-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
   <file>
-    <title>Excalibur Instrument Manager Interfaces</title>
+    <title>Excalibur Instrument Manager</title>
+    <description>
+      Part of Excalibur, it is a set of classes and patterns that
+      support high level server development.
+    </description>
+    <used-by>Cocoon</used-by>
+    <lib>core/excalibur-instrument-mgr-http-2.1.jar</lib>
+    <homepage>http://excalibur.apache.org/</homepage>
+  </file>
+
+  <file>
+    <title>Excalibur Instrument Manager</title>
     <description>
       Part of Excalibur, 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-1.0.jar</lib>
+    <lib>core/excalibur-instrument-mgr-impl-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -130,7 +141,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-logger-1.1.jar</lib>
+    <lib>core/excalibur-logger-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -152,7 +163,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-pool-api-2.0.0.jar</lib>
+    <lib>core/excalibur-pool-api-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -163,7 +174,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-pool-impl-2.0.0.jar</lib>
+    <lib>core/excalibur-pool-impl-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -174,7 +185,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-pool-instrumented-2.0.0.jar</lib>
+    <lib>core/excalibur-pool-instrumented-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -185,7 +196,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-sourceresolve-1.1.jar</lib>
+    <lib>core/excalibur-sourceresolve-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -196,7 +207,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-store-1.0.jar</lib>
+    <lib>core/excalibur-store-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -207,7 +218,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/excalibur-xmlutil-1.0.jar</lib>
+    <lib>core/excalibur-xmlutil-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/</homepage>
   </file>
 
@@ -218,7 +229,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/avalon-framework-api-4.1.5.jar</lib>
+    <lib>core/avalon-framework-api-4.3.jar</lib>
     <homepage>http://excalibur.apache.org/framework/index.html</homepage>
   </file>
 
@@ -229,55 +240,10 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/avalon-framework-impl-4.1.5.jar</lib>
+    <lib>core/avalon-framework-impl-4.3.jar</lib>
     <homepage>http://excalibur.apache.org/framework/index.html</homepage>
   </file>
 
-  <!--+
-      | If you update the AltRMI server libraries, make sure
-      | you also update the AltRMI client libraries in
-      | tools/instrumentation/lib !!
-      +-->
-  <file>
-    <title>Avalon AltRMI Common</title>
-    <description>
-      Part of avalon for communicating with a remote server.
-    </description>
-    <used-by>Cocoon</used-by>
-    <lib>core/altrmi-common-0.9.2.jar</lib>
-    <homepage>http://incubator.apache.org/projects/altrmi/</homepage>
-  </file>
-
-  <file>
-    <title>Avalon AltRMI Server implementation</title>
-    <description>
-      Part of avalon for communicating with a remote server.
-    </description>
-    <used-by>Cocoon</used-by>
-    <lib>core/altrmi-server-impl-0.9.2.jar</lib>
-    <homepage>http://incubator.apache.org/projects/altrmi/</homepage>
-  </file>
-
-  <file>
-    <title>Avalon AltRMI Server interfaces</title>
-    <description>
-     Part of avalon for communicating with a remote server.
-    </description>
-    <used-by>Cocoon</used-by>
-    <lib>core/altrmi-server-interfaces-0.9.2.jar</lib>
-    <homepage>http://incubator.apache.org/projects/altrmi/</homepage>
-  </file>
-
-  <file>
-    <title>Avalon AltRMI Registry</title>
-    <description>
-     Part of avalon for communicating with a remote server.
-    </description>
-    <used-by>Cocoon</used-by>
-    <lib>core/altrmi-registry-0.9.2.jar</lib>
-    <homepage>http://incubator.apache.org/projects/altrmi/</homepage>
-  </file>
-
   <file>
     <title>Jakarta Commons Collections</title>
     <description>Common implementations of collection classes.</description>
@@ -304,7 +270,7 @@
       performance oriented logging in applications.
     </description>
     <used-by>Cocoon logging</used-by>
-    <lib>core/logkit-1.2.2.jar</lib>
+    <lib>core/avalon-logkit-2.1.jar</lib>
     <homepage>http://excalibur.apache.org/framework/index.html</homepage>
   </file>
 

Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/icu4j-2.8.jar
            ('svn:executable' removed)

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationServiceImpl.java?rev=306633&r1=306632&r2=306633&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationServiceImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationServiceImpl.java
Thu Oct  6 06:19:23 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,26 @@
  */
 package org.apache.cocoon.webservices.instrument;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
 import org.apache.excalibur.instrument.InstrumentManager;
 import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Implementation of {@link InstrumentationService} component. This component
  * allows you to access sample information from the InstrumentManager.
  *
  * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 public final class InstrumentationServiceImpl extends AbstractLogEnabled
-    implements InstrumentationService {
+                                              implements InstrumentationService {
 
     private static final int[] EMPTY_INT_ARRAY = {};
     private static final String[] EMPTY_STRING_ARRAY = {};
@@ -135,7 +136,6 @@
         final List names = new ArrayList();
 
         for (int i = 0; i < descriptors.length; ++i) {
-
             // list all instruments
             InstrumentDescriptor[] insts =
                 descriptors[i].getInstrumentDescriptors();

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java?rev=306633&r1=306632&r2=306633&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
Thu Oct  6 06:19:23 2005
@@ -52,7 +52,7 @@
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.apache.excalibur.instrument.InstrumentManager;
-import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.impl.DefaultInstrumentManagerImpl;
 import org.apache.log.ContextMap;
 import org.apache.log.ErrorHandler;
 import org.apache.log.Hierarchy;
@@ -208,7 +208,7 @@
     /**
      * The <code>InstrumentManager</code> instance
      */
-    private DefaultInstrumentManager instrumentManager;
+    private InstrumentManager instrumentManager;
 
     /**
      * This is the path to the portlet context (or the result
@@ -555,8 +555,8 @@
             this.disposeCocoon();
         }
 
-        if (this.enableInstrumentation) {
-            this.instrumentManager.dispose();
+        if (this.instrumentManager instanceof Disposable) {
+            ((Disposable) this.instrumentManager).dispose();
         }
 
         if (this.parentComponentManager != null && this.parentComponentManager instanceof
Disposable) {
@@ -1675,7 +1675,7 @@
         Logger imLogger = this.loggerManager.getLoggerForCategory(imLoggerCategory);
 
         // Set up the Instrument Manager
-        DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager();
+        DefaultInstrumentManagerImpl instrumentManager = new DefaultInstrumentManagerImpl();
         instrumentManager.enableLogging(imLogger);
         instrumentManager.configure(conf);
         instrumentManager.initialize();

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/ChainedConfiguration.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/ChainedConfiguration.java?rev=306633&r1=306632&r2=306633&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/ChainedConfiguration.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/ChainedConfiguration.java
Thu Oct  6 06:19:23 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,20 +19,19 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
 /**
- * This configuration object is used for {@link SitemapConfigurable} 
+ * This configuration object is used for {@link SitemapConfigurable}
  * components. It 'extends' {@link Configuration} by a parent.
- * 
+ *
  * @since 2.1
- * 
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: ChainedConfiguration.java,v 1.3 2004/03/05 13:02:45 bdelacretaz Exp
$
+ * @version $Id$
  */
 public final class ChainedConfiguration implements Configuration {
 
     private Configuration wrappedConfiguration;
-    
+
     private ChainedConfiguration parentConfiguration;
-    
+
     /**
      * Constructor
      */
@@ -41,8 +40,8 @@
         this.wrappedConfiguration = wrapped;
         this.parentConfiguration = parent;
     }
-    
-    /** 
+
+    /**
      * Get the parent configuration
      * @return the parent configuration or null.
      */
@@ -249,4 +248,19 @@
         return this.wrappedConfiguration.getValueAsLong(arg0);
     }
 
+    public double getAttributeAsDouble(String name) throws ConfigurationException {
+        return this.wrappedConfiguration.getAttributeAsDouble(name);
+    }
+
+    public double getValueAsDouble() throws ConfigurationException {
+        return this.wrappedConfiguration.getValueAsDouble();
+    }
+
+    public double getValueAsDouble(double value) {
+        return this.wrappedConfiguration.getValueAsDouble(value);
+    }
+
+    public double getAttributeAsDouble(String name, double value) {
+        return this.wrappedConfiguration.getAttributeAsDouble(name, value);
+    }
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=306633&r1=306632&r2=306633&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java Thu
Oct  6 06:19:23 2005
@@ -54,7 +54,7 @@
 import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.lang.time.StopWatch;
 import org.apache.excalibur.instrument.InstrumentManager;
-import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.impl.DefaultInstrumentManagerImpl;
 import org.apache.log.ContextMap;
 import org.apache.log.ErrorHandler;
 import org.apache.log.Hierarchy;
@@ -218,7 +218,7 @@
     /**
      * The <code>InstrumentManager</code> instance
      */
-    private DefaultInstrumentManager instrumentManager;
+    private InstrumentManager instrumentManager;
 
     /**
      * This is the path to the servlet context (or the result
@@ -518,8 +518,8 @@
             disposeCocoon();
         }
 
-        if (this.enableInstrumentation) {
-            this.instrumentManager.dispose();
+        if (this.instrumentManager instanceof Disposable) {
+            ((Disposable) this.instrumentManager).dispose();
         }
 
         if (this.parentComponentManager != null && this.parentComponentManager instanceof
Disposable) {
@@ -1482,7 +1482,7 @@
         Logger imLogger = this.loggerManager.getLoggerForCategory(imLoggerCategory);
 
         // Set up the Instrument Manager
-        DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager();
+        DefaultInstrumentManagerImpl instrumentManager = new DefaultInstrumentManagerImpl();
         instrumentManager.enableLogging(imLogger);
         instrumentManager.configure(conf);
         instrumentManager.initialize();

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=306633&r1=306632&r2=306633&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Oct  6 06:19:23 2005
@@ -197,11 +197,17 @@
 
   <changes>
   <release version="@version@" date="@date@">
-      <action dev="JHS" type="fix" fixes-bug="30796" due-to="Max Pfingsthorn" due-to-email="m.pfingsthorn@hippo.nl">
+    <action dev="VG" type="update">
+      Update Avalon framework to 4.3, Avalon LogKit to 2.1, Excalibur Instrument to 2.1,
+      Excalibur Logger to 2.1, Excalibur Pool to 2.1, Excalibur SourceResolve to 2.1,
+      Excalibur Store to 2.1, Excalibur XMLUtils to 2.1 and Excalibur Database to 2.1.
+    </action>
+    <action dev="JHS" type="fix" fixes-bug="30796" due-to="Max Pfingsthorn" due-to-email="m.pfingsthorn@hippo.nl">
       Fix OutofBoundsException when form element does not have an action attribute
     </action>
     <action dev="RG" type="fix" fixes-bug="34802" due-to="Roy Huang" due-to-email="roy_huang@nbmgroup.com">
-      PageLabelLinkService generated the wrong url when using 3 layer tabs with showallnav.
+      Portal Block: PageLabelLinkService generated the wrong url when using 3
+      layer tabs with showallnav.
     </action>
     <action dev="JHS" type="add" fixes-bug="36781" due-to="Thomas Lutz" due-to-email="mattom@gmx.at">
       CForms: The repeater widget now supports min and max-size attributes.

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml?rev=306633&r1=306632&r2=306633&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml Thu Oct  6 06:19:23
2005
@@ -27,14 +27,10 @@
       <classpath>
         <fileset dir="${lib.core}">
           <include name="avalon-framework-*.jar"/>
-          <include name="excalibur-instrument-manager-interfaces-*.jar"/>
-        </fileset>
-        <fileset dir="${lib.optional}">
-          <include name="altrmi-common-*.jar"/>
+          <include name="excalibur-instrument-*.jar"/>
         </fileset>
         <fileset dir="${lib.instrumentation}">
-          <include name="excalibur-instrument-client-*.jar"/>
-          <include name="altrmi-*.jar"/>
+          <include name="*.jar"/>
         </fileset>
       </classpath>
     </java>



Mime
View raw message