You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2002/03/28 05:06:19 UTC
cvs commit: jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces CounterInstrumentListener.java InstrumentableDescriptor.java InstrumentDescriptor.java InstrumentListener.java InstrumentManagerClient.java InstrumentSampleDescriptor.java InstrumentSampleListener.java InstrumentSampleSnapshot.java NoSuchInstrumentableException.java NoSuchInstrumentException.java NoSuchInstrumentSampleException.java ValueInstrumentListener.java
leif 02/03/27 20:06:19
Modified: . ant.properties.sample
instrument-client ant.properties.sample build.xml
instrument-client/example ant.properties.sample build.xml
instrument-client/src/java/org/apache/avalon/excalibur/instrument/client
InstrumentClientFrame.java
InstrumentManagerConnection.java
InstrumentManagerFrame.java
InstrumentSampleFrame.java MenuBar.java
instrument-manager build.xml
instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager
AbstractInstrumentSample.java
AbstractValueInstrumentSample.java
CounterInstrumentSample.java
DefaultInstrumentManager.java
InstrumentableDescriptorImpl.java
InstrumentableProxy.java
InstrumentDescriptorImpl.java
InstrumentManagerClientImpl.java
InstrumentProxy.java InstrumentSample.java
InstrumentSampleDescriptorImpl.java
instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi
InstrumentManagerAltrmiServer.java
Added: instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces
CounterInstrumentListener.java
InstrumentableDescriptor.java
InstrumentDescriptor.java InstrumentListener.java
InstrumentManagerClient.java
InstrumentSampleDescriptor.java
InstrumentSampleListener.java
InstrumentSampleSnapshot.java
NoSuchInstrumentableException.java
NoSuchInstrumentException.java
NoSuchInstrumentSampleException.java
ValueInstrumentListener.java
Removed: instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/client
CounterInstrumentListener.java
InstrumentableDescriptor.java
InstrumentDescriptor.java InstrumentListener.java
InstrumentManagerClient.java
InstrumentSampleDescriptor.java
InstrumentSampleListener.java
InstrumentSampleSnapshot.java
NoSuchInstrumentableException.java
NoSuchInstrumentException.java
NoSuchInstrumentSampleException.java
ValueInstrumentListener.java
Log:
Rename the instrument.manager.client package to instrument.manager.interfaces
Revision Changes Path
1.6 +2 -2 jakarta-avalon-excalibur/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/ant.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ant.properties.sample 27 Mar 2002 11:41:18 -0000 1.5
+++ ant.properties.sample 28 Mar 2002 04:06:17 -0000 1.6
@@ -10,7 +10,7 @@
# building all components. These values are overridable in component-specific
# ant.properties files.
#
-# $Id: ant.properties.sample,v 1.5 2002/03/27 11:41:18 leif Exp $
+# $Id: ant.properties.sample,v 1.6 2002/03/28 04:06:17 leif Exp $
# -----------------------------------------------------------------------------
@@ -56,7 +56,7 @@
# ----- Excalibur Instrument Manager -----
excalibur-instrument-manager.home=${base.path}/jakarta-avalon-excalibur/instrument-manager/build/lib
-excalibur-instrument-manager-client.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-client-0.1.jar
+excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
# ----- Altrmi -----
commons-altrmi.home=${base.path}/jakarta-commons-sandbox/altrmi/dist
1.2 +2 -2 jakarta-avalon-excalibur/instrument-client/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/ant.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.properties.sample 26 Mar 2002 11:32:23 -0000 1.1
+++ ant.properties.sample 28 Mar 2002 04:06:18 -0000 1.2
@@ -9,7 +9,7 @@
# The ant.properties values in this directory apply only to this component, and
# override the defaults in ../ant.properties.
#
-# $Id: ant.properties.sample,v 1.1 2002/03/26 11:32:23 leif Exp $
+# $Id: ant.properties.sample,v 1.2 2002/03/28 04:06:18 leif Exp $
# -----------------------------------------------------------------------------
# --------------------------------------------------
@@ -35,7 +35,7 @@
# ----- Excalibur Instrument Manager -----
excalibur-instrument-manager.home=../instrument-manager/build/lib
-excalibur-instrument-manager-client.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-client-0.1.jar
+excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
# ----- Altrmi -----
commons-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
1.6 +3 -3 jakarta-avalon-excalibur/instrument-client/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 27 Mar 2002 10:35:45 -0000 1.5
+++ build.xml 28 Mar 2002 04:06:18 -0000 1.6
@@ -48,7 +48,7 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${excalibur-instrument-manager-client.jar}"/>
+ <pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
<pathelement location="${commons-altrmi-client-impl.jar}"/>
<pathelement location="${commons-altrmi-client-interfaces.jar}"/>
<pathelement location="${commons-altrmi-common.jar}"/>
@@ -110,8 +110,8 @@
<altrmiproxies genname="InstrumentManagerClient"
srcgendir="${build.genjava}"
classgendir="${build.classes}"
- interfaces="org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient"
- additionalfacades="org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor,org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor,org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor">
+ interfaces="org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient"
+ additionalfacades="org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor,org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor,org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor">
<classpath refid="project.class.path" />
</altrmiproxies>
</target>
1.2 +2 -2 jakarta-avalon-excalibur/instrument-client/example/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/example/ant.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.properties.sample 26 Mar 2002 11:32:23 -0000 1.1
+++ ant.properties.sample 28 Mar 2002 04:06:18 -0000 1.2
@@ -9,7 +9,7 @@
# The ant.properties values in this directory apply only to this component, and
# override the defaults in ../ant.properties.
#
-# $Id: ant.properties.sample,v 1.1 2002/03/26 11:32:23 leif Exp $
+# $Id: ant.properties.sample,v 1.2 2002/03/28 04:06:18 leif Exp $
# -----------------------------------------------------------------------------
# --------------------------------------------------
@@ -35,7 +35,7 @@
# ----- Excalibur Instrument Manager -----
excalibur-instrument-manager.home=../../instrument-manager/build/lib
-excalibur-instrument-manager-client.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-client-0.1.jar
+excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
# ----- Altrmi -----
commons-altrmi.home=../../../jakarta-commons-sandbox/altrmi/dist
1.3 +1 -1 jakarta-avalon-excalibur/instrument-client/example/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/example/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 27 Mar 2002 11:37:53 -0000 1.2
+++ build.xml 28 Mar 2002 04:06:18 -0000 1.3
@@ -34,7 +34,7 @@
todir="${lib.dir}" preservelastmodified="yes"/>
<!-- Instrument Manager Jars -->
- <copy file="${excalibur-instrument-manager-client.jar}"
+ <copy file="${excalibur-instrument-manager-interfaces.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
<!-- Altrmi Jars -->
1.3 +4 -4 jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentClientFrame.java
Index: InstrumentClientFrame.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentClientFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstrumentClientFrame.java 28 Mar 2002 03:15:40 -0000 1.2
+++ InstrumentClientFrame.java 28 Mar 2002 04:06:18 -0000 1.3
@@ -19,14 +19,14 @@
import javax.swing.SwingUtilities;
import javax.swing.border.BevelBorder;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 03:15:40 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
class InstrumentClientFrame
1.3 +2 -2 jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentManagerConnection.java
Index: InstrumentManagerConnection.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentManagerConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstrumentManagerConnection.java 27 Mar 2002 16:02:19 -0000 1.2
+++ InstrumentManagerConnection.java 28 Mar 2002 04:06:18 -0000 1.3
@@ -11,7 +11,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
import org.apache.commons.altrmi.client.AltrmiHostContext;
import org.apache.commons.altrmi.client.AltrmiFactory;
@@ -23,7 +23,7 @@
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/27 16:02:19 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
class InstrumentManagerConnection
1.2 +2 -2 jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentManagerFrame.java
Index: InstrumentManagerFrame.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentManagerFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentManagerFrame.java 26 Mar 2002 11:32:24 -0000 1.1
+++ InstrumentManagerFrame.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -11,7 +11,7 @@
import javax.swing.event.InternalFrameEvent;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -20,7 +20,7 @@
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:32:24 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
class InstrumentManagerFrame
1.2 +9 -9 jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentSampleFrame.java
Index: InstrumentSampleFrame.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentSampleFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentSampleFrame.java 26 Mar 2002 11:32:24 -0000 1.1
+++ InstrumentSampleFrame.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -13,14 +13,14 @@
import javax.swing.SwingConstants;
import javax.swing.event.InternalFrameEvent;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleSnapshot;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentableException;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentException;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentSampleException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -31,7 +31,7 @@
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:32:24 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
class InstrumentSampleFrame
1.3 +5 -5 jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/MenuBar.java
Index: MenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/MenuBar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MenuBar.java 28 Mar 2002 03:15:40 -0000 1.2
+++ MenuBar.java 28 Mar 2002 04:06:18 -0000 1.3
@@ -20,17 +20,17 @@
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
import org.apache.commons.altrmi.common.AltrmiInvocationException;
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 03:15:40 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class MenuBar
1.5 +3 -3 jakarta-avalon-excalibur/instrument-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 27 Mar 2002 05:36:43 -0000 1.4
+++ build.xml 28 Mar 2002 04:06:18 -0000 1.5
@@ -38,7 +38,7 @@
<!-- property to specify name of zip/jar files -->
<property name="dist.name" value="excalibur-${name}-${version}"/>
- <property name="dist-client.name" value="excalibur-${name}-client-${version}"/>
+ <property name="dist-interfaces.name" value="excalibur-${name}-interfaces-${version}"/>
<!-- property indicating directory where all distribution archives are placed -->
<property name="dist.base" value="distributions"/>
@@ -106,10 +106,10 @@
</zipfileset>
</jar>
- <jar jarfile="${build.lib}/${dist-client.name}.jar"
+ <jar jarfile="${build.lib}/${dist-interfaces.name}.jar"
basedir="${build.classes}"
compress="${build.compress}">
- <include name="**/client/**"/>
+ <include name="**/interfaces/**"/>
<exclude name="**/test/**"/>
<zipfileset dir=".." prefix="META-INF/">
<include name="LICENSE.txt"/>
1.2 +4 -4 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/AbstractInstrumentSample.java
Index: AbstractInstrumentSample.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/AbstractInstrumentSample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractInstrumentSample.java 26 Mar 2002 11:56:16 -0000 1.1
+++ AbstractInstrumentSample.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -11,9 +11,9 @@
import java.util.Arrays;
import java.util.StringTokenizer;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleSnapshot;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -25,7 +25,7 @@
* InstrumentSamples.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
abstract class AbstractInstrumentSample
1.2 +3 -3 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/AbstractValueInstrumentSample.java
Index: AbstractValueInstrumentSample.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/AbstractValueInstrumentSample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractValueInstrumentSample.java 26 Mar 2002 11:56:16 -0000 1.1
+++ AbstractValueInstrumentSample.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.excalibur.instrument.manager;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
-import org.apache.avalon.excalibur.instrument.manager.client.ValueInstrumentListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.ValueInstrumentListener;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -19,7 +19,7 @@
* to all InstrumentSamples which represent a fixed value.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
abstract class AbstractValueInstrumentSample
1.2 +3 -3 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/CounterInstrumentSample.java
Index: CounterInstrumentSample.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/CounterInstrumentSample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CounterInstrumentSample.java 26 Mar 2002 11:56:16 -0000 1.1
+++ CounterInstrumentSample.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.excalibur.instrument.manager;
-import org.apache.avalon.excalibur.instrument.manager.client.CounterInstrumentListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.CounterInstrumentListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -18,7 +18,7 @@
* called during the sample period.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
class CounterInstrumentSample
1.3 +4 -4 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/DefaultInstrumentManager.java
Index: DefaultInstrumentManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/DefaultInstrumentManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultInstrumentManager.java 27 Mar 2002 16:01:12 -0000 1.2
+++ DefaultInstrumentManager.java 28 Mar 2002 04:06:18 -0000 1.3
@@ -20,9 +20,9 @@
import org.apache.avalon.excalibur.instrument.Instrumentable;
import org.apache.avalon.excalibur.instrument.InstrumentManager;
import org.apache.avalon.excalibur.instrument.ValueInstrument;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentableException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
@@ -38,7 +38,7 @@
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/27 16:01:12 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class DefaultInstrumentManager
1.2 +4 -4 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentableDescriptorImpl.java
Index: InstrumentableDescriptorImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentableDescriptorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentableDescriptorImpl.java 26 Mar 2002 11:56:16 -0000 1.1
+++ InstrumentableDescriptorImpl.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -7,16 +7,16 @@
*/
package org.apache.avalon.excalibur.instrument.manager;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
/**
* Describes a Instrumentable and acts as a Proxy to protect the original
* Instrumentable.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class InstrumentableDescriptorImpl
1.2 +4 -4 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentableProxy.java
Index: InstrumentableProxy.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentableProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentableProxy.java 26 Mar 2002 11:56:16 -0000 1.1
+++ InstrumentableProxy.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -9,9 +9,9 @@
import java.util.HashMap;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -26,7 +26,7 @@
* Not Synchronized.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
class InstrumentableProxy
1.2 +6 -6 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentDescriptorImpl.java
Index: InstrumentDescriptorImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentDescriptorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentDescriptorImpl.java 26 Mar 2002 11:56:16 -0000 1.1
+++ InstrumentDescriptorImpl.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -7,18 +7,18 @@
*/
package org.apache.avalon.excalibur.instrument.manager;
-import org.apache.avalon.excalibur.instrument.manager.client.CounterInstrumentListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentSampleException;
-import org.apache.avalon.excalibur.instrument.manager.client.ValueInstrumentListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.CounterInstrumentListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentSampleException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.ValueInstrumentListener;
/**
* Describes a Instrument and acts as a Proxy to protect the original
* Instrument.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class InstrumentDescriptorImpl
1.2 +4 -4 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentManagerClientImpl.java
Index: InstrumentManagerClientImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentManagerClientImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentManagerClientImpl.java 26 Mar 2002 11:56:16 -0000 1.1
+++ InstrumentManagerClientImpl.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -7,16 +7,16 @@
*/
package org.apache.avalon.excalibur.instrument.manager;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
-import org.apache.avalon.excalibur.instrument.manager.client.NoSuchInstrumentableException;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.NoSuchInstrumentableException;
import org.apache.avalon.framework.configuration.Configuration;
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class InstrumentManagerClientImpl
1.2 +7 -7 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentProxy.java
Index: InstrumentProxy.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentProxy.java 26 Mar 2002 11:56:16 -0000 1.1
+++ InstrumentProxy.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -11,12 +11,12 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.excalibur.instrument.manager.client.CounterInstrumentListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.ValueInstrumentListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.CounterInstrumentListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.ValueInstrumentListener;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -36,7 +36,7 @@
* It is resolved when the Instrumentable actually registers the Instrument.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class InstrumentProxy
1.2 +4 -4 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentSample.java
Index: InstrumentSample.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentSample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentSample.java 26 Mar 2002 11:56:16 -0000 1.1
+++ InstrumentSample.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.excalibur.instrument.manager;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleSnapshot;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -24,7 +24,7 @@
* InstrumentClient.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public interface InstrumentSample
1.2 +4 -4 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentSampleDescriptorImpl.java
Index: InstrumentSampleDescriptorImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/InstrumentSampleDescriptorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstrumentSampleDescriptorImpl.java 26 Mar 2002 11:56:16 -0000 1.1
+++ InstrumentSampleDescriptorImpl.java 28 Mar 2002 04:06:18 -0000 1.2
@@ -7,16 +7,16 @@
*/
package org.apache.avalon.excalibur.instrument.manager;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleListener;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleSnapshot;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleListener;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleSnapshot;
/**
* Describes an InstrumentSample and acts as a Proxy to protect the original
* InstrumentSample object.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/26 11:56:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class InstrumentSampleDescriptorImpl
1.3 +5 -5 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiServer.java
Index: InstrumentManagerAltrmiServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstrumentManagerAltrmiServer.java 27 Mar 2002 16:01:52 -0000 1.2
+++ InstrumentManagerAltrmiServer.java 28 Mar 2002 04:06:18 -0000 1.3
@@ -9,10 +9,10 @@
import org.apache.avalon.excalibur.instrument.manager.DefaultInstrumentManager;
import org.apache.avalon.excalibur.instrument.manager.InstrumentManagerClientImpl;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentableDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentDescriptor;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentManagerClient;
-import org.apache.avalon.excalibur.instrument.manager.client.InstrumentSampleDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
+import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
import org.apache.avalon.framework.activity.Disposable;
@@ -25,7 +25,7 @@
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/27 16:01:52 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/28 04:06:18 $
* @since 4.1
*/
public class InstrumentManagerAltrmiServer
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/CounterInstrumentListener.java
Index: CounterInstrumentListener.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Objects which implement the CounterInstrumentListener interface can
* register themselves with Instrument instances to receive updates when
* it is incremented.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface CounterInstrumentListener
extends InstrumentListener
{
/**
* Called by a CounterInstrument whenever its value is incremented.
*
* @param instrumentName The name of Instrument which was incremented.
* @param time The time that the Instrument was incremented.
*/
void increment( String instrumentName, long time );
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/InstrumentableDescriptor.java
Index: InstrumentableDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Describes a Instrumentable and acts as a Proxy to protect the original
* Instrumentable.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface InstrumentableDescriptor
{
/**
* Returns true if the Instrumentable was configured in the instrumentables
* section of the configuration.
*
* @return True if configured.
*/
boolean isConfigured();
/**
* 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.
*
* @return The name used to identify a Instrumentable.
*/
String getName();
/**
* Gets the description of the Instrumentable.
*
* @return The description of the Instrumentable.
*/
String getDescription();
/**
* 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.
*/
InstrumentDescriptor getInstrumentDescriptor( String instrumentName )
throws NoSuchInstrumentException;
/**
* Returns an array of Descriptors for the Instruments registered by this
* Instrumentable.
*
* @return An array of Descriptors for the Instruments registered by this
* Instrumentable.
*/
InstrumentDescriptor[] getInstrumentDescriptors();
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/InstrumentDescriptor.java
Index: InstrumentDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Describes a Instrument and acts as a Proxy to protect the original
* Instrument.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface InstrumentDescriptor
{
/**
* Returns true if the Instrument was configured in the instrumentables
* section of the configuration.
*
* @return True if configured.
*/
boolean isConfigured();
/**
* Gets the name for the Instrument. The Instrument Name is used to
* uniquely identify the Instrument during the configuration of the
* Profiler. The value should be a string which does not contain spaces
* or periods.
*
* @return The name used to identify a Instrument.
*/
String getName();
/**
* Gets the description of the Instrument.
*
* @return The description of the Instrument.
*/
String getDescription();
/**
* Returns the type of the Instrument.
*
* @return The type of the Instrument.
*/
int getType();
/**
* 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
* InstrumentManager.PROFILE_POINT_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
* InstrumentManager.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
* InstrumentManager.PROFILE_POINT_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
* InstrumentManager.PROFILE_POINT_TYPE_VALUE.
*/
void removeValueInstrumentListener( ValueInstrumentListener listener );
/**
* 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.
*/
InstrumentSampleDescriptor getInstrumentSampleDescriptor( String InstrumentSampleName )
throws NoSuchInstrumentSampleException;
/**
* Returns an array of Descriptors for the InstrumentSamples configured for this
* Instrument.
*
* @return An array of Descriptors for the InstrumentSamples configured for this
* Instrument.
*/
InstrumentSampleDescriptor[] getInstrumentSampleDescriptors();
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/InstrumentListener.java
Index: InstrumentListener.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Root interface for InstrumentListeners. This interface should not be
* be implemented directly.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface InstrumentListener
{
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/InstrumentManagerClient.java
Index: InstrumentManagerClient.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
import org.apache.avalon.excalibur.instrument.Instrumentable;
import org.apache.avalon.framework.configuration.Configuration;
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface InstrumentManagerClient
{
/** Type which specifies that the type of a Instrument has not yet been determined. */
int INSTRUMENT_TYPE_NONE = 0;
/** Type which identifies CounterInstruments. */
int INSTRUMENT_TYPE_COUNTER = 1;
/** Type which identifies ValueInstruments. */
int INSTRUMENT_TYPE_VALUE = 2;
/**
* Returns the name used to identify this InstrumentManager.
*
* @return The name used to identify this InstrumentManager.
*/
String getName();
/**
* Returns the description of this InstrumentManager.
*
* @return The description of this InstrumentManager.
*/
String getDescription();
/**
* Returns a InstrumentableDescriptor based on its name or the name of any
* of its children.
*
* @param instrumentableName Name of the Instrumentable being requested.
*
* @return A Descriptor of the requested Instrumentable.
*
* @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.
*
* @return An array of Descriptors for the Instrumentables managed by this
* InstrumentManager.
*/
InstrumentableDescriptor[] getInstrumentableDescriptors();
/**
* Invokes garbage collection.
*/
void invokeGarbageCollection();
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/InstrumentSampleDescriptor.java
Index: InstrumentSampleDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Describes an InstrumentSample and acts as a Proxy to protect the original
* InstrumentSample object.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface InstrumentSampleDescriptor
{
/**
* Returns true if the InstrumentSample was configured in the instrumentables
* section of the configuration.
*
* @return True if configured.
*/
boolean isConfigured();
/**
* Returns the name of the sample.
*
* @return The name of the sample.
*/
String getName();
/**
* Returns the sample interval. The period of each sample in millisends.
*
* @return The sample interval.
*/
long getInterval();
/**
* Returns the number of samples in the sample history.
*
* @return The size of the sample history.
*/
int getSize();
/**
* Returns the description of the sample.
*
* @return The description of the sample.
*/
String getDescription();
/**
* Obtain the value of the sample. All samples are integers, so the profiled
* objects must measure quantity (numbers of items), rate (items/period), time in
* milliseconds, etc.
*
* @return The sample value.
*/
int getValue();
/**
* Obtain the UNIX time of the beginning of the sample.
*
* @return The UNIX time of the beginning of the sample.
*/
long getTime();
/**
* 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
*
* @return The Type of the Instrument which can use the sample.
*/
int getInstrumentType();
/**
* Obtains a static snapshot of the InstrumentSample.
*
* @return A static snapshot of the InstrumentSample.
*/
InstrumentSampleSnapshot getSnapshot();
/**
* 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 );
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/InstrumentSampleListener.java
Index: InstrumentSampleListener.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Objects which implement the InstrumentSampleListener interface can register
* themselves with InstrumentSample instances to receive updates on their value.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface InstrumentSampleListener
{
/**
* Called by a InstrumentSample whenever its value is changed.
*
* @param InstrumentSampleName The name of the InstrumentSample whose value was changed.
* @param value The new value.
* @param time The time that the InstrumentSample value was changed.
*/
void setValue( String InstrumentSampleName, int value, long time );
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/InstrumentSampleSnapshot.java
Index: InstrumentSampleSnapshot.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
import java.io.Serializable;
/**
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public class InstrumentSampleSnapshot
implements Serializable
{
/** The name used to reference the InstrumentSample. */
private String m_InstrumentSampleName;
/** The interval between each sample. */
private long m_interval;
/** The number of samples in the InstrumentSample. */
private int m_size;
/** The time that the last sample starts. */
private long m_time;
/** The samples as an array of integers. */
private int[] m_samples;
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
/**
* @param InstrumentSampleName The name used to reference the InstrumentSample.
* @param interval The interval between each sample.
* @param size The number of samples in the InstrumentSample.
* @param time The time that the last sample starts.
* @param samples The samples as an array of integers.
*/
public InstrumentSampleSnapshot( String InstrumentSampleName,
long interval,
int size,
long time,
int[] samples )
{
m_InstrumentSampleName = InstrumentSampleName;
m_interval = interval;
m_size = size;
m_time = time;
m_samples = samples;
}
/*---------------------------------------------------------------
* Methods
*-------------------------------------------------------------*/
/**
* Returns the name used to reference the InstrumentSample.
*
* @return The name used to reference the InstrumentSample.
*/
public String getInstrumentSampleName()
{
return m_InstrumentSampleName;
}
/**
* Returns the interval, in milliseconds, between each sample.
*
* @return The interval between each sample.
*/
public long getInterval()
{
return m_interval;
}
/**
* Returns the number of samples in the InstrumentSample.
*
* @return The number of samples in the InstrumentSample.
*/
public int getSize()
{
return m_size;
}
/**
* Returns the time that the last sample starts.
*
* @return The time that the last sample starts.
*/
public long getTime()
{
return m_time;
}
/**
* Returns the samples as an array of integers. The sample at index 0
* will be the oldest. The end of the array is the newest.
*
* @return The samples as an array of integers.
*/
public int[] getSamples()
{
return m_samples;
}
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/NoSuchInstrumentableException.java
Index: NoSuchInstrumentableException.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Thrown when a Instrumentable can not be found.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public class NoSuchInstrumentableException
extends RuntimeException
{
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
/**
* Construct a new NoSuchInstrumentableException instance.
*
* @param message The detail message for this exception.
*/
public NoSuchInstrumentableException( String message )
{
super( message );
}
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/NoSuchInstrumentException.java
Index: NoSuchInstrumentException.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Thrown when a Instrument can not be found.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public class NoSuchInstrumentException
extends RuntimeException
{
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
/**
* Construct a new NoSuchInstrumentException instance.
*
* @param message The detail message for this exception.
*/
public NoSuchInstrumentException( String message )
{
super( message );
}
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/NoSuchInstrumentSampleException.java
Index: NoSuchInstrumentSampleException.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Thrown when a InstrumentSample can not be found.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public class NoSuchInstrumentSampleException
extends RuntimeException
{
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
/**
* Construct a new NoSuchInstrumentSampleException instance.
*
* @param message The detail message for this exception.
*/
public NoSuchInstrumentSampleException( String message )
{
super( message );
}
}
1.1 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces/ValueInstrumentListener.java
Index: ValueInstrumentListener.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.excalibur.instrument.manager.interfaces;
/**
* Objects which implement the InstrumentListener interface can register
* themselves with Instrument instances to receive updates on the
* Profile Point's value.
*
* @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/03/28 04:06:19 $
* @since 4.1
*/
public interface ValueInstrumentListener
extends InstrumentListener
{
/**
* Called by a ValueInstrument whenever its value is set.
*
* @param instrumentName The name of Instrument whose value was set.
* @param value Value that was set.
* @param time The time that the Instrument was incremented.
*
* ValueInstrument
*/
void setValue( String instrumentName, int value, long time );
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>