Fortress was still littered with the old Profilable and ProfilePoints. I
didn't know if ComponentHandler should extend Instrumentable or not, right
now each component handler implements Instrumentable.
-pete
--
peter royal -> [EMAIL PROTECTED]
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- build.xml 8 Apr 2002 12:15:41 -0000 1.4
+++ build.xml 12 Apr 2002 03:33:37 -0000
@@ -20,8 +20,8 @@
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
+ <pathelement location="${excalibur-instrument-manager.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
- <pathelement location="${excalibur-command.jar}"/>
<pathelement location="${excalibur-event.jar}"/>
<pathelement location="${excalibur-util.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
@@ -44,7 +44,6 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManagerInterfaces"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommand"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
Index: default.properties
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/default.properties,v
retrieving revision 1.3
diff -u -r1.3 default.properties
--- default.properties 8 Apr 2002 10:32:09 -0000 1.3
+++ default.properties 12 Apr 2002 03:33:37 -0000
@@ -41,11 +41,6 @@
excalibur-testcase.lib=${excalibur-testcase.home}
excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
-# ----- Excalibur command, version 1.0 or later -----
-excalibur-command.home=${basedir}/../command/dist
-excalibur-command.lib=${excalibur-command.home}
-excalibur-command.jar=${excalibur-command.lib}/excalibur-command-1.0a.jar
-
# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${basedir}/../event/dist
excalibur-event.lib=${excalibur-event.home}
Index: src/java/org/apache/excalibur/fortress/AbstractContainer.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java,v
retrieving revision 1.28
diff -u -r1.28 AbstractContainer.java
--- src/java/org/apache/excalibur/fortress/AbstractContainer.java 4 Apr 2002 16:04:28 -0000 1.28
+++ src/java/org/apache/excalibur/fortress/AbstractContainer.java 12 Apr 2002 03:33:38 -0000
@@ -13,13 +13,13 @@
import java.util.List;
import org.apache.avalon.excalibur.collections.BucketMap;
import org.apache.avalon.excalibur.collections.FixedSizeBuffer;
-import org.apache.avalon.excalibur.command.Command;
import org.apache.avalon.excalibur.event.Queue;
+import org.apache.avalon.excalibur.event.command.Command;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.excalibur.mpool.PoolManager;
-import org.apache.avalon.excalibur.fortress.handler.ComponentHandler;
-import org.apache.avalon.excalibur.fortress.util.ExcaliburRoleManager;
-import org.apache.avalon.excalibur.fortress.util.RoleManager;
+import org.apache.excalibur.fortress.handler.ComponentHandler;
+import org.apache.excalibur.fortress.util.ExcaliburRoleManager;
+import org.apache.excalibur.fortress.util.RoleManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
Index: src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java,v
retrieving revision 1.8
diff -u -r1.8 ComponentFactory.java
--- src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java 4 Apr 2002 16:04:28 -0000 1.8
+++ src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java 12 Apr 2002 03:33:38 -0000
@@ -202,27 +202,27 @@
}
}
- public final void setProfilableName( String name )
+ public final void setInstrumentableName( String name )
{
// ignore
}
- public final String getProfilableName()
+ public final String getInstrumentableName()
{
return getCreatedClass().getName();
}
- public final ProfilePoint[] getProfilePoints()
+ public final Instrument[] getInstruments()
{
- return new ProfilePoint[]{
+ return new Instrument[]{
m_newInstance,
m_dispose
};
}
- public final Profilable[] getChildProfilables()
+ public final Instrumentable[] getChildInstrumentables()
{
- return Profilable.EMPTY_PROFILABLE_ARRAY;
+ return Instrumentable.EMPTY_INSTRUMENTABLE_ARRAY;
}
}
Index: src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java,v
retrieving revision 1.12
diff -u -r1.12 FactoryComponentHandler.java
--- src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.12
+++ src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java 12 Apr 2002 03:33:39 -0000
@@ -153,24 +153,24 @@
m_disposed = true;
}
- public final void setProfilableName( String name )
+ public final void setInstrumentableName( String name )
{
m_name = name;
}
- public final String getProfilableName()
+ public final String getInstrumentableName()
{
return m_name;
}
- public final ProfilePoint[] getProfilePoints()
+ public final Instrument[] getInstruments()
{
- return Profilable.EMPTY_PROFILE_POINT_ARRAY;
+ return Instrumentable.EMPTY_INSTRUMENT_ARRAY;
}
- public final Profilable[] getChildProfilables()
+ public final Instrumentable[] getChildInstrumentables()
{
- return new Profilable[]{
+ return new Instrumentable[]{
m_factory
};
}
Index: src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java,v
retrieving revision 1.13
diff -u -r1.13 PerThreadComponentHandler.java
--- src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.13
+++ src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java 12 Apr 2002 03:33:40 -0000
@@ -26,7 +26,7 @@
* @version CVS $Revision: 1.13 $ $Date: 2002/04/04 16:04:28 $
* @since 4.0
*/
-public final class PerThreadComponentHandler implements ComponentHandler
+public final class PerThreadComponentHandler implements ComponentHandler, Instrumentable
{
private ThreadLocalComponent m_instance;
private final ComponentFactory m_factory;
@@ -165,24 +165,24 @@
}
}
- public final void setProfilableName( String name )
+ public final void setInstrumentableName( String name )
{
m_name = name;
}
- public final String getProfilableName()
+ public final String getInstrumentableName()
{
return m_name;
}
- public final ProfilePoint[] getProfilePoints()
+ public final Instrument[] getInstruments()
{
- return Profilable.EMPTY_PROFILE_POINT_ARRAY;
+ return EMPTY_INSTRUMENT_ARRAY;
}
- public final Profilable[] getChildProfilables()
+ public final Instrumentable[] getChildInstrumentables()
{
- return new Profilable[]{
+ return new Instrumentable[]{
m_factory
};
}
Index: src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java,v
retrieving revision 1.15
diff -u -r1.15 PoolableComponentHandler.java
--- src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.15
+++ src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java 12 Apr 2002 03:33:41 -0000
@@ -29,7 +29,7 @@
* @version CVS $Revision: 1.15 $ $Date: 2002/04/04 16:04:28 $
* @since 4.0
*/
-public final class PoolableComponentHandler implements ComponentHandler
+public final class PoolableComponentHandler implements ComponentHandler, Instrumentable
{
/** The instance of the ComponentFactory that creates and disposes of the Component */
private final ComponentFactory m_factory;
@@ -145,24 +145,24 @@
m_disposed = true;
}
- public final void setProfilableName( String name )
+ public final void setInstrumentableName( String name )
{
m_name = name;
}
- public final String getProfilableName()
+ public final String getInstrumentableName()
{
return m_name;
}
- public final ProfilePoint[] getProfilePoints()
+ public final Instrument[] getInstruments()
{
- return Profilable.EMPTY_PROFILE_POINT_ARRAY;
+ return EMPTY_INSTRUMENT_ARRAY;
}
- public final Profilable[] getChildProfilables()
+ public final Instrumentable[] getChildInstrumentables()
{
- return new Profilable[]{
+ return new Instrumentable[]{
m_factory
};
}
Index: src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java,v
retrieving revision 1.11
diff -u -r1.11 ThreadSafeComponentHandler.java
--- src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.11
+++ src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java 12 Apr 2002 03:33:41 -0000
@@ -28,7 +28,7 @@
* @version CVS $Revision: 1.11 $ $Date: 2002/04/04 16:04:28 $
* @since 4.0
*/
-public final class ThreadSafeComponentHandler implements ComponentHandler
+public final class ThreadSafeComponentHandler implements ComponentHandler, Instrumentable
{
private Component m_instance;
private final ComponentFactory m_factory;
@@ -159,24 +159,24 @@
m_disposed = true;
}
- public final void setProfilableName( String name )
+ public final void setInstrumentableName( String name )
{
m_name = name;
}
- public final String getProfilableName()
+ public final String getInstrumentableName()
{
return m_name;
}
- public final ProfilePoint[] getProfilePoints()
+ public final Instrument[] getInstruments()
{
- return Profilable.EMPTY_PROFILE_POINT_ARRAY;
+ return EMPTY_INSTRUMENT_ARRAY;
}
- public final Profilable[] getChildProfilables()
+ public final Instrumentable[] getChildInstrumentables()
{
- return new Profilable[]{
+ return new Instrumentable[]{
m_factory
};
}
Index: src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java,v
retrieving revision 1.6
diff -u -r1.6 AbstractRoleManager.java
--- src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java 4 Apr 2002 16:04:28 -0000 1.6
+++ src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java 12 Apr 2002 03:33:42 -0000
@@ -106,7 +106,7 @@
}
catch( Exception e )
{
- handlerKlass = org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler.class;
+ handlerKlass = org.apache.excalibur.fortress.handler.PerThreadComponentHandler.class;
}
shorts.put( shortName, klass );
Index: src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
retrieving revision 1.7
diff -u -r1.7 ContextBuilder.java
--- src/java/org/apache/excalibur/fortress/util/ContextBuilder.java 4 Apr 2002 16:04:28 -0000 1.7
+++ src/java/org/apache/excalibur/fortress/util/ContextBuilder.java 12 Apr 2002 03:33:42 -0000
@@ -167,7 +167,7 @@
context.put( LOGGER_MANAGER_CONFIGURATION_URI, location );
}
- public void setInstrumentManager( ProfilerManager profiler )
+ public void setInstrumentManager( InstrumentManager profiler )
{
context.put( INSTRUMENT_MANAGER_CONFIGURATION, profiler );
context.put( INSTRUMENT_MANAGER_CONFIGURATION, null );
Index: src/java/org/apache/excalibur/fortress/util/ContextManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.14
diff -u -r1.14 ContextManager.java
--- src/java/org/apache/excalibur/fortress/util/ContextManager.java 8 Apr 2002 06:14:33 -0000 1.14
+++ src/java/org/apache/excalibur/fortress/util/ContextManager.java 12 Apr 2002 03:33:43 -0000
@@ -10,8 +10,8 @@
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.avalon.excalibur.instrument.manager.DefaultInstrumentManager;
-import org.apache.avalon.excalibur.command.CommandManager;
import org.apache.avalon.excalibur.event.Queue;
+import org.apache.avalon.excalibur.event.command.CommandManager;
import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.excalibur.mpool.DefaultPoolManager;
@@ -576,14 +576,14 @@
profilerConfig = EMPTY_CONFIG;
}
- DefaultProfilerManager profilerManager = new DefaultProfilerManager();
- profilerManager.enableLogging( getLogger() );
- profilerManager.configure( profilerConfig );
- profilerManager.initialize();
+ DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager( INSTRUMENT_MANAGER_NAME );
+ instrumentManager.enableLogging( getLogger() );
+ instrumentManager.configure( profilerConfig );
+ instrumentManager.initialize();
- assumeOwnership( profilerManager );
+ assumeOwnership( instrumentManager );
- childContext.put( INSTRUMENT_MANAGER, profilerManager );
+ childContext.put( INSTRUMENT_MANAGER, instrumentManager );
}
finally
{
Index: src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java,v
retrieving revision 1.5
diff -u -r1.5 ContextManagerConstants.java
--- src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java 4 Apr 2002 16:04:28 -0000 1.5
+++ src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java 12 Apr 2002 03:33:43 -0000
@@ -22,6 +22,7 @@
String LOGGER_MANAGER_CONFIGURATION = "container.logManager.config";
String LOGGER_MANAGER_CONFIGURATION_URI = "container.logManager.config.uri";
+ String INSTRUMENT_MANAGER_NAME = "container.instrumentManager";
String INSTRUMENT_MANAGER_CONFIGURATION = "container.instrumentManager.config";
String INSTRUMENT_MANAGER_CONFIGURATION_URI = "container.instrumentManager.config.uri";
Index: src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java,v
retrieving revision 1.6
diff -u -r1.6 ConfigurableRoleManagerTestCase.java
--- src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java 4 Apr 2002 13:17:48 -0000 1.6
+++ src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java 12 Apr 2002 03:33:43 -0000
@@ -8,7 +8,7 @@
package org.apache.avalon.excalibur.fortress.util.test;
import junit.framework.TestCase;
-import org.apache.avalon.excalibur.fortress.util.ConfigurableRoleManager;
+import org.apache.excalibur.fortress.util.ConfigurableRoleManager;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
