You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by le...@apache.org on 2004/07/28 21:19:06 UTC
svn commit: rev 30857 - in excalibur/trunk: containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces containerkit/instrument/mgr-http containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/impl deprecated/component/src/java/org/apache/avalon/excalibur/component fortress/container-impl/src/java/org/apache/avalon/fortress/util fortress/container-test/src/test/org/apache/avalon/fortress/util/test
Author: leif
Date: Wed Jul 28 12:19:05 2004
New Revision: 30857
Added:
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/CounterInstrumentListener.java
- copied unchanged from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/CounterInstrumentListener.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentManagerClient.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManagerConnector.java
- copied, changed from rev 30853, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentManagerConnector.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptor.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentDescriptor.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentListener.java
- copied unchanged from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentListener.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptor.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleDescriptor.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleListener.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleListener.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleSnapshot.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleSnapshot.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleUtils.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleUtils.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptor.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentableDescriptor.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentException.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentException.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentSampleException.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentSampleException.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentableException.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentableException.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/ValueInstrumentListener.java
- copied unchanged from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/ValueInstrumentListener.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/CounterInstrumentSample.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/CounterInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentDescriptorImpl.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptorLocalImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java
- copied, changed from rev 30845, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentProxy.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSampleDescriptorImpl.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptorLocalImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSampleFactory.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleFactory.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableDescriptorImpl.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptorLocalImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java
- copied, changed from rev 30845, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableProxy.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MaximumValueInstrumentSample.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MaximumValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MeanValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MinimumValueInstrumentSample.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MinimumValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/impl/DefaultInstrumentManagerImplTestCase.java
- copied, changed from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/DefaultInstrumentManagerTestCase.java
Removed:
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentManagerConnector.java
excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/CounterInstrumentListener.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/CounterInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptorLocal.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptorLocalImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentListener.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentManagerClientLocal.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentManagerClientLocalImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentManagerConnector.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentProxy.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptorLocal.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptorLocalImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleFactory.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleListener.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptorLocal.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptorLocalImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableProxy.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MaximumValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MeanValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MinimumValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/NoopInstrumentManager.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/ValueInstrumentListener.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/DefaultInstrumentManagerTestCase.java
Modified:
excalibur/trunk/containerkit/instrument/mgr-http/project.xml
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHTMLHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractXMLHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLCreateSampleHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLGCHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentManagerHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentableHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLRootHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleLeaseHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/InstrumentManagerHTTPConnector.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/SampleChartHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLCreateSampleHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLGCHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentManagerHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentableHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleLeaseHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotHandler.java
excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotsHandler.java
excalibur/trunk/deprecated/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManagerCreator.java
excalibur/trunk/fortress/container-impl/src/java/org/apache/avalon/fortress/util/ContextManager.java
excalibur/trunk/fortress/container-test/src/test/org/apache/avalon/fortress/util/test/ContextManagerTestCase.java
Log:
Completely rework the Instrument Manager jars to clean up the package names and interfaces. It is now much cleaner and easier to work with. Unfortunately the change is not backwards compatible. The base Instrument API was not modified.
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentManagerClient.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentManagerClient.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java Wed Jul 28 12:19:05 2004
@@ -15,16 +15,17 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
+import org.apache.excalibur.instrument.InstrumentManager;
/**
+ * The public interface to the DefaultInstrumentManager implementation.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
-public interface InstrumentManagerClient
+public interface DefaultInstrumentManager
+ extends InstrumentManager
{
/** Type which specifies that the type of a Instrument has not yet been determined. */
int INSTRUMENT_TYPE_NONE = 0;
@@ -48,16 +49,16 @@
int INSTRUMENT_SAMPLE_TYPE_MEAN = 104;
/**
- * Returns the name used to identify this InstrumentManager.
+ * Returns the name used to identify this DefaultInstrumentManager.
*
- * @return The name used to identify this InstrumentManager.
+ * @return The name used to identify this DefaultInstrumentManager.
*/
String getName();
/**
- * Returns the description of this InstrumentManager.
+ * Returns the description of this DefaultInstrumentManager.
*
- * @return The description of this InstrumentManager.
+ * @return The description of this DefaultInstrumentManager.
*/
String getDescription();
@@ -69,37 +70,37 @@
*
* @return A Descriptor of the requested Instrumentable.
*
- * @throws NoSuchInstrumentableException If the specified Instrumentable does
- * not exist.
+ * @throws NoSuchInstrumentableException If the specified Instrumentable
+ * does not exist.
*/
InstrumentableDescriptor getInstrumentableDescriptor( String instrumentableName )
throws NoSuchInstrumentableException;
/**
* Returns an array of Descriptors for the Instrumentables managed by this
- * InstrumentManager.
+ * DefaultInstrumentManager.
*
- * @return An array of Descriptors for the Instrumentables managed by this
- * InstrumentManager.
+ * @return An array of InstrumentableDescriptors.
*/
InstrumentableDescriptor[] getInstrumentableDescriptors();
/**
- * Searches the entire instrument tree an instrumentable with the given
+ * Searches the entire instrument tree for an instrumentable with the given
* name.
*
* @param instrumentableName Name of the Instrumentable being requested.
*
* @return A Descriptor of the requested Instrumentable.
*
- * @throws NoSuchInstrumentableException If the specified Instrumentable does
- * not exist.
+ * @throws NoSuchInstrumentableException If the specified Instrumentable
+ * does not exist.
*/
InstrumentableDescriptor locateInstrumentableDescriptor( String instrumentableName )
throws NoSuchInstrumentableException;
/**
- * Searches the entire instrument tree an instrument with the given name.
+ * Searches the entire instrument tree for an instrument with the given
+ * name.
*
* @param instrumentName Name of the Instrument being requested.
*
@@ -112,8 +113,8 @@
throws NoSuchInstrumentException;
/**
- * Searches the entire instrument tree an instrument sample with the given
- * name.
+ * Searches the entire instrument tree for an instrument sample with the
+ * given name.
*
* @param sampleName Name of the Instrument Sample being requested.
*
@@ -126,9 +127,10 @@
throws NoSuchInstrumentSampleException;
/**
- * Returns the stateVersion of the instrument manager. The state version
- * will be incremented each time any of the configuration of the
- * instrument manager or any of its children is modified.
+ * Returns the stateVersion of the DefaultInstrumeManager. The state
+ * version will be incremented each time any of the configuration of
+ * the instrument manager or any of its children is modified.
+ * <p>
* Clients can use this value to tell whether or not anything has
* changed without having to do an exhaustive comparison.
*
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManagerConnector.java (from rev 30853, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentManagerConnector.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentManagerConnector.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManagerConnector.java Wed Jul 28 12:19:05 2004
@@ -34,5 +34,5 @@
* access. This method is called before the new connector is
* configured or started.
*/
- //void setInstrumentManager( DefaultInstrumentManager manager );
+ void setInstrumentManager( DefaultInstrumentManager manager );
}
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptor.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentDescriptor.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentDescriptor.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptor.java Wed Jul 28 12:19:05 2004
@@ -15,15 +15,13 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
/**
* Describes a Instrument and acts as a Proxy to protect the original
* Instrument.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public interface InstrumentDescriptor
{
@@ -63,9 +61,9 @@
/**
* Returns the type of the Instrument. Possible values include
- * InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER,
- * InstrumentManagerClient.INSTRUMENT_TYPE_VALUE or
- * InstrumentManagerClient.INSTRUMENT_TYPE_NONE, if the type was never set.
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER,
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE or
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_NONE, if the type was never set.
*
* @return The type of the Instrument.
*/
@@ -81,6 +79,54 @@
InstrumentableDescriptor getInstrumentableDescriptor();
/**
+ * Adds a CounterInstrumentListener to the list of listeners which will
+ * receive updates of the value of the Instrument.
+ *
+ * @param listener CounterInstrumentListener which will start receiving
+ * profile updates.
+ *
+ * @throws IllegalStateException If the Instrument's type is not
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER.
+ */
+ void addCounterInstrumentListener( CounterInstrumentListener listener );
+
+ /**
+ * Removes a InstrumentListener from the list of listeners which will
+ * receive profile events.
+ *
+ * @param listener InstrumentListener which will stop receiving profile
+ * events.
+ *
+ * @throws IllegalStateException If the Instrument's type is not
+ * DefaultInstrumentManager.PROFILE_POINT_TYPE_COUNTER.
+ */
+ void removeCounterInstrumentListener( CounterInstrumentListener listener );
+
+ /**
+ * Adds a ValueInstrumentListener to the list of listeners which will
+ * receive updates of the value of the Instrument.
+ *
+ * @param listener ValueInstrumentListener which will start receiving
+ * profile updates.
+ *
+ * @throws IllegalStateException If the Instrument's type is not
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE.
+ */
+ void addValueInstrumentListener( ValueInstrumentListener listener );
+
+ /**
+ * Removes a InstrumentListener from the list of listeners which will
+ * receive profile events.
+ *
+ * @param listener InstrumentListener which will stop receiving profile
+ * events.
+ *
+ * @throws IllegalStateException If the Instrument's type is not
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE.
+ */
+ void removeValueInstrumentListener( ValueInstrumentListener listener );
+
+ /**
* Returns a InstrumentSampleDescriptor based on its name.
*
* @param instrumentSampleName Name of the InstrumentSample being requested.
@@ -105,10 +151,10 @@
* lease which is shorter or longer than the requested
* period.
* @param sampleType Type of sample to request. Must be one of the
- * following: InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN.
+ * following: DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN.
*
* @return A Descriptor of the requested InstrumentSample.
*/
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptor.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleDescriptor.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleDescriptor.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptor.java Wed Jul 28 12:19:05 2004
@@ -15,15 +15,13 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
/**
* Describes an InstrumentSample and acts as a Proxy to protect the original
* InstrumentSample object.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public interface InstrumentSampleDescriptor
{
@@ -65,10 +63,10 @@
/**
* Returns the type of the Instrument Sample. Possible values include
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN, or
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM.
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN, or
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM.
*
* @return The type of the Instrument Sample.
*/
@@ -107,6 +105,22 @@
* @return A reference to the descriptor of the Instrument of the sample.
*/
InstrumentDescriptor getInstrumentDescriptor();
+
+ /**
+ * Registers a InstrumentSampleListener with a InstrumentSample given a name.
+ *
+ * @param listener The listener which should start receiving updates from the
+ * InstrumentSample.
+ */
+ void addInstrumentSampleListener( InstrumentSampleListener listener );
+
+ /**
+ * Unregisters a InstrumentSampleListener from a InstrumentSample given a name.
+ *
+ * @param listener The listener which should stop receiving updates from the
+ * InstrumentSample.
+ */
+ void removeInstrumentSampleListener( InstrumentSampleListener listener );
/**
* Returns the time that the current lease expires. Permanent samples will
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleListener.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleListener.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleListener.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleListener.java Wed Jul 28 12:19:05 2004
@@ -22,8 +22,6 @@
* themselves with InstrumentSample instances to receive updates on their value.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
- * @since 4.1
*/
public interface InstrumentSampleListener
{
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleSnapshot.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleSnapshot.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleSnapshot.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleSnapshot.java Wed Jul 28 12:19:05 2004
@@ -15,15 +15,13 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
import java.io.Serializable;
/**
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public class InstrumentSampleSnapshot
implements Serializable
@@ -60,11 +58,11 @@
* @param stateVersion The current state version of the sample.
*/
public InstrumentSampleSnapshot( String InstrumentSampleName,
- long interval,
- int size,
- long time,
- int[] samples,
- int stateVersion )
+ long interval,
+ int size,
+ long time,
+ int[] samples,
+ int stateVersion )
{
m_InstrumentSampleName = InstrumentSampleName;
m_interval = interval;
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleUtils.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleUtils.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentSampleUtils.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleUtils.java Wed Jul 28 12:19:05 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -24,8 +24,6 @@
* These methods can be used on the server as well as the client.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public class InstrumentSampleUtils
{
@@ -43,19 +41,19 @@
if ( type.equalsIgnoreCase( "max" ) || type.equalsIgnoreCase( "maximum" ) )
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM;
}
else if ( type.equalsIgnoreCase( "min" ) || type.equalsIgnoreCase( "minimum" ) )
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM;
}
else if ( type.equalsIgnoreCase( "mean" ) )
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN;
}
else if ( type.equalsIgnoreCase( "ctr" ) || type.equalsIgnoreCase( "counter" ) )
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER;
}
else
{
@@ -67,16 +65,16 @@
{
switch ( type )
{
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM:
return "maximum";
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM:
return "minimum";
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN:
return "mean";
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER:
return "counter";
default:
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptor.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentableDescriptor.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/InstrumentableDescriptor.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptor.java Wed Jul 28 12:19:05 2004
@@ -15,15 +15,13 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
/**
* Describes a Instrumentable and acts as a Proxy to protect the original
* Instrumentable.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public interface InstrumentableDescriptor
{
@@ -44,10 +42,10 @@
boolean isRegistered();
/**
- * Gets the name for the Instrumentable. The Instrumentable Name is used to
- * uniquely identify the Instrumentable during the configuration of the
- * Profiler and to gain access to a InstrumentableDescriptor through a
- * ProfilerManager.
+ * Gets the name for the Instrumentable. The Instrumentable Name is used
+ * to uniquely identify the Instrumentable during its configuration and to
+ * gain access to a InstrumentableDescriptor through a
+ * DefaultInstrumentManager.
*
* @return The name used to identify a Instrumentable.
*/
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentException.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentException.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentException.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentException.java Wed Jul 28 12:19:05 2004
@@ -15,14 +15,12 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
/**
* Thrown when a Instrument can not be found.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public class NoSuchInstrumentException
extends RuntimeException
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentSampleException.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentSampleException.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentSampleException.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentSampleException.java Wed Jul 28 12:19:05 2004
@@ -15,14 +15,12 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
/**
* Thrown when a InstrumentSample can not be found.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public class NoSuchInstrumentSampleException
extends RuntimeException
Copied: excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentableException.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentableException.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/interfaces/NoSuchInstrumentableException.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-api/src/java/org/apache/excalibur/instrument/manager/NoSuchInstrumentableException.java Wed Jul 28 12:19:05 2004
@@ -15,14 +15,12 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.interfaces;
+package org.apache.excalibur.instrument.manager;
/**
* Thrown when a Instrumentable can not be found.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:19 $
- * @since 4.1
*/
public class NoSuchInstrumentableException
extends RuntimeException
Modified: excalibur/trunk/containerkit/instrument/mgr-http/project.xml
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/project.xml (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/project.xml Wed Jul 28 12:19:05 2004
@@ -44,11 +44,6 @@
<artifactId>excalibur-instrument-mgr-api</artifactId>
<version>1.2-dev</version>
</dependency>
- <dependency>
- <groupId>excalibur-instrument</groupId>
- <artifactId>excalibur-instrument-mgr-impl</artifactId>
- <version>1.2-dev</version>
- </dependency>
<dependency>
<id>xml-apis</id>
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHTMLHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHTMLHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHTMLHandler.java Wed Jul 28 12:19:05 2004
@@ -23,10 +23,10 @@
import java.util.Date;
import org.apache.excalibur.instrument.manager.http.server.URLCoder;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
*
@@ -44,9 +44,9 @@
* Creates a new AbstractHTMLHandler.
*
* @param path The path handled by this handler.
- * @param manager Reference to the instrument manager client interface.
+ * @param manager Reference to the instrument manager interface.
*/
- public AbstractHTMLHandler( String path, InstrumentManagerClient manager )
+ public AbstractHTMLHandler( String path, DefaultInstrumentManager manager )
{
super( path, CONTENT_TYPE_TEXT_HTML, manager );
}
@@ -74,11 +74,11 @@
if ( link )
{
out.println( "<a href='instrument-manager.html'>"
- + getInstrumentManagerClient().getDescription() + "</a>" );
+ + getInstrumentManager().getDescription() + "</a>" );
}
else
{
- out.println( getInstrumentManagerClient().getDescription() );
+ out.println( getInstrumentManager().getDescription() );
}
}
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractHandler.java Wed Jul 28 12:19:05 2004
@@ -18,7 +18,7 @@
package org.apache.excalibur.instrument.manager.http;
import org.apache.excalibur.instrument.manager.http.server.AbstractHTTPURLPrintWriterHandler;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
*
@@ -30,7 +30,7 @@
extends AbstractHTTPURLPrintWriterHandler
{
/** The instrument manager */
- private InstrumentManagerClient m_manager;
+ private DefaultInstrumentManager m_manager;
/*---------------------------------------------------------------
* Constructors
@@ -40,11 +40,11 @@
*
* @param path The path handled by this handler.
* @param contentType The content type.
- * @param manager Reference to the instrument manager client interface.
+ * @param manager Reference to the instrument manager interface.
*/
public AbstractHandler( String path,
String contentType,
- InstrumentManagerClient manager )
+ DefaultInstrumentManager manager )
{
super( path, contentType, InstrumentManagerHTTPConnector.ENCODING );
@@ -55,11 +55,11 @@
* Methods
*-------------------------------------------------------------*/
/**
- * Returns a reference to the instrument manager client interface.
+ * Returns a reference to the instrument manager interface.
*
- * @return A reference to the instrument manager client interface.
+ * @return A reference to the instrument manager interface.
*/
- public InstrumentManagerClient getInstrumentManagerClient()
+ public DefaultInstrumentManager getInstrumentManager()
{
return m_manager;
}
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractXMLHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractXMLHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/AbstractXMLHandler.java Wed Jul 28 12:19:05 2004
@@ -20,11 +20,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleSnapshot;
/**
*
@@ -44,9 +44,9 @@
* Creates a new AbstractXMLHandler.
*
* @param path The path handled by this handler.
- * @param manager Reference to the instrument manager client interface.
+ * @param manager Reference to the instrument manager interface.
*/
- public AbstractXMLHandler( String path, InstrumentManagerClient manager )
+ public AbstractXMLHandler( String path, DefaultInstrumentManager manager )
{
super( path, CONTENT_TYPE_TEXT_XML, manager );
}
@@ -74,7 +74,7 @@
}
protected void outputInstrumentManager( PrintWriter out,
- InstrumentManagerClient manager,
+ DefaultInstrumentManager manager,
String indent,
boolean recurse,
boolean packed )
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLCreateSampleHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLCreateSampleHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLCreateSampleHandler.java Wed Jul 28 12:19:05 2004
@@ -22,10 +22,10 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentException;
/**
*
@@ -42,9 +42,9 @@
/**
* Creates a new HTMLCreateSampleHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLCreateSampleHandler( InstrumentManagerClient manager )
+ public HTMLCreateSampleHandler( DefaultInstrumentManager manager )
{
super( "/create-sample.html", manager );
}
@@ -72,7 +72,7 @@
InstrumentDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentDescriptor( name );
}
catch ( NoSuchInstrumentException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLGCHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLGCHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLGCHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -41,9 +41,9 @@
/**
* Creates a new HTMLGCHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLGCHandler( InstrumentManagerClient manager )
+ public HTMLGCHandler( DefaultInstrumentManager manager )
{
super( "/gc.html", manager );
}
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentHandler.java Wed Jul 28 12:19:05 2004
@@ -22,10 +22,10 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentException;
/**
*
@@ -42,9 +42,9 @@
/**
* Creates a new HTMLInstrumentHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLInstrumentHandler( InstrumentManagerClient manager )
+ public HTMLInstrumentHandler( DefaultInstrumentManager manager )
{
super( "/instrument.html", manager );
}
@@ -66,7 +66,7 @@
InstrumentDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentDescriptor( name );
}
catch ( NoSuchInstrumentException e )
{
@@ -91,63 +91,63 @@
presets.append( "<option value='0-0' selected>-- Select a Preset --</option>" );
switch ( desc.getType() )
{
- case InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER:
type = "Counter";
types.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ "' selected>Count</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ "-0'>Count / Second Over 10 Minutes</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ "-1'>Count / Minute Over 1 Day</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER
+ "-2'>Count / Hour Over 1 Month</option>" );
break;
- case InstrumentManagerClient.INSTRUMENT_TYPE_VALUE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE:
type = "Value";
types.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ "' selected>Maximum Value</option>" );
types.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ "'>Minimum Value</option>" );
types.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN
+ "'>Mean Value</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ "-0'>Max Value / Second Over 10 Minutes</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ "-1'>Max Value / Minute Over 1 Day</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM
+ "-2'>Max Value / Hour Over 1 Month</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ "-0'>Min Value / Second Over 10 Minutes</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ "-1'>Min Value / Minute Over 1 Day</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM
+ "-2'>Min Value / Hour Over 1 Month</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN
+ "-0'>Mean Value / Second Over 10 Minutes</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN
+ "-1'>Mean Value / Minute Over 1 Day</option>" );
presets.append( "<option value='"
- + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN
+ + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN
+ "-2'>Mean Value / Hour Over 1 Month</option>" );
break;
@@ -192,13 +192,13 @@
out.println( " var prefix;" );
out.println( " if (type == 0) {" );
out.println( " return;" );
- out.println( " } else if (type == " + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER + ") {" );
+ out.println( " } else if (type == " + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER + ") {" );
out.println( " typeLbl = \"Count\"" );
- out.println( " } else if (type == " + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM + ") {" );
+ out.println( " } else if (type == " + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM + ") {" );
out.println( " typeLbl = \"Max Value\"" );
- out.println( " } else if (type == " + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM + ") {" );
+ out.println( " } else if (type == " + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM + ") {" );
out.println( " typeLbl = \"Min Value\"" );
- out.println( " } else if (type == " + InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN + ") {" );
+ out.println( " } else if (type == " + DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN + ") {" );
out.println( " typeLbl = \"Mean Value\"" );
out.println( " } else {" );
out.println( " typeLbl = \"Unknown\"" );
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentManagerHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentManagerHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentManagerHandler.java Wed Jul 28 12:19:05 2004
@@ -21,8 +21,8 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
/**
*
@@ -39,9 +39,9 @@
/**
* Creates a new HTMLInstrumentManagerHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLInstrumentManagerHandler( InstrumentManagerClient manager )
+ public HTMLInstrumentManagerHandler( DefaultInstrumentManager manager )
{
super( "/instrument-manager.html", manager );
}
@@ -71,7 +71,7 @@
// This is the root
out.println( "<html>" );
- out.println( "<head><title>" + getInstrumentManagerClient().getDescription()
+ out.println( "<head><title>" + getInstrumentManager().getDescription()
+ "</title></head>" );
out.println( "<body>" );
@@ -80,13 +80,13 @@
out.println( "<h2>Instrument Manager</h2>" );
startTable( out );
- tableRow( out, 0, "Name", getInstrumentManagerClient().getName() );
- tableRow( out, 0, "Description", getInstrumentManagerClient().getDescription() );
+ tableRow( out, 0, "Name", getInstrumentManager().getName() );
+ tableRow( out, 0, "Description", getInstrumentManager().getDescription() );
tableRow( out, 0, "GC", gcLabel );
endTable( out );
InstrumentableDescriptor[] instrumentables =
- getInstrumentManagerClient().getInstrumentableDescriptors();
+ getInstrumentManager().getInstrumentableDescriptors();
if ( instrumentables.length > 0 )
{
out.println( "<h2>Instrumentables</h2>" );
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentableHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentableHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLInstrumentableHandler.java Wed Jul 28 12:19:05 2004
@@ -22,10 +22,10 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentableException;
/**
*
@@ -42,9 +42,9 @@
/**
* Creates a new HTMLInstrumentableHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLInstrumentableHandler( InstrumentManagerClient manager )
+ public HTMLInstrumentableHandler( DefaultInstrumentManager manager )
{
super( "/instrumentable.html", manager );
}
@@ -66,7 +66,7 @@
InstrumentableDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentableDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentableDescriptor( name );
}
catch ( NoSuchInstrumentableException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLRootHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLRootHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLRootHandler.java Wed Jul 28 12:19:05 2004
@@ -22,7 +22,7 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
*
@@ -39,9 +39,9 @@
/**
* Creates a new HTMLRootHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLRootHandler( InstrumentManagerClient manager )
+ public HTMLRootHandler( DefaultInstrumentManager manager )
{
super( "/", manager );
}
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleHandler.java Wed Jul 28 12:19:05 2004
@@ -23,10 +23,10 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleSnapshot;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -43,9 +43,9 @@
/**
* Creates a new HTMLSampleHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLSampleHandler( InstrumentManagerClient manager )
+ public HTMLSampleHandler( DefaultInstrumentManager manager )
{
super( "/sample.html", manager );
}
@@ -67,7 +67,7 @@
InstrumentSampleDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentSampleDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentSampleDescriptor( name );
}
catch ( NoSuchInstrumentSampleException e )
{
@@ -90,19 +90,19 @@
String type;
switch ( desc.getType() )
{
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER:
type = "Counter";
break;
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM:
type = "Max Value";
break;
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM:
type = "Min Value";
break;
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN:
type = "Mean Value";
break;
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleLeaseHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleLeaseHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/HTMLSampleLeaseHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -41,9 +41,9 @@
/**
* Creates a new HTMLSampleLeaseHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public HTMLSampleLeaseHandler( InstrumentManagerClient manager )
+ public HTMLSampleLeaseHandler( DefaultInstrumentManager manager )
{
super( "/sample-lease.html", manager );
}
@@ -69,7 +69,7 @@
InstrumentSampleDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentSampleDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentSampleDescriptor( name );
}
catch ( NoSuchInstrumentSampleException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/InstrumentManagerHTTPConnector.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/InstrumentManagerHTTPConnector.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/InstrumentManagerHTTPConnector.java Wed Jul 28 12:19:05 2004
@@ -28,10 +28,9 @@
import org.apache.excalibur.instrument.AbstractLogEnabledInstrumentable;
import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
-import org.apache.excalibur.instrument.manager.InstrumentManagerConnector;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManagerConnector;
import org.apache.excalibur.instrument.manager.http.server.AbstractHTTPURLHandler;
import org.apache.excalibur.instrument.manager.http.server.HTTPServer;
-import org.apache.excalibur.instrument.manager.InstrumentManagerClientLocalImpl;
/**
* An HTTP connector which allows a client to connect to the ServiceManager
@@ -47,7 +46,7 @@
*/
public class InstrumentManagerHTTPConnector
extends AbstractLogEnabledInstrumentable
- implements InstrumentManagerConnector, Configurable, Startable
+ implements DefaultInstrumentManagerConnector, Configurable, Startable
{
/** The default port. */
public static final int DEFAULT_PORT = 15080;
@@ -85,7 +84,7 @@
}
/*---------------------------------------------------------------
- * InstrumentManagerConnector Methods
+ * DefaultInstrumentManagerConnector Methods
*-------------------------------------------------------------*/
/**
* Set the InstrumentManager to which the Connecter will provide
@@ -134,27 +133,25 @@
public void start()
throws Exception
{
- InstrumentManagerClientLocalImpl client = new InstrumentManagerClientLocalImpl( m_manager );
-
// Register all of the helpers that we support
if ( m_xml )
{
// XML
String nameBase = "xml-";
initAndRegisterHandler(
- new XMLInstrumentManagerHandler( client ), nameBase + "instrument-manager" );
+ new XMLInstrumentManagerHandler( m_manager ), nameBase + "instrument-manager" );
initAndRegisterHandler(
- new XMLInstrumentableHandler( client ), nameBase + "instrumentable" );
+ new XMLInstrumentableHandler( m_manager ), nameBase + "instrumentable" );
initAndRegisterHandler(
- new XMLInstrumentHandler( client ), nameBase + "instrument" );
- initAndRegisterHandler( new XMLSampleHandler( client ), nameBase + "sample" );
+ new XMLInstrumentHandler( m_manager ), nameBase + "instrument" );
+ initAndRegisterHandler( new XMLSampleHandler( m_manager ), nameBase + "sample" );
initAndRegisterHandler(
- new XMLSampleLeaseHandler( client ), nameBase + "sample-lease" );
+ new XMLSampleLeaseHandler( m_manager ), nameBase + "sample-lease" );
initAndRegisterHandler(
- new XMLCreateSampleHandler( client ), nameBase + "create-sample" );
- initAndRegisterHandler( new XMLSnapshotHandler( client ), nameBase + "snapshot" );
- initAndRegisterHandler( new XMLSnapshotsHandler( client ), nameBase + "snapshots" );
- initAndRegisterHandler( new XMLGCHandler( client ), nameBase + "gc" );
+ new XMLCreateSampleHandler( m_manager ), nameBase + "create-sample" );
+ initAndRegisterHandler( new XMLSnapshotHandler( m_manager ), nameBase + "snapshot" );
+ initAndRegisterHandler( new XMLSnapshotsHandler( m_manager ), nameBase + "snapshots" );
+ initAndRegisterHandler( new XMLGCHandler( m_manager ), nameBase + "gc" );
}
if ( m_html )
@@ -162,19 +159,19 @@
// HTML
String nameBase = "html-";
initAndRegisterHandler(
- new HTMLInstrumentManagerHandler( client ), nameBase + "instrument-manager" );
+ new HTMLInstrumentManagerHandler( m_manager ), nameBase + "instrument-manager" );
initAndRegisterHandler(
- new HTMLInstrumentableHandler( client ), nameBase + "instrumentable" );
+ new HTMLInstrumentableHandler( m_manager ), nameBase + "instrumentable" );
initAndRegisterHandler(
- new HTMLInstrumentHandler( client ), nameBase + "instrument" );
- initAndRegisterHandler( new HTMLSampleHandler( client ), nameBase + "sample" );
+ new HTMLInstrumentHandler( m_manager ), nameBase + "instrument" );
+ initAndRegisterHandler( new HTMLSampleHandler( m_manager ), nameBase + "sample" );
initAndRegisterHandler(
- new HTMLSampleLeaseHandler( client ), nameBase + "sample-lease" );
+ new HTMLSampleLeaseHandler( m_manager ), nameBase + "sample-lease" );
initAndRegisterHandler(
- new HTMLCreateSampleHandler( client ), nameBase + "create-sample" );
- initAndRegisterHandler( new SampleChartHandler( client ), "sample-chart" );
- initAndRegisterHandler( new HTMLGCHandler( client ), nameBase + "gc" );
- initAndRegisterHandler( new HTMLRootHandler( client ), nameBase + "root" );
+ new HTMLCreateSampleHandler( m_manager ), nameBase + "create-sample" );
+ initAndRegisterHandler( new SampleChartHandler( m_manager ), "sample-chart" );
+ initAndRegisterHandler( new HTMLGCHandler( m_manager ), nameBase + "gc" );
+ initAndRegisterHandler( new HTMLRootHandler( m_manager ), nameBase + "root" );
}
getLogger().debug( "Starting Instrument Manager HTTP Connector" );
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/SampleChartHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/SampleChartHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/SampleChartHandler.java Wed Jul 28 12:19:05 2004
@@ -32,10 +32,10 @@
import org.apache.excalibur.instrument.manager.http.server.AbstractHTTPURLHandler;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
import org.apache.excalibur.instrument.manager.http.server.URLCoder;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleSnapshot;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -47,7 +47,7 @@
extends AbstractHTTPURLHandler
{
/** The instrument manager */
- private InstrumentManagerClient m_manager;
+ private DefaultInstrumentManager m_manager;
/*---------------------------------------------------------------
* Constructors
@@ -56,9 +56,9 @@
* Creates a new SampleChartHandler.
*
* @param path The path handled by this handler.
- * @param manager Reference to the instrument manager client interface.
+ * @param manager Reference to the instrument manager interface.
*/
- public SampleChartHandler( InstrumentManagerClient manager )
+ public SampleChartHandler( DefaultInstrumentManager manager )
{
super( "/sample-chart.jpg", CONTENT_TYPE_IMAGE_JPEG,
InstrumentManagerHTTPConnector.ENCODING );
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLCreateSampleHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLCreateSampleHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLCreateSampleHandler.java Wed Jul 28 12:19:05 2004
@@ -23,10 +23,10 @@
import java.util.Map;
import org.apache.excalibur.instrument.manager.http.server.HTTPRedirect;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentException;
/**
*
@@ -43,9 +43,9 @@
/**
* Creates a new XMLCreateSampleHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public XMLCreateSampleHandler( InstrumentManagerClient manager )
+ public XMLCreateSampleHandler( DefaultInstrumentManager manager )
{
super( "/create-sample.xml", manager );
}
@@ -74,7 +74,7 @@
InstrumentDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentDescriptor( name );
}
catch ( NoSuchInstrumentException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLGCHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLGCHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLGCHandler.java Wed Jul 28 12:19:05 2004
@@ -21,9 +21,9 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -40,9 +40,9 @@
/**
* Creates a new XMLGCHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public XMLGCHandler( InstrumentManagerClient manager )
+ public XMLGCHandler( DefaultInstrumentManager manager )
{
super( "/gc.xml", manager );
}
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentException;
/**
*
@@ -44,7 +44,7 @@
* @param path The path handled by this handler.
* @param contentType The content type.
*/
- public XMLInstrumentHandler( InstrumentManagerClient manager )
+ public XMLInstrumentHandler( DefaultInstrumentManager manager )
{
super( "/instrument.xml", manager );
}
@@ -69,7 +69,7 @@
InstrumentDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentDescriptor( name );
}
catch ( NoSuchInstrumentException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentManagerHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentManagerHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentManagerHandler.java Wed Jul 28 12:19:05 2004
@@ -21,7 +21,7 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
*
@@ -41,7 +41,7 @@
* @param path The path handled by this handler.
* @param contentType The content type.
*/
- public XMLInstrumentManagerHandler( InstrumentManagerClient manager )
+ public XMLInstrumentManagerHandler( DefaultInstrumentManager manager )
{
super( "/instrument-manager.xml", manager );
}
@@ -63,7 +63,7 @@
boolean recurse = ( getParameter( parameters, "recurse", null ) != null );
out.println( InstrumentManagerHTTPConnector.XML_BANNER );
- outputInstrumentManager( out, getInstrumentManagerClient(), "", recurse, packed );
+ outputInstrumentManager( out, getInstrumentManager(), "", recurse, packed );
}
/*---------------------------------------------------------------
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentableHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentableHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLInstrumentableHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentableException;
/**
*
@@ -44,7 +44,7 @@
* @param path The path handled by this handler.
* @param contentType The content type.
*/
- public XMLInstrumentableHandler( InstrumentManagerClient manager )
+ public XMLInstrumentableHandler( DefaultInstrumentManager manager )
{
super( "/instrumentable.xml", manager );
}
@@ -69,7 +69,7 @@
InstrumentableDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentableDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentableDescriptor( name );
}
catch ( NoSuchInstrumentableException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -44,7 +44,7 @@
* @param path The path handled by this handler.
* @param contentType The content type.
*/
- public XMLSampleHandler( InstrumentManagerClient manager )
+ public XMLSampleHandler( DefaultInstrumentManager manager )
{
super( "/sample.xml", manager );
}
@@ -68,7 +68,7 @@
InstrumentSampleDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentSampleDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentSampleDescriptor( name );
}
catch ( NoSuchInstrumentSampleException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleLeaseHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleLeaseHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSampleLeaseHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -41,9 +41,9 @@
/**
* Creates a new XMLSampleLeaseHandler.
*
- * @param manager Reference to the InstrumentManagerClient.
+ * @param manager Reference to the DefaultInstrumentManager.
*/
- public XMLSampleLeaseHandler( InstrumentManagerClient manager )
+ public XMLSampleLeaseHandler( DefaultInstrumentManager manager )
{
super( "/sample-lease.xml", manager );
}
@@ -68,7 +68,7 @@
InstrumentSampleDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentSampleDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentSampleDescriptor( name );
}
catch ( NoSuchInstrumentSampleException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -44,7 +44,7 @@
* @param path The path handled by this handler.
* @param contentType The content type.
*/
- public XMLSnapshotHandler( InstrumentManagerClient manager )
+ public XMLSnapshotHandler( DefaultInstrumentManager manager )
{
super( "/snapshot.xml", manager );
}
@@ -70,7 +70,7 @@
InstrumentSampleDescriptor desc;
try
{
- desc = getInstrumentManagerClient().locateInstrumentSampleDescriptor( name );
+ desc = getInstrumentManager().locateInstrumentSampleDescriptor( name );
}
catch ( NoSuchInstrumentSampleException e )
{
Modified: excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotsHandler.java
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotsHandler.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-http/src/java/org/apache/excalibur/instrument/manager/http/XMLSnapshotsHandler.java Wed Jul 28 12:19:05 2004
@@ -22,9 +22,9 @@
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
/**
*
@@ -44,7 +44,7 @@
* @param path The path handled by this handler.
* @param contentType The content type.
*/
- public XMLSnapshotsHandler( InstrumentManagerClient manager )
+ public XMLSnapshotsHandler( DefaultInstrumentManager manager )
{
super( "/snapshots.xml", manager );
}
@@ -88,7 +88,7 @@
try
{
desc =
- getInstrumentManagerClient().locateInstrumentSampleDescriptor( names[i] );
+ getInstrumentManager().locateInstrumentSampleDescriptor( names[i] );
outputSampleHistory( out, desc, "", baseTimes[i], packed, compact );
}
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractInstrumentSample.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java Wed Jul 28 12:19:05 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import java.util.StringTokenizer;
import java.util.Calendar;
@@ -24,16 +24,17 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleUtils;
+
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleListener;
+import org.apache.excalibur.instrument.manager.InstrumentSampleSnapshot;
+import org.apache.excalibur.instrument.manager.InstrumentSampleUtils;
/**
* An AbstractInstrumentSample contains all of the functionality common to all
* InstrumentSamples.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.5 $ $Date: 2004/02/28 11:47:25 $
- * @since 4.1
*/
abstract class AbstractInstrumentSample
extends AbstractLogEnabled
@@ -61,7 +62,7 @@
private String m_description;
/** The Descriptor for the InstrumentSample. */
- private InstrumentSampleDescriptorLocal m_descriptor;
+ private InstrumentSampleDescriptor m_descriptor;
/**
* The maximum amount of time between updates before history will be
@@ -155,7 +156,7 @@
init( 0 );
// Create the descriptor
- m_descriptor = new InstrumentSampleDescriptorLocalImpl( this );
+ m_descriptor = new InstrumentSampleDescriptorImpl( this );
}
/*---------------------------------------------------------------
@@ -227,7 +228,7 @@
*
* @return A Descriptor for the InstrumentSample.
*/
- public InstrumentSampleDescriptorLocal getDescriptor()
+ public InstrumentSampleDescriptor getDescriptor()
{
return m_descriptor;
}
@@ -386,8 +387,8 @@
{
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "A InstrumentSampleListener was added to sample, " + m_name + " : " +
- listener.getClass().getName() );
+ getLogger().debug( "An InstrumentSampleListener was added to sample, " + m_name
+ + " : " + listener.getClass().getName() );
}
synchronized( this )
@@ -424,8 +425,8 @@
{
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "A InstrumentSampleListener was removed from sample, " + m_name +
- " : " + listener.getClass().getName() );
+ getLogger().debug( "An InstrumentSampleListener was removed from sample, " + m_name
+ + " : " + listener.getClass().getName() );
}
synchronized( this )
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractValueInstrumentSample.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/AbstractValueInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java Wed Jul 28 12:19:05 2004
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.ValueInstrumentListener;
/**
* An AbstractValueInstrumentSample contains all of the functionality common
@@ -74,13 +76,13 @@
* Returns the Type of the Instrument which can use the sample. This
* should be the same for all instances of a class.
* <p>
- * This InstrumentSample returns InstrumentManager.PROFILE_POINT_TYPE_VALUE
+ * This InstrumentSample returns DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE
*
* @return The Type of the Instrument which can use the sample.
*/
public final int getInstrumentType()
{
- return InstrumentManagerClient.INSTRUMENT_TYPE_VALUE;
+ return DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE;
}
/**
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/CounterInstrumentSample.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/CounterInstrumentSample.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/CounterInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/CounterInstrumentSample.java Wed Jul 28 12:19:05 2004
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.CounterInstrumentListener;
/**
* A InstrumentSample which stores the number of times that increment has been
* called during the sample period.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
- * @since 4.1
*/
class CounterInstrumentSample
extends AbstractInstrumentSample
@@ -73,20 +73,20 @@
*/
public int getType()
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER;
}
/**
* Returns the Type of the Instrument which can use the sample. This
* should be the same for all instances of a class.
* <p>
- * This InstrumentSample returns InstrumentManager.PROFILE_POINT_TYPE_COUNTER
+ * This InstrumentSample returns DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER
*
* @return The Type of the Instrument which can use the sample.
*/
public final int getInstrumentType()
{
- return InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER;
+ return DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER;
}
/**
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java Wed Jul 28 12:19:05 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -41,16 +41,22 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
+
import org.apache.excalibur.instrument.AbstractInstrument;
import org.apache.excalibur.instrument.CounterInstrument;
import org.apache.excalibur.instrument.Instrument;
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.instrument.Instrumentable;
import org.apache.excalibur.instrument.ValueInstrument;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
+
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManagerConnector;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentException;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentableException;
/**
*
@@ -58,9 +64,9 @@
* @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
* @since 4.1
*/
-public class DefaultInstrumentManager
+public class DefaultInstrumentManagerImpl
extends AbstractLogEnabled
- implements Configurable, Initializable, Disposable, InstrumentManager,
+ implements Configurable, Initializable, Disposable, DefaultInstrumentManager,
Instrumentable, Runnable
{
public static final String INSTRUMENT_TOTAL_MEMORY = "total-memory";
@@ -104,8 +110,8 @@
/** Optimized array of the InstrumentableProxies. */
private InstrumentableProxy[] m_instrumentableProxyArray;
- /** Optimized array of the InstrumentableDescriptorLocals. */
- private InstrumentableDescriptorLocal[] m_instrumentableDescriptorArray;
+ /** Optimized array of the InstrumentableDescriptors. */
+ private InstrumentableDescriptor[] m_instrumentableDescriptorArray;
/** List of leased InstrumentSamples. */
private ArrayList m_leasedInstrumentSamples = new ArrayList();
@@ -171,22 +177,22 @@
* Constructors
*-------------------------------------------------------------*/
/**
- * Creates a new DefaultInstrumentManager.
+ * Creates a new DefaultInstrumentManagerImpl.
*
* @param name The name used to identify this InstrumentManager. Should not
* contain any spaces or periods.
*
* @deprecated Name should be set in the instrument configuration file.
*/
- public DefaultInstrumentManager( String name )
+ public DefaultInstrumentManagerImpl( String name )
{
this();
}
/**
- * Creates a new DefaultInstrumentManager.
+ * Creates a new DefaultInstrumentManagerImpl.
*/
- public DefaultInstrumentManager()
+ public DefaultInstrumentManagerImpl()
{
// Initialize the Instrumentable elements.
m_totalMemoryInstrument = new ValueInstrument( INSTRUMENT_TOTAL_MEMORY );
@@ -312,8 +318,8 @@
try
{
Class clazz = Class.forName( className );
- InstrumentManagerConnector connector =
- (InstrumentManagerConnector)clazz.newInstance();
+ DefaultInstrumentManagerConnector connector =
+ (DefaultInstrumentManagerConnector)clazz.newInstance();
// Initialize the new connector
connector.setInstrumentManager( this );
@@ -381,7 +387,8 @@
// Shutdown the connectors
for ( Iterator iter = m_connectors.iterator(); iter.hasNext(); )
{
- InstrumentManagerConnector connector = (InstrumentManagerConnector)iter.next();
+ DefaultInstrumentManagerConnector connector =
+ (DefaultInstrumentManagerConnector)iter.next();
try
{
ContainerUtil.stop( connector );
@@ -493,14 +500,13 @@
stateChanged();
}
-
/*---------------------------------------------------------------
- * Methods
+ * DefaultInstrumentManager Methods
*-------------------------------------------------------------*/
/**
- * Returns the name used to identify this InstrumentManager.
+ * Returns the name used to identify this DefaultInstrumentManager.
*
- * @return The name used to identify this InstrumentManager.
+ * @return The name used to identify this DefaultInstrumentManager.
*/
public String getName()
{
@@ -508,9 +514,9 @@
}
/**
- * Returns the description of this InstrumentManager.
+ * Returns the description of this DefaultInstrumentManager.
*
- * @return The description of this InstrumentManager.
+ * @return The description of this DefaultInstrumentManager.
*/
public String getDescription()
{
@@ -518,8 +524,8 @@
}
/**
- * Returns an InstrumentableDescriptorLocal based on its name or the name
- * of any of its children.
+ * Returns a InstrumentableDescriptor based on its name or the name of any
+ * of its children.
*
* @param instrumentableName Name of the Instrumentable being requested.
*
@@ -528,7 +534,7 @@
* @throws NoSuchInstrumentableException If the specified Instrumentable
* does not exist.
*/
- public InstrumentableDescriptorLocal getInstrumentableDescriptor( String instrumentableName )
+ public InstrumentableDescriptor getInstrumentableDescriptor( String instrumentableName )
throws NoSuchInstrumentableException
{
InstrumentableProxy proxy = getInstrumentableProxy( instrumentableName );
@@ -543,14 +549,13 @@
/**
* Returns an array of Descriptors for the Instrumentables managed by this
- * InstrumentManager.
+ * DefaultInstrumentManager.
*
- * @return An array of Descriptors for the Instrumentables managed by this
- * InstrumentManager.
+ * @return An array of InstrumentableDescriptors.
*/
- public InstrumentableDescriptorLocal[] getInstrumentableDescriptors()
+ public InstrumentableDescriptor[] getInstrumentableDescriptors()
{
- InstrumentableDescriptorLocal[] descriptors = m_instrumentableDescriptorArray;
+ InstrumentableDescriptor[] descriptors = m_instrumentableDescriptorArray;
if( descriptors == null )
{
descriptors = updateInstrumentableDescriptorArray();
@@ -559,17 +564,17 @@
}
/**
- * Searches the entire instrument tree an instrumentable with the given
+ * Searches the entire instrument tree for an instrumentable with the given
* name.
*
* @param instrumentableName Name of the Instrumentable being requested.
*
* @return A Descriptor of the requested Instrumentable.
*
- * @throws NoSuchInstrumentableException If the specified Instrumentable does
- * not exist.
+ * @throws NoSuchInstrumentableException If the specified Instrumentable
+ * does not exist.
*/
- public InstrumentableDescriptorLocal locateInstrumentableDescriptor( String instrumentableName )
+ public InstrumentableDescriptor locateInstrumentableDescriptor( String instrumentableName )
throws NoSuchInstrumentableException
{
InstrumentableProxy instrumentableProxy =
@@ -589,7 +594,8 @@
}
/**
- * Searches the entire instrument tree an instrument with the given name.
+ * Searches the entire instrument tree for an instrument with the given
+ * name.
*
* @param instrumentName Name of the Instrument being requested.
*
@@ -598,7 +604,7 @@
* @throws NoSuchInstrumentException If the specified Instrument does
* not exist.
*/
- public InstrumentDescriptorLocal locateInstrumentDescriptor( String instrumentName )
+ public InstrumentDescriptor locateInstrumentDescriptor( String instrumentName )
throws NoSuchInstrumentException
{
InstrumentableProxy instrumentableProxy =
@@ -624,8 +630,8 @@
}
/**
- * Searches the entire instrument tree an instrument sample with the given
- * name.
+ * Searches the entire instrument tree for an instrument sample with the
+ * given name.
*
* @param sampleName Name of the Instrument Sample being requested.
*
@@ -634,7 +640,7 @@
* @throws NoSuchInstrumentSampleException If the specified Instrument
* Sample does not exist.
*/
- public InstrumentSampleDescriptorLocal locateInstrumentSampleDescriptor( String sampleName )
+ public InstrumentSampleDescriptor locateInstrumentSampleDescriptor( String sampleName )
throws NoSuchInstrumentSampleException
{
InstrumentableProxy instrumentableProxy =
@@ -663,21 +669,22 @@
throw new NoSuchInstrumentSampleException(
"No instrument sample can be found with the name: " + sampleName );
}
-
+
/**
- * Returns the stateVersion of the instrument manager. The state version
- * will be incremented each time any of the configuration of the
- * instrument manager or any of its children is modified.
+ * Returns the stateVersion of the DefaultInstrumeManager. The state
+ * version will be incremented each time any of the configuration of
+ * the instrument manager or any of its children is modified.
+ * <p>
* Clients can use this value to tell whether or not anything has
* changed without having to do an exhaustive comparison.
*
* @return The state version of the instrument manager.
*/
- int getStateVersion()
+ public int getStateVersion()
{
return m_stateVersion;
}
-
+
/**
* Invokes garbage collection.
*/
@@ -686,8 +693,111 @@
System.gc();
}
-
+ /*---------------------------------------------------------------
+ * Instrumentable Methods
+ *-------------------------------------------------------------*/
+ /**
+ * Sets the name for the Instrumentable. The Instrumentable Name is used
+ * to uniquely identify the Instrumentable during the configuration of
+ * the InstrumentManager and to gain access to an InstrumentableDescriptor
+ * through the InstrumentManager. The value should be a string which does
+ * not contain spaces or periods.
+ * <p>
+ * This value may be set by a parent Instrumentable, or by the
+ * InstrumentManager using the value of the 'instrumentable' attribute in
+ * the configuration of the component.
+ *
+ * @param name The name used to identify a Instrumentable.
+ */
+ public void setInstrumentableName( String name )
+ {
+ m_instrumentableName = name;
+ }
+
+ /**
+ * Gets the name of the Instrumentable.
+ *
+ * @return The name used to identify a Instrumentable.
+ */
+ public String getInstrumentableName()
+ {
+ return m_instrumentableName;
+ }
+
+ /**
+ * Obtain a reference to all the Instruments that the Instrumentable object
+ * wishes to expose. All sampling is done directly through the
+ * Instruments as opposed to the Instrumentable interface.
+ *
+ * @return An array of the Instruments available for profiling. Should
+ * never be null. If there are no Instruments, then
+ * EMPTY_INSTRUMENT_ARRAY can be returned. This should never be
+ * the case though unless there are child Instrumentables with
+ * Instruments.
+ */
+ public Instrument[] getInstruments()
+ {
+ return new Instrument[]
+ {
+ m_totalMemoryInstrument,
+ m_freeMemoryInstrument,
+ m_memoryInstrument,
+ m_activeThreadCountInstrument,
+ m_registrationsInstrument,
+ m_instrumentablesInstrument,
+ m_instrumentsInstrument,
+ m_samplesInstrument,
+ m_leasedSamplesInstrument,
+ m_leaseRequestsInstrument
+ };
+ }
+
+ /**
+ * Any Object which implements Instrumentable can also make use of other
+ * Instrumentable child objects. This method is used to tell the
+ * InstrumentManager about them.
+ *
+ * @return An array of child Instrumentables. This method should never
+ * return null. If there are no child Instrumentables, then
+ * EMPTY_INSTRUMENTABLE_ARRAY can be returned.
+ */
+ public Instrumentable[] getChildInstrumentables()
+ {
+ return Instrumentable.EMPTY_INSTRUMENTABLE_ARRAY;
+ }
+
+ /*---------------------------------------------------------------
+ * Runnable Methods
+ *-------------------------------------------------------------*/
+ public void run()
+ {
+ while( m_runner != null )
+ {
+ try
+ {
+ Thread.sleep( 1000 );
+
+ memoryInstruments();
+ threadInstruments();
+ testInstrumentSampleLeases();
+ // Handle the state file if it is set
+ long now = System.currentTimeMillis();
+ if( now - m_lastStateSave >= m_stateInterval )
+ {
+ saveState();
+ }
+ }
+ catch( Throwable t )
+ {
+ getLogger().error( "Encountered an unexpected error.", t );
+ }
+ }
+ }
+
+ /*---------------------------------------------------------------
+ * State File Methods
+ *-------------------------------------------------------------*/
/**
* Loads the Instrument Manager state from the specified file.
*
@@ -896,109 +1006,122 @@
}
/*---------------------------------------------------------------
- * Instrumentable Methods
+ * Package Methods
*-------------------------------------------------------------*/
/**
- * Sets the name for the Instrumentable. The Instrumentable Name is used
- * to uniquely identify the Instrumentable during the configuration of
- * the InstrumentManager and to gain access to an InstrumentableDescriptor
- * through the InstrumentManager. The value should be a string which does
- * not contain spaces or periods.
- * <p>
- * This value may be set by a parent Instrumentable, or by the
- * InstrumentManager using the value of the 'instrumentable' attribute in
- * the configuration of the component.
+ * Registers an InstrumentSample which has been leased so that the
+ * Instrument Manager can efficiently purge it when it has expired.
*
- * @param name The name used to identify a Instrumentable.
+ * @param instrumentSample Leased InstrumentSample to register.
*/
- public void setInstrumentableName( String name )
+ void registerLeasedInstrumentSample( InstrumentSample instrumentSample )
{
- m_instrumentableName = name;
+ synchronized( m_leasedInstrumentSamples )
+ {
+ // Make sure that the sample is really leased.
+ if ( instrumentSample.getLeaseExpirationTime() <= 0 )
+ {
+ throw new IllegalStateException( "Got an InstrumentSample that was not leased." );
+ }
+
+ // Make sure that it is not already in the list.
+ if ( m_leasedInstrumentSamples.indexOf( instrumentSample ) < 0 )
+ {
+ m_leasedInstrumentSamples.add( instrumentSample );
+ m_leasedInstrumentSampleArray = null;
+ }
+ }
}
-
+
/**
- * Gets the name of the Instrumentable.
- *
- * @return The name used to identify a Instrumentable.
+ * Called whenever the state of the instrument manager is changed.
*/
- public String getInstrumentableName()
+ void stateChanged()
{
- return m_instrumentableName;
+ m_stateVersion++;
}
-
+
/**
- * Obtain a reference to all the Instruments that the Instrumentable object
- * wishes to expose. All sampling is done directly through the
- * Instruments as opposed to the Instrumentable interface.
- *
- * @return An array of the Instruments available for profiling. Should
- * never be null. If there are no Instruments, then
- * EMPTY_INSTRUMENT_ARRAY can be returned. This should never be
- * the case though unless there are child Instrumentables with
- * Instruments.
+ * Called to increment the number of Instrumentables registered.
*/
- public Instrument[] getInstruments()
+ void incrementInstrumentableCount()
{
- return new Instrument[]
+ int count;
+ synchronized( m_semaphore )
{
- m_totalMemoryInstrument,
- m_freeMemoryInstrument,
- m_memoryInstrument,
- m_activeThreadCountInstrument,
- m_registrationsInstrument,
- m_instrumentablesInstrument,
- m_instrumentsInstrument,
- m_samplesInstrument,
- m_leasedSamplesInstrument,
- m_leaseRequestsInstrument
- };
+ count = ++m_instrumentableCount;
+ }
+ m_instrumentablesInstrument.setValue( count );
}
-
+
/**
- * Any Object which implements Instrumentable can also make use of other
- * Instrumentable child objects. This method is used to tell the
- * InstrumentManager about them.
- *
- * @return An array of child Instrumentables. This method should never
- * return null. If there are no child Instrumentables, then
- * EMPTY_INSTRUMENTABLE_ARRAY can be returned.
+ * Called to increment the number of Instruments registered.
*/
- public Instrumentable[] getChildInstrumentables()
+ void incrementInstrumentCount()
{
- return Instrumentable.EMPTY_INSTRUMENTABLE_ARRAY;
+ int count;
+ synchronized( m_semaphore )
+ {
+ count = ++m_instrumentCount;
+ }
+ m_instrumentsInstrument.setValue( count );
}
-
- /*---------------------------------------------------------------
- * Runnable Methods
- *-------------------------------------------------------------*/
- public void run()
+
+ /**
+ * Called to increment the number of Permanent Instrument Samples registered.
+ */
+ void incrementPermanentSampleCount()
{
- while( m_runner != null )
+ int count;
+ synchronized( m_semaphore )
{
- try
- {
- Thread.sleep( 1000 );
-
- memoryInstruments();
- threadInstruments();
- testInstrumentSampleLeases();
-
- // Handle the state file if it is set
- long now = System.currentTimeMillis();
- if( now - m_lastStateSave >= m_stateInterval )
- {
- saveState();
- }
- }
- catch( Throwable t )
- {
- getLogger().error( "Encountered an unexpected error.", t );
- }
+ count = ++m_permanentSampleCount + m_leasedSampleCount;
+ }
+ m_samplesInstrument.setValue( count );
+ }
+
+ /**
+ * Called to increment the number of Leased Instrument Samples registered.
+ */
+ void incrementLeasedSampleCount()
+ {
+ int count;
+ int leasedCount;
+ synchronized( m_semaphore )
+ {
+ leasedCount = ++m_leasedSampleCount;
+ count = m_permanentSampleCount + m_leasedSampleCount;
}
+ m_samplesInstrument.setValue( count );
+ m_leasedSamplesInstrument.setValue( leasedCount );
}
-
+
+ /**
+ * Called to decrement the number of Leased Instrument Samples registered.
+ */
+ void decrementLeasedSampleCount()
+ {
+ int count;
+ int leasedCount;
+ synchronized( m_semaphore )
+ {
+ leasedCount = --m_leasedSampleCount;
+ count = m_permanentSampleCount + m_leasedSampleCount;
+ }
+ m_samplesInstrument.setValue( count );
+ m_leasedSamplesInstrument.setValue( leasedCount );
+ }
+
+ /**
+ * Increment the lease requests.
+ */
+ void incrementLeaseRequests()
+ {
+ m_leaseRequestsInstrument.increment();
+ }
+
/*---------------------------------------------------------------
- * Methods
+ * Private Methods
*-------------------------------------------------------------*/
/**
* Saves the state to the current state file if configured.
@@ -1191,31 +1314,6 @@
}
/**
- * Registers an InstrumentSample which has been leased so that the
- * Instrument Manager can efficiently purge it when it has expired.
- *
- * @param instrumentSample Leased InstrumentSample to register.
- */
- void registerLeasedInstrumentSample( InstrumentSample instrumentSample )
- {
- synchronized( m_leasedInstrumentSamples )
- {
- // Make sure that the sample is really leased.
- if ( instrumentSample.getLeaseExpirationTime() <= 0 )
- {
- throw new IllegalStateException( "Got an InstrumentSample that was not leased." );
- }
-
- // Make sure that it is not already in the list.
- if ( m_leasedInstrumentSamples.indexOf( instrumentSample ) < 0 )
- {
- m_leasedInstrumentSamples.add( instrumentSample );
- m_leasedInstrumentSampleArray = null;
- }
- }
- }
-
- /**
* Updates the cached array of InstrumentableProxies taking
* synchronization into account.
*
@@ -1250,12 +1348,12 @@
}
/**
- * Updates the cached array of InstrumentableDescriptorLocals taking
+ * Updates the cached array of InstrumentableDescriptors taking
* synchronization into account.
*
* @return An array of the InstrumentableDescriptors.
*/
- private InstrumentableDescriptorLocal[] updateInstrumentableDescriptorArray()
+ private InstrumentableDescriptor[] updateInstrumentableDescriptorArray()
{
synchronized( m_semaphore )
{
@@ -1265,7 +1363,7 @@
}
m_instrumentableDescriptorArray =
- new InstrumentableDescriptorLocal[ m_instrumentableProxyArray.length ];
+ new InstrumentableDescriptor[ m_instrumentableProxyArray.length ];
for( int i = 0; i < m_instrumentableProxyArray.length; i++ )
{
m_instrumentableDescriptorArray[ i ] = m_instrumentableProxyArray[ i ].getDescriptor();
@@ -1387,11 +1485,11 @@
// class of the actual Instrument.
if( instrument instanceof CounterInstrument )
{
- proxy.setType( InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER );
+ proxy.setType( DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER );
}
else if( instrument instanceof ValueInstrument )
{
- proxy.setType( InstrumentManagerClient.INSTRUMENT_TYPE_VALUE );
+ proxy.setType( DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE );
}
else
{
@@ -1416,15 +1514,15 @@
{
switch( proxy.getType() )
{
- case InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER:
// Type is the same.
// Store a reference to the proxy in the Instrument.
( (AbstractInstrument)instrument ).setInstrumentProxy( proxy );
break;
- case InstrumentManagerClient.INSTRUMENT_TYPE_NONE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_NONE:
// Not yet set. Created in configuration.
- proxy.setType( InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER );
+ proxy.setType( DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER );
// Store a reference to the proxy in the Instrument.
( (AbstractInstrument)instrument ).setInstrumentProxy( proxy );
@@ -1440,15 +1538,15 @@
{
switch( proxy.getType() )
{
- case InstrumentManagerClient.INSTRUMENT_TYPE_VALUE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE:
// Type is the same.
// Store a reference to the proxy in the Instrument.
( (AbstractInstrument)instrument ).setInstrumentProxy( proxy );
break;
- case InstrumentManagerClient.INSTRUMENT_TYPE_NONE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_NONE:
// Not yet set. Created in configuration.
- proxy.setType( InstrumentManagerClient.INSTRUMENT_TYPE_VALUE );
+ proxy.setType( DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE );
// Store a reference to the proxy in the Instrument.
( (AbstractInstrument)instrument ).setInstrumentProxy( proxy );
@@ -1509,93 +1607,6 @@
// Recurse to the child
registerInstrumentableInner( child, proxy, fullChildName );
}
- }
-
- /**
- * Called whenever the state of the instrument manager is changed.
- */
- protected void stateChanged()
- {
- m_stateVersion++;
- }
-
- /**
- * Called to increment the number of Instrumentables registered.
- */
- protected void incrementInstrumentableCount()
- {
- int count;
- synchronized( m_semaphore )
- {
- count = ++m_instrumentableCount;
- }
- m_instrumentablesInstrument.setValue( count );
- }
-
- /**
- * Called to increment the number of Instruments registered.
- */
- protected void incrementInstrumentCount()
- {
- int count;
- synchronized( m_semaphore )
- {
- count = ++m_instrumentCount;
- }
- m_instrumentsInstrument.setValue( count );
- }
-
- /**
- * Called to increment the number of Permanent Instrument Samples registered.
- */
- protected void incrementPermanentSampleCount()
- {
- int count;
- synchronized( m_semaphore )
- {
- count = ++m_permanentSampleCount + m_leasedSampleCount;
- }
- m_samplesInstrument.setValue( count );
- }
-
- /**
- * Called to increment the number of Leased Instrument Samples registered.
- */
- protected void incrementLeasedSampleCount()
- {
- int count;
- int leasedCount;
- synchronized( m_semaphore )
- {
- leasedCount = ++m_leasedSampleCount;
- count = m_permanentSampleCount + m_leasedSampleCount;
- }
- m_samplesInstrument.setValue( count );
- m_leasedSamplesInstrument.setValue( leasedCount );
- }
-
- /**
- * Called to decrement the number of Leased Instrument Samples registered.
- */
- protected void decrementLeasedSampleCount()
- {
- int count;
- int leasedCount;
- synchronized( m_semaphore )
- {
- leasedCount = --m_leasedSampleCount;
- count = m_permanentSampleCount + m_leasedSampleCount;
- }
- m_samplesInstrument.setValue( count );
- m_leasedSamplesInstrument.setValue( leasedCount );
- }
-
- /**
- * Increment the lease requests.
- */
- protected void incrementLeaseRequests()
- {
- m_leaseRequestsInstrument.increment();
}
}
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentDescriptorImpl.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptorLocalImpl.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentDescriptorLocalImpl.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentDescriptorImpl.java Wed Jul 28 12:19:05 2004
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.CounterInstrumentListener;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentSampleException;
+import org.apache.excalibur.instrument.manager.ValueInstrumentListener;
/**
* Describes a Instrument and acts as a Proxy to protect the original
@@ -29,8 +32,8 @@
* @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
* @since 4.1
*/
-public class InstrumentDescriptorLocalImpl
- implements InstrumentDescriptorLocal
+public class InstrumentDescriptorImpl
+ implements InstrumentDescriptor
{
/** InstrumentProxy being described. */
private InstrumentProxy m_instrumentProxy;
@@ -43,7 +46,7 @@
*
* @param instrumentProxy InstrumentProxy being described.
*/
- InstrumentDescriptorLocalImpl( InstrumentProxy instrumentProxy )
+ InstrumentDescriptorImpl( InstrumentProxy instrumentProxy )
{
m_instrumentProxy = instrumentProxy;
}
@@ -118,96 +121,6 @@
*/
public InstrumentableDescriptor getInstrumentableDescriptor()
{
- return getInstrumentableDescriptorLocal();
- }
-
- /**
- * Returns a InstrumentSampleDescriptor based on its name.
- *
- * @param instrumentSampleName Name of the InstrumentSample being requested.
- *
- * @return A Descriptor of the requested InstrumentSample.
- *
- * @throws NoSuchInstrumentSampleException If the specified InstrumentSample
- * does not exist.
- */
- public InstrumentSampleDescriptor getInstrumentSampleDescriptor( String instrumentSampleName )
- throws NoSuchInstrumentSampleException
- {
- return getInstrumentSampleDescriptorLocal( instrumentSampleName );
- }
-
- /**
- * Returns a InstrumentSampleDescriptor based on its name. If the requested
- * sample is invalid in any way, then an expired Descriptor will be
- * returned.
- *
- * @param sampleDescription Description to assign to the new Sample.
- * @param sampleInterval Sample interval to use in the new Sample.
- * @param sampleLease Requested lease time for the new Sample in
- * milliseconds. The InstrumentManager may grant a
- * lease which is shorter or longer than the requested
- * period.
- * @param sampleType Type of sample to request. Must be one of the
- * following: InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN.
- *
- * @return A Descriptor of the requested InstrumentSample.
- *
- * @throws NoSuchInstrumentSampleException If the specified InstrumentSample
- * does not exist.
- */
- public InstrumentSampleDescriptor createInstrumentSample( String sampleDescription,
- long sampleInterval,
- int sampleSize,
- long sampleLease,
- int sampleType )
- {
- return createInstrumentSampleLocal(
- sampleDescription, sampleInterval, sampleSize, sampleLease, sampleType );
- }
-
- /**
- * Returns an array of Descriptors for the InstrumentSamples configured for this
- * Instrument.
- *
- * @return An array of Descriptors for the InstrumentSamples configured for this
- * Instrument.
- */
- public InstrumentSampleDescriptor[] getInstrumentSampleDescriptors()
- {
- return getInstrumentSampleDescriptorLocals();
- }
-
-
- /**
- * Returns the stateVersion of the instrument. The state version will be
- * incremented each time any of the configuration of the instrument or
- * any of its children is modified.
- * Clients can use this value to tell whether or not anything has
- * changed without having to do an exhaustive comparison.
- *
- * @return The state version of the instrument.
- */
- public int getStateVersion()
- {
- return m_instrumentProxy.getStateVersion();
- }
-
- /*---------------------------------------------------------------
- * InstrumentDescriptorLocal Methods
- *-------------------------------------------------------------*/
- /**
- * Returns a reference to the descriptor of the Instrumentable of the
- * instrument.
- *
- * @return A reference to the descriptor of the Instrumentable of the
- * instrument.
- */
- public InstrumentableDescriptorLocal getInstrumentableDescriptorLocal()
- {
return m_instrumentProxy.getInstrumentableProxy().getDescriptor();
}
@@ -249,7 +162,7 @@
* profile updates.
*
* @throws IllegalStateException If the Instrument's type is not
- * InstrumentManager.PROFILE_POINT_TYPE_VALUE.
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE.
*/
public void addValueInstrumentListener( ValueInstrumentListener listener )
{
@@ -264,7 +177,7 @@
* events.
*
* @throws IllegalStateException If the Instrument's type is not
- * InstrumentManager.PROFILE_POINT_TYPE_VALUE.
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE.
*/
public void removeValueInstrumentListener( ValueInstrumentListener listener )
{
@@ -272,7 +185,7 @@
}
/**
- * Returns a InstrumentSampleDescriptorLocal based on its name.
+ * Returns a InstrumentSampleDescriptor based on its name.
*
* @param instrumentSampleName Name of the InstrumentSample being requested.
*
@@ -281,8 +194,7 @@
* @throws NoSuchInstrumentSampleException If the specified InstrumentSample
* does not exist.
*/
- public InstrumentSampleDescriptorLocal getInstrumentSampleDescriptorLocal(
- String instrumentSampleName )
+ public InstrumentSampleDescriptor getInstrumentSampleDescriptor( String instrumentSampleName )
throws NoSuchInstrumentSampleException
{
InstrumentSample instrumentSample =
@@ -297,7 +209,7 @@
}
/**
- * Returns a InstrumentSampleDescriptorLocal based on its name. If the requested
+ * Returns a InstrumentSampleDescriptor based on its name. If the requested
* sample is invalid in any way, then an expired Descriptor will be
* returned.
*
@@ -318,11 +230,11 @@
* @throws NoSuchInstrumentSampleException If the specified InstrumentSample
* does not exist.
*/
- public InstrumentSampleDescriptorLocal createInstrumentSampleLocal( String sampleDescription,
- long sampleInterval,
- int sampleSize,
- long sampleLease,
- int sampleType )
+ public InstrumentSampleDescriptor createInstrumentSample( String sampleDescription,
+ long sampleInterval,
+ int sampleSize,
+ long sampleLease,
+ int sampleType )
{
InstrumentSample sample = m_instrumentProxy.createInstrumentSample(
sampleDescription, sampleInterval, sampleSize, sampleLease, sampleType );
@@ -336,8 +248,22 @@
* @return An array of Descriptors for the InstrumentSamples configured for this
* Instrument.
*/
- public InstrumentSampleDescriptorLocal[] getInstrumentSampleDescriptorLocals()
+ public InstrumentSampleDescriptor[] getInstrumentSampleDescriptors()
{
return m_instrumentProxy.getInstrumentSampleDescriptors();
+ }
+
+ /**
+ * Returns the stateVersion of the instrument. The state version will be
+ * incremented each time any of the configuration of the instrument or
+ * any of its children is modified.
+ * Clients can use this value to tell whether or not anything has
+ * changed without having to do an exhaustive comparison.
+ *
+ * @return The state version of the instrument.
+ */
+ public int getStateVersion()
+ {
+ return m_instrumentProxy.getStateVersion();
}
}
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java (from rev 30845, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentProxy.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentProxy.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java Wed Jul 28 12:19:05 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import java.util.Arrays;
import java.util.Comparator;
@@ -27,13 +27,19 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleUtils;
+
+import org.apache.excalibur.instrument.manager.CounterInstrumentListener;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentListener;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleUtils;
+import org.apache.excalibur.instrument.manager.ValueInstrumentListener;
/**
* Instrumentables which do not implement ThreadSafe may have multiple instances
* created by the ComponentLocator. Each of these Instruments will share
- * a common key and are profiled as a group. The InstrumentProxy is used
+ * a common key and are instrumented as a group. The InstrumentProxy is used
* make it easy for the InstrumentManager to control groups of Instruments
* as one.
* <p>
@@ -64,7 +70,7 @@
private String m_description;
/** The Descriptor for the Instrument. */
- private InstrumentDescriptorLocal m_descriptor;
+ private InstrumentDescriptor m_descriptor;
/** Type of the Instrument */
private int m_type;
@@ -78,8 +84,8 @@
/** Optimized array of the InstrumentSamples. */
private InstrumentSample[] m_sampleArray;
- /** Optimized array of the InstrumentSampleDescriptorLocals. */
- private InstrumentSampleDescriptorLocal[] m_sampleDescriptorArray;
+ /** Optimized array of the InstrumentSampleDescriptors. */
+ private InstrumentSampleDescriptor[] m_sampleDescriptorArray;
/** Child logger to use for logging of new values. */
private Logger m_valueLogger;
@@ -110,7 +116,7 @@
m_description = description;
// Create the descriptor
- m_descriptor = new InstrumentDescriptorLocalImpl( this );
+ m_descriptor = new InstrumentDescriptorImpl( this );
}
/*---------------------------------------------------------------
@@ -225,7 +231,7 @@
* InstrumentProxy Methods
*-------------------------------------------------------------*/
/**
- * Used by classes being profiles so that they can avoid unnecessary
+ * Used by classes being instrumented so that they can avoid unnecessary
* code when the data from a Instrument is not being used.
*
* @returns True if listeners are registered with the Instrument.
@@ -243,7 +249,7 @@
*/
public void increment( int count )
{
- if ( m_type != InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER )
+ if ( m_type != DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER )
{
// Type is not correct.
throw new IllegalStateException(
@@ -278,7 +284,7 @@
*/
public void setValue( int value )
{
- if ( m_type != InstrumentManagerClient.INSTRUMENT_TYPE_VALUE )
+ if ( m_type != DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE )
{
// Type is not correct.
throw new IllegalStateException(
@@ -359,9 +365,8 @@
/**
* Gets the name for the Instrument. The Instrument Name is used to
- * uniquely identify the Instrument during the configuration of the
- * Profiler and to gain access to a InstrumentDescriptor through a
- * InstrumentManager.
+ * uniquely identify the Instrument during configuration and to gain
+ * access to a InstrumentDescriptor through an InstrumentManager.
*
* @return The name used to identify a Instrumentable.
*/
@@ -372,8 +377,8 @@
/**
* Sets the description for the Instrument. This description will
- * be set during the configuration of the profiler if a configuration
- * exists for this Instrument.
+ * be set during configuration if a configuration exists for this
+ * Instrument.
*
* @param description The description of the Instrument.
*/
@@ -406,7 +411,7 @@
*
* @return A Descriptor for the Instrument.
*/
- InstrumentDescriptorLocal getDescriptor()
+ InstrumentDescriptor getDescriptor()
{
return m_descriptor;
}
@@ -420,14 +425,14 @@
{
synchronized(this)
{
- if ( m_type != InstrumentManagerClient.INSTRUMENT_TYPE_NONE )
+ if ( m_type != DefaultInstrumentManager.INSTRUMENT_TYPE_NONE )
{
throw new IllegalStateException( "Type already set." );
}
switch ( type )
{
- case InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER:
- case InstrumentManagerClient.INSTRUMENT_TYPE_VALUE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE:
m_type = type;
break;
default:
@@ -451,14 +456,14 @@
* receive updates of the value of the Instrument.
*
* @param listener CounterInstrumentListener which will start receiving
- * profile updates.
+ * updates.
*
* @throws IllegalStateException If the Instrument's type is not
* InstrumentManager.INSTRUMENT_TYPE_COUNTER.
*/
void addCounterInstrumentListener( CounterInstrumentListener listener )
{
- if ( m_type != InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER )
+ if ( m_type != DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER )
{
// Type is not correct.
throw new IllegalStateException(
@@ -476,17 +481,16 @@
/**
* Removes a InstrumentListener from the list of listeners which will
- * receive profile events.
+ * receive events.
*
- * @param listener InstrumentListener which will stop receiving profile
- * events.
+ * @param listener InstrumentListener which will stop receiving events.
*
* @throws IllegalStateException If the Instrument's type is not
* InstrumentManager.INSTRUMENT_TYPE_COUNTER.
*/
void removeCounterInstrumentListener( CounterInstrumentListener listener )
{
- if ( m_type != InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER )
+ if ( m_type != DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER )
{
// Type is not correct.
throw new IllegalStateException(
@@ -507,14 +511,14 @@
* receive updates of the value of the Instrument.
*
* @param listener ValueInstrumentListener which will start receiving
- * profile updates.
+ * updates.
*
* @throws IllegalStateException If the Instrument's type is not
* InstrumentManager.INSTRUMENT_TYPE_VALUE.
*/
void addValueInstrumentListener( ValueInstrumentListener listener )
{
- if ( m_type != InstrumentManagerClient.INSTRUMENT_TYPE_VALUE )
+ if ( m_type != DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE )
{
// Type is not correct.
throw new IllegalStateException(
@@ -536,17 +540,16 @@
/**
* Removes a InstrumentListener from the list of listeners which will
- * receive profile events.
+ * receive events.
*
- * @param listener InstrumentListener which will stop receiving profile
- * events.
+ * @param listener InstrumentListener which will stop receiving events.
*
* @throws IllegalStateException If the Instrument's type is not
* InstrumentManager.INSTRUMENT_TYPE_VALUE.
*/
void removeValueInstrumentListener( ValueInstrumentListener listener )
{
- if ( m_type != InstrumentManagerClient.INSTRUMENT_TYPE_VALUE )
+ if ( m_type != DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE )
{
// Type is not correct.
throw new IllegalStateException(
@@ -573,7 +576,7 @@
{
// If the type has not been set, set it. If it has been set, make sure this sample has
// the same type.
- if ( m_type == InstrumentManagerClient.INSTRUMENT_TYPE_NONE )
+ if ( m_type == DefaultInstrumentManager.INSTRUMENT_TYPE_NONE )
{
setType( instrumentSample.getInstrumentType() );
}
@@ -604,11 +607,11 @@
// Add the sample as a listener for this Instrument.
switch ( m_type )
{
- case InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER:
addCounterInstrumentListener( (CounterInstrumentSample)instrumentSample );
break;
- case InstrumentManagerClient.INSTRUMENT_TYPE_VALUE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE:
addValueInstrumentListener( (AbstractValueInstrumentSample)instrumentSample );
break;
@@ -642,11 +645,11 @@
// Remove the sample from the listener list for this Instrument.
switch ( m_type )
{
- case InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER:
removeCounterInstrumentListener( (CounterInstrumentSample)instrumentSample );
break;
- case InstrumentManagerClient.INSTRUMENT_TYPE_VALUE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE:
removeValueInstrumentListener( (AbstractValueInstrumentSample)instrumentSample );
break;
@@ -699,7 +702,7 @@
}
/**
- * Returns a InstrumentSampleDescriptorLocal based on its name. If the
+ * Returns an InstrumentSampleDescriptor based on its name. If the
* requested sample is invalid in any way, then an expired Descriptor
* will be returned.
*
@@ -710,10 +713,10 @@
* lease which is shorter or longer than the requested
* period.
* @param sampleType Type of sample to request. Must be one of the
- * following: InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN.
+ * following: DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN.
*
* @return The requested InstrumentSample.
*
@@ -772,9 +775,9 @@
* @return An array of Descriptors for the InstrumentSamples in the
* Instrument.
*/
- InstrumentSampleDescriptorLocal[] getInstrumentSampleDescriptors()
+ InstrumentSampleDescriptor[] getInstrumentSampleDescriptors()
{
- InstrumentSampleDescriptorLocal[] descriptors = m_sampleDescriptorArray;
+ InstrumentSampleDescriptor[] descriptors = m_sampleDescriptorArray;
if ( descriptors == null )
{
descriptors = updateInstrumentSampleDescriptorArray();
@@ -801,7 +804,7 @@
* receive updates of the value of the Instrument.
*
* @param listener InstrumentListener which will start receiving
- * profile updates.
+ * updates.
*/
private void addInstrumentListener( InstrumentListener listener )
{
@@ -834,7 +837,7 @@
* receive updates of the value of the Instrument.
*
* @param listener InstrumentListener which will stop receiving
- * profile updates.
+ * updates.
*/
private void removeInstrumentListener( InstrumentListener listener )
{
@@ -939,12 +942,12 @@
}
/**
- * Updates the cached array of InstrumentSampleDescriptorLocals taking
+ * Updates the cached array of InstrumentSampleDescriptors taking
* synchronization into account.
*
* @return An array of the InstrumentSampleDescriptors.
*/
- private InstrumentSampleDescriptorLocal[] updateInstrumentSampleDescriptorArray()
+ private InstrumentSampleDescriptor[] updateInstrumentSampleDescriptorArray()
{
synchronized(this)
{
@@ -954,7 +957,7 @@
}
m_sampleDescriptorArray =
- new InstrumentSampleDescriptorLocal[ m_sampleArray.length ];
+ new InstrumentSampleDescriptor[ m_sampleArray.length ];
for ( int i = 0; i < m_sampleArray.length; i++ )
{
m_sampleDescriptorArray[i] = m_sampleArray[i].getDescriptor();
@@ -1084,11 +1087,11 @@
{
switch ( type )
{
- case InstrumentManagerClient.INSTRUMENT_TYPE_NONE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_NONE:
return "none";
- case InstrumentManagerClient.INSTRUMENT_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER:
return "counter";
- case InstrumentManagerClient.INSTRUMENT_TYPE_VALUE:
+ case DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE:
return "value";
default:
throw new IllegalArgumentException( type + " is not a known Instrument type." );
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSample.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java Wed Jul 28 12:19:05 2004
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
+
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleListener;
+import org.apache.excalibur.instrument.manager.InstrumentSampleSnapshot;
/**
* InstrumentSamples are used to provide an Instrument with state. Samples
@@ -82,10 +85,10 @@
/**
* Returns the type of the Instrument Sample. Possible values include
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN, or
- * InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM.
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM,
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN, or
+ * DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM.
*
* @return The type of the Instrument Sample.
*/
@@ -96,7 +99,7 @@
*
* @return A Descriptor for the InstrumentSample.
*/
- InstrumentSampleDescriptorLocal getDescriptor();
+ InstrumentSampleDescriptor getDescriptor();
/**
* Obtain the value of the sample. All samples are integers, so the profiled
@@ -118,8 +121,9 @@
* Returns the Type of the Instrument which can use the sample. This
* should be the same for all instances of a class.
* <p>
- * Should be one of the following: InstrumentManager.PROFILE_POINT_TYPE_COUNTER
- * or InstrumentManager.PROFILE_POINT_TYPE_VALUE
+ * Should be one of the following:
+ * DefaultInstrumentManager.INSTRUMENT_TYPE_COUNTER
+ * or DefaultInstrumentManager.INSTRUMENT_TYPE_VALUE
*
* @return The Type of the Instrument which can use the sample.
*/
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSampleDescriptorImpl.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptorLocalImpl.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleDescriptorLocalImpl.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSampleDescriptorImpl.java Wed Jul 28 12:19:05 2004
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentSampleListener;
+import org.apache.excalibur.instrument.manager.InstrumentSampleSnapshot;
/**
* Describes an InstrumentSample and acts as a Proxy to protect the original
@@ -28,8 +30,8 @@
* @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
* @since 4.1
*/
-public class InstrumentSampleDescriptorLocalImpl
- implements InstrumentSampleDescriptorLocal
+public class InstrumentSampleDescriptorImpl
+ implements InstrumentSampleDescriptor
{
/** The InstrumentSample. */
private InstrumentSample m_instrumentSample;
@@ -42,7 +44,7 @@
*
* @param InstrumentSample InstrumentSample being described.
*/
- InstrumentSampleDescriptorLocalImpl( InstrumentSample InstrumentSample )
+ InstrumentSampleDescriptorImpl( InstrumentSample InstrumentSample )
{
m_instrumentSample = InstrumentSample;
}
@@ -158,7 +160,29 @@
*/
public InstrumentDescriptor getInstrumentDescriptor()
{
- return getInstrumentDescriptorLocal();
+ return m_instrumentSample.getInstrumentProxy().getDescriptor();
+ }
+
+ /**
+ * Registers a InstrumentSampleListener with a InstrumentSample given a name.
+ *
+ * @param listener The listener which should start receiving updates from the
+ * InstrumentSample.
+ */
+ public void addInstrumentSampleListener( InstrumentSampleListener listener )
+ {
+ m_instrumentSample.addInstrumentSampleListener( listener );
+ }
+
+ /**
+ * Unregisters a InstrumentSampleListener from a InstrumentSample given a name.
+ *
+ * @param listener The listener which should stop receiving updates from the
+ * InstrumentSample.
+ */
+ public void removeInstrumentSampleListener( InstrumentSampleListener listener )
+ {
+ m_instrumentSample.removeInstrumentSampleListener( listener );
}
/**
@@ -207,41 +231,6 @@
public int getStateVersion()
{
return m_instrumentSample.getStateVersion();
- }
-
- /*---------------------------------------------------------------
- * Methods InstrumentSampleDescriptorLocal
- *-------------------------------------------------------------*/
- /**
- * Returns a reference to the descriptor of the Instrument of the sample.
- *
- * @return A reference to the descriptor of the Instrument of the sample.
- */
- public InstrumentDescriptorLocal getInstrumentDescriptorLocal()
- {
- return m_instrumentSample.getInstrumentProxy().getDescriptor();
- }
-
- /**
- * Registers a InstrumentSampleListener with a InstrumentSample given a name.
- *
- * @param listener The listener which should start receiving updates from the
- * InstrumentSample.
- */
- public void addInstrumentSampleListener( InstrumentSampleListener listener )
- {
- m_instrumentSample.addInstrumentSampleListener( listener );
- }
-
- /**
- * Unregisters a InstrumentSampleListener from a InstrumentSample given a name.
- *
- * @param listener The listener which should stop receiving updates from the
- * InstrumentSample.
- */
- public void removeInstrumentSampleListener( InstrumentSampleListener listener )
- {
- m_instrumentSample.removeInstrumentSampleListener( listener );
}
}
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSampleFactory.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleFactory.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentSampleFactory.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSampleFactory.java Wed Jul 28 12:19:05 2004
@@ -15,17 +15,15 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
* The InstrumentSample represents a single data sample in a ProfileDataSet.
* Access to InstrumentSamples are synchronized through the ProfileDataSet.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
- * @since 4.1
*/
class InstrumentSampleFactory
{
@@ -52,19 +50,19 @@
{
switch ( type )
{
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM:
return new MaximumValueInstrumentSample(
instrumentProxy, name, interval, size, description, lease );
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM:
return new MinimumValueInstrumentSample(
instrumentProxy, name, interval, size, description, lease );
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN:
return new MeanValueInstrumentSample(
instrumentProxy, name, interval, size, description, lease );
- case InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_COUNTER:
+ case DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_COUNTER:
return new CounterInstrumentSample(
instrumentProxy, name, interval, size, description, lease );
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableDescriptorImpl.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptorLocalImpl.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableDescriptorLocalImpl.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableDescriptorImpl.java Wed Jul 28 12:19:05 2004
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentException;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentableException;
/**
* Describes a Instrumentable and acts as a Proxy to protect the original
@@ -30,8 +30,8 @@
* @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
* @since 4.1
*/
-public class InstrumentableDescriptorLocalImpl
- implements InstrumentableDescriptorLocal
+public class InstrumentableDescriptorImpl
+ implements InstrumentableDescriptor
{
/** InstrumentableProxy being described. */
private InstrumentableProxy m_instrumentableProxy;
@@ -40,11 +40,11 @@
* Constructors
*-------------------------------------------------------------*/
/**
- * Creates a new InstrumentableDescriptorLocalImpl.
+ * Creates a new InstrumentableDescriptorImpl.
*
* @param instrumentableProxy InstrumentableProxy being described.
*/
- InstrumentableDescriptorLocalImpl( InstrumentableProxy instrumentableProxy )
+ InstrumentableDescriptorImpl( InstrumentableProxy instrumentableProxy )
{
m_instrumentableProxy = instrumentableProxy;
}
@@ -75,10 +75,10 @@
}
/**
- * Gets the name for the Instrumentable. The Instrumentable Name is used to
- * uniquely identify the Instrumentable during the configuration of the
- * Profiler and to gain access to a InstrumentableDescriptor through a
- * ProfilerManager.
+ * Gets the name for the Instrumentable. The Instrumentable Name is used
+ * to uniquely identify the Instrumentable during its configuration and to
+ * gain access to a InstrumentableDescriptor through a
+ * DefaultInstrumentManager.
*
* @return The name used to identify a Instrumentable.
*/
@@ -105,93 +105,6 @@
*/
public InstrumentableDescriptor getParentInstrumentableDescriptor()
{
- return getParentInstrumentableDescriptorLocal();
- }
-
- /**
- * Returns a child InstrumentableDescriptor based on its name or the name
- * of any of its children.
- *
- * @param childInstrumentableName Name of the child Instrumentable being
- * requested.
- *
- * @return A descriptor of the requested child Instrumentable.
- *
- * @throws NoSuchInstrumentableException If the specified Instrumentable
- * does not exist.
- */
- public InstrumentableDescriptor getChildInstrumentableDescriptor(
- String childInstrumentableName )
- throws NoSuchInstrumentableException
- {
- return getChildInstrumentableDescriptorLocal( childInstrumentableName );
- }
-
- /**
- * Returns an array of Descriptors for the child Instrumentables registered
- * by this Instrumentable.
- *
- * @return An array of Descriptors for the child Instrumentables registered
- * by this Instrumentable.
- */
- public InstrumentableDescriptor[] getChildInstrumentableDescriptors()
- {
- return getChildInstrumentableDescriptorLocals();
- }
-
- /**
- * Returns a InstrumentDescriptor based on its name.
- *
- * @param instrumentName Name of the Instrument being requested.
- *
- * @return A Descriptor of the requested Instrument.
- *
- * @throws NoSuchInstrumentException If the specified Instrument does
- * not exist.
- */
- public InstrumentDescriptor getInstrumentDescriptor( String instrumentName )
- throws NoSuchInstrumentException
- {
- return getInstrumentDescriptorLocal( instrumentName );
- }
-
- /**
- * Returns an array of Descriptors for the Instruments registered by this
- * Instrumentable.
- *
- * @return An array of Descriptors for the Instruments registered by this
- * Instrumentable.
- */
- public InstrumentDescriptor[] getInstrumentDescriptors()
- {
- return getInstrumentDescriptorLocals();
- }
-
- /**
- * Returns the stateVersion of the instrumentable. The state version
- * will be incremented each time any of the configuration of the
- * instrumentable or any of its children is modified.
- * Clients can use this value to tell whether or not anything has
- * changed without having to do an exhaustive comparison.
- *
- * @return The state version of the instrumentable.
- */
- public int getStateVersion()
- {
- return m_instrumentableProxy.getStateVersion();
- }
-
- /*---------------------------------------------------------------
- * InstrumentableDescriptorLocal Methods
- *-------------------------------------------------------------*/
- /**
- * Returns the parent InstrumentableDescriptorLocal or null if this is a
- * top level instrumentable.
- *
- * @return The parent InstrumentableDescriptorLocal or null.
- */
- public InstrumentableDescriptorLocal getParentInstrumentableDescriptorLocal()
- {
InstrumentableProxy parent = m_instrumentableProxy.getParentInstrumentableProxy();
if ( parent == null )
{
@@ -202,10 +115,10 @@
return parent.getDescriptor();
}
}
-
+
/**
- * Returns a child InstrumentableDescriptorLocal based on its name or the
- * name of any of its children.
+ * Returns a child InstrumentableDescriptor based on its name or the name
+ * of any of its children.
*
* @param childInstrumentableName Name of the child Instrumentable being
* requested.
@@ -215,8 +128,8 @@
* @throws NoSuchInstrumentableException If the specified Instrumentable
* does not exist.
*/
- public InstrumentableDescriptorLocal getChildInstrumentableDescriptorLocal(
- String childInstrumentableName )
+ public InstrumentableDescriptor getChildInstrumentableDescriptor(
+ String childInstrumentableName )
throws NoSuchInstrumentableException
{
InstrumentableProxy instrumentableProxy =
@@ -237,13 +150,13 @@
* @return An array of Descriptors for the child Instrumentables registered
* by this Instrumentable.
*/
- public InstrumentableDescriptorLocal[] getChildInstrumentableDescriptorLocals()
+ public InstrumentableDescriptor[] getChildInstrumentableDescriptors()
{
return m_instrumentableProxy.getChildInstrumentableDescriptors();
}
-
+
/**
- * Returns a InstrumentDescriptorLocal based on its name.
+ * Returns a InstrumentDescriptor based on its name.
*
* @param instrumentName Name of the Instrument being requested.
*
@@ -252,7 +165,7 @@
* @throws NoSuchInstrumentException If the specified Instrument does
* not exist.
*/
- public InstrumentDescriptorLocal getInstrumentDescriptorLocal( String instrumentName )
+ public InstrumentDescriptor getInstrumentDescriptor( String instrumentName )
throws NoSuchInstrumentException
{
InstrumentProxy instrumentProxy =
@@ -273,8 +186,22 @@
* @return An array of Descriptors for the Instruments registered by this
* Instrumentable.
*/
- public InstrumentDescriptorLocal[] getInstrumentDescriptorLocals()
+ public InstrumentDescriptor[] getInstrumentDescriptors()
{
return m_instrumentableProxy.getInstrumentDescriptors();
+ }
+
+ /**
+ * Returns the stateVersion of the instrumentable. The state version
+ * will be incremented each time any of the configuration of the
+ * instrumentable or any of its children is modified.
+ * Clients can use this value to tell whether or not anything has
+ * changed without having to do an exhaustive comparison.
+ *
+ * @return The state version of the instrumentable.
+ */
+ public int getStateVersion()
+ {
+ return m_instrumentableProxy.getStateVersion();
}
}
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java (from rev 30845, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableProxy.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/InstrumentableProxy.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java Wed Jul 28 12:19:05 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import java.util.Arrays;
import java.util.Comparator;
@@ -27,6 +27,9 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+
/**
* A InstrumentableProxy makes it easy for the InstrumentManager to manage
* Instrumentables and their Instruments.
@@ -42,7 +45,7 @@
implements Configurable
{
/** InstrumentManager which owns the proxy. */
- private DefaultInstrumentManager m_instrumentManager;
+ private DefaultInstrumentManagerImpl m_instrumentManager;
/** The parent Instrumentable proxy or null if this is a top level
* Instrumentable. */
@@ -61,7 +64,7 @@
private String m_description;
/** The Descriptor for the Instrumentable. */
- private InstrumentableDescriptorLocalImpl m_descriptor;
+ private InstrumentableDescriptorImpl m_descriptor;
/** Map of the Child InstrumentableProxies owned by this InstrumentableProxy. */
private HashMap m_childInstrumentableProxies = new HashMap();
@@ -69,8 +72,8 @@
/** Optimized array of the child InstrumentableProxies. */
private InstrumentableProxy[] m_childInstrumentableProxyArray;
- /** Optimized array of the child InstrumentableDescriptorLocals. */
- private InstrumentableDescriptorLocal[] m_childInstrumentableDescriptorArray;
+ /** Optimized array of the child InstrumentableDescriptors. */
+ private InstrumentableDescriptor[] m_childInstrumentableDescriptorArray;
/** Map of the InstrumentProxies owned by this InstrumentableProxy. */
private HashMap m_instrumentProxies = new HashMap();
@@ -78,8 +81,8 @@
/** Optimized array of the InstrumentProxies. */
private InstrumentProxy[] m_instrumentProxyArray;
- /** Optimized array of the InstrumentDescriptorLocals. */
- private InstrumentDescriptorLocal[] m_instrumentDescriptorArray;
+ /** Optimized array of the InstrumentDescriptors. */
+ private InstrumentDescriptor[] m_instrumentDescriptorArray;
/** State Version. */
private int m_stateVersion;
@@ -96,7 +99,7 @@
* @param name The name used to identify a Instrumentable.
* @param description The description of the the Instrumentable.
*/
- InstrumentableProxy( DefaultInstrumentManager instrumentManager,
+ InstrumentableProxy( DefaultInstrumentManagerImpl instrumentManager,
InstrumentableProxy parentInstrumentableProxy,
String name,
String description )
@@ -107,19 +110,19 @@
m_description = description;
// Create the descriptor
- m_descriptor = new InstrumentableDescriptorLocalImpl( this );
+ m_descriptor = new InstrumentableDescriptorImpl( this );
}
/*---------------------------------------------------------------
* Configurable Methods
*-------------------------------------------------------------*/
/**
- * Configures the Instrumentable. Called from the ProfilerManager's
+ * Configures the Instrumentable. Called from the InstrumentManager's
* configure method. The class does not need to be configured to
* function correctly.
*
* @param configuration Instrumentable configuration element from the
- * ProfilerManager's configuration.
+ * InstrumentManager's configuration.
*
* @throws ConfigurationException If there are any configuration problems.
*/
@@ -201,7 +204,7 @@
*
* @return InstrumentManager which owns the proxy.
*/
- DefaultInstrumentManager getInstrumentManager()
+ DefaultInstrumentManagerImpl getInstrumentManager()
{
return m_instrumentManager;
}
@@ -253,10 +256,9 @@
}
/**
- * Gets the name for the Instrumentable. The Instrumentable Name is used to
- * uniquely identify the Instrumentable during the configuration of the
- * Profiler and to gain access to a InstrumentableDescriptor through a
- * ProfilerManager.
+ * Gets the name for the Instrumentable. The Instrumentable Name is used
+ * to uniquely identify the Instrumentable during its configuration and to
+ * gain access to a InstrumentableDescriptor through an InstrumentManager.
*
* @return The name used to identify a Instrumentable.
*/
@@ -267,8 +269,8 @@
/**
* Sets the description for the instrumentable object. This description will
- * be set during the configuration of the profiler if a configuration
- * exists for this Instrumentable.
+ * be set during the configuration of the Instrumentable if a configuration
+ * exists.
*
* @param description The description of the Instrumentable.
*/
@@ -301,7 +303,7 @@
*
* @return A Descriptor for the Instrumentable.
*/
- InstrumentableDescriptorLocal getDescriptor()
+ InstrumentableDescriptor getDescriptor()
{
return m_descriptor;
}
@@ -311,10 +313,9 @@
*-------------------------------------------------------------*/
/**
* Adds a child InstrumentableProxy to the Instrumentable. This method
- * will be called during the configuration phase of the Profiler if an
- * element defining the child Instrumentable exists, or if the
- * Instrumentable registers itself with the InstrumentManager as it
- * is running.
+ * will be called during the configuration phase if an element defining
+ * the child Instrumentable exists, or if the Instrumentable registers
+ * itself with the InstrumentManager as it is running.
* <p>
* This method should never be called for child Instrumentables which
* have already been added.
@@ -399,9 +400,9 @@
* @return An array of Descriptors for the child Instrumentables in this
* Instrumentable.
*/
- InstrumentableDescriptorLocal[] getChildInstrumentableDescriptors()
+ InstrumentableDescriptor[] getChildInstrumentableDescriptors()
{
- InstrumentableDescriptorLocal[] descriptors = m_childInstrumentableDescriptorArray;
+ InstrumentableDescriptor[] descriptors = m_childInstrumentableDescriptorArray;
if( descriptors == null )
{
descriptors = updateChildInstrumentableDescriptorArray();
@@ -446,12 +447,12 @@
}
/**
- * Updates the cached array of child InstrumentableDescriptorLocals taking
+ * Updates the cached array of child InstrumentableDescriptors taking
* synchronization into account.
*
- * @return An array of the child InstrumentableDescriptorLocals.
+ * @return An array of the child InstrumentableDescriptors.
*/
- private InstrumentableDescriptorLocal[] updateChildInstrumentableDescriptorArray()
+ private InstrumentableDescriptor[] updateChildInstrumentableDescriptorArray()
{
synchronized( this )
{
@@ -461,7 +462,7 @@
}
m_childInstrumentableDescriptorArray =
- new InstrumentableDescriptorLocal[ m_childInstrumentableProxyArray.length ];
+ new InstrumentableDescriptor[ m_childInstrumentableProxyArray.length ];
for( int i = 0; i < m_childInstrumentableProxyArray.length; i++ )
{
m_childInstrumentableDescriptorArray[ i ] =
@@ -477,9 +478,9 @@
*-------------------------------------------------------------*/
/**
* Adds a InstrumentProxy to the Instrumentable. This method will be
- * called during the configuration phase of the Profiler if an element
- * defining the Instrument exists, or if the Instrument registers
- * itself with the ProfilerManager as it is running.
+ * called during the configuration phase if an element defining the
+ * Instrument exists, or if the Instrument registers itself with the
+ * InstrumentManager as it is running.
* <p>
* This method should never be called for Instruments which have already
* been added.
@@ -555,9 +556,9 @@
*
* @return An array of Descriptors for the Instruments in the Instrumentable.
*/
- InstrumentDescriptorLocal[] getInstrumentDescriptors()
+ InstrumentDescriptor[] getInstrumentDescriptors()
{
- InstrumentDescriptorLocal[] descriptors = m_instrumentDescriptorArray;
+ InstrumentDescriptor[] descriptors = m_instrumentDescriptorArray;
if( descriptors == null )
{
descriptors = updateInstrumentDescriptorArray();
@@ -614,12 +615,12 @@
}
/**
- * Updates the cached array of InstrumentDescriptorLocals taking
+ * Updates the cached array of InstrumentDescriptors taking
* synchronization into account.
*
- * @return An array of the InstrumentDescriptorLocals.
+ * @return An array of the InstrumentDescriptors.
*/
- private InstrumentDescriptorLocal[] updateInstrumentDescriptorArray()
+ private InstrumentDescriptor[] updateInstrumentDescriptorArray()
{
synchronized( this )
{
@@ -629,7 +630,7 @@
}
m_instrumentDescriptorArray =
- new InstrumentDescriptorLocal[ m_instrumentProxyArray.length ];
+ new InstrumentDescriptor[ m_instrumentProxyArray.length ];
for( int i = 0; i < m_instrumentProxyArray.length; i++ )
{
m_instrumentDescriptorArray[ i ] = m_instrumentProxyArray[ i ].getDescriptor();
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MaximumValueInstrumentSample.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MaximumValueInstrumentSample.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MaximumValueInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MaximumValueInstrumentSample.java Wed Jul 28 12:19:05 2004
@@ -15,20 +15,19 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
* A InstrumentSample which stores the maximum value set during the sample
* period.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
- * @since 4.1
*/
class MaximumValueInstrumentSample
extends AbstractValueInstrumentSample
@@ -70,7 +69,7 @@
*/
public int getType()
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MAXIMUM;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MAXIMUM;
}
/*---------------------------------------------------------------
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MeanValueInstrumentSample.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MeanValueInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java Wed Jul 28 12:19:05 2004
@@ -15,20 +15,19 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
* A InstrumentSample which stores the mean value set during the sample
* period.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
- * @since 4.1
*/
class MeanValueInstrumentSample
extends AbstractValueInstrumentSample
@@ -70,7 +69,7 @@
*/
public int getType()
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MEAN;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MEAN;
}
/*---------------------------------------------------------------
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MinimumValueInstrumentSample.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MinimumValueInstrumentSample.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/MinimumValueInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MinimumValueInstrumentSample.java Wed Jul 28 12:19:05 2004
@@ -15,20 +15,19 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager;
+package org.apache.excalibur.instrument.manager.impl;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
/**
* A InstrumentSample which stores the minimum value set during the sample
* period.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:25 $
- * @since 4.1
*/
class MinimumValueInstrumentSample
extends AbstractValueInstrumentSample
@@ -70,7 +69,7 @@
*/
public int getType()
{
- return InstrumentManagerClient.INSTRUMENT_SAMPLE_TYPE_MINIMUM;
+ return DefaultInstrumentManager.INSTRUMENT_SAMPLE_TYPE_MINIMUM;
}
/*---------------------------------------------------------------
Copied: excalibur/trunk/containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/impl/DefaultInstrumentManagerImplTestCase.java (from rev 30830, excalibur/trunk/containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/DefaultInstrumentManagerTestCase.java)
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/DefaultInstrumentManagerTestCase.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/test/org/apache/excalibur/instrument/manager/test/impl/DefaultInstrumentManagerImplTestCase.java Wed Jul 28 12:19:05 2004
@@ -15,33 +15,34 @@
* limitations under the License.
*/
-package org.apache.excalibur.instrument.manager.test;
+package org.apache.excalibur.instrument.manager.test.impl;
import junit.framework.TestCase;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
-import org.apache.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
+
+import org.apache.excalibur.instrument.manager.impl.DefaultInstrumentManagerImpl;
+import org.apache.excalibur.instrument.manager.InstrumentDescriptor;
+import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentException;
+import org.apache.excalibur.instrument.manager.NoSuchInstrumentableException;
/**
- * Test of the DefaultInstrumentManager.
+ * Test of the DefaultInstrumentManagerImpl.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:36 $
*/
-public class DefaultInstrumentManagerTestCase
+public class DefaultInstrumentManagerImplTestCase
extends TestCase
{
- private DefaultInstrumentManager m_instrumentManager;
+ private DefaultInstrumentManagerImpl m_instrumentManager;
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
- public DefaultInstrumentManagerTestCase( String name )
+ public DefaultInstrumentManagerImplTestCase( String name )
{
super( name );
}
@@ -58,7 +59,7 @@
DefaultConfiguration instrumentConfig = new DefaultConfiguration( "instrument" );
- m_instrumentManager = new DefaultInstrumentManager();
+ m_instrumentManager = new DefaultInstrumentManagerImpl();
m_instrumentManager.enableLogging( new ConsoleLogger( ConsoleLogger.LEVEL_DEBUG ) );
m_instrumentManager.configure( instrumentConfig );
m_instrumentManager.initialize();
Modified: excalibur/trunk/deprecated/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManagerCreator.java
==============================================================================
--- excalibur/trunk/deprecated/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManagerCreator.java (original)
+++ excalibur/trunk/deprecated/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManagerCreator.java Wed Jul 28 12:19:05 2004
@@ -35,7 +35,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.WrapperServiceManager;
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.Hierarchy;
import org.apache.log.Priority;
@@ -472,7 +472,7 @@
instrumentManagerConfig.getAttribute( "logger", "system.instrument" ) );
// Set up the Instrument Manager
- DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager();
+ DefaultInstrumentManagerImpl instrumentManager = new DefaultInstrumentManagerImpl();
instrumentManager.enableLogging( imLogger );
instrumentManager.configure( instrumentManagerConfig );
instrumentManager.initialize();
Modified: excalibur/trunk/fortress/container-impl/src/java/org/apache/avalon/fortress/util/ContextManager.java
==============================================================================
--- excalibur/trunk/fortress/container-impl/src/java/org/apache/avalon/fortress/util/ContextManager.java (original)
+++ excalibur/trunk/fortress/container-impl/src/java/org/apache/avalon/fortress/util/ContextManager.java Wed Jul 28 12:19:05 2004
@@ -47,7 +47,7 @@
import org.d_haven.event.Pipe;
import org.d_haven.event.command.*;
import org.apache.excalibur.instrument.InstrumentManager;
-import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.impl.DefaultInstrumentManagerImpl;
import org.d_haven.mpool.DefaultPoolManager;
import org.d_haven.mpool.PoolManager;
import org.apache.excalibur.source.Source;
@@ -164,6 +164,7 @@
* Either supplied via rootContext or created locally.
*/
protected InstrumentManager m_instrumentManager;
+
/**
* The components that are "owned" by this context and should
* be disposed by it. Any manager that is created as a result
@@ -960,7 +961,8 @@
instrumentConfig.getAttribute( "logger", "system.instrument" ) );
// Set up the Instrument Manager
- final DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager();
+ final DefaultInstrumentManagerImpl instrumentManager =
+ new DefaultInstrumentManagerImpl();
instrumentManager.enableLogging( imLogger );
instrumentManager.configure( instrumentConfig );
instrumentManager.initialize();
Modified: excalibur/trunk/fortress/container-test/src/test/org/apache/avalon/fortress/util/test/ContextManagerTestCase.java
==============================================================================
--- excalibur/trunk/fortress/container-test/src/test/org/apache/avalon/fortress/util/test/ContextManagerTestCase.java (original)
+++ excalibur/trunk/fortress/container-test/src/test/org/apache/avalon/fortress/util/test/ContextManagerTestCase.java Wed Jul 28 12:19:05 2004
@@ -26,7 +26,7 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.instrument.InstrumentManager;
-import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.impl.DefaultInstrumentManagerImpl;
/**
* ContextManagerTestCase does XYZ
@@ -50,7 +50,7 @@
config.setContainerConfiguration( "resource://org/apache/avalon/fortress/test/data/test1.xconf" );
config.setLoggerManagerConfiguration( "resource://org/apache/avalon/fortress/test/data/test1.xlog" );
- m_instrManager = new DefaultInstrumentManager();
+ m_instrManager = new DefaultInstrumentManagerImpl();
ContainerUtil.enableLogging(m_instrManager, new ConsoleLogger());
ContainerUtil.initialize(m_instrManager);
config.setInstrumentManager(m_instrManager);
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org