You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by je...@apache.org on 2002/04/13 03:39:58 UTC
cvs commit: jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test ConfigurableRoleManagerTestCase.java ExcaliburRoleManagerTestCase.java
jefft 02/04/12 18:39:58
Modified: . depchecker.xml
fortress build.xml
fortress/src/java/org/apache/excalibur/fortress
AbstractContainer.java ContainerManager.java
fortress/src/java/org/apache/excalibur/fortress/handler
ComponentFactory.java FactoryComponentHandler.java
PerThreadComponentHandler.java
PoolableComponentHandler.java
ThreadSafeComponentHandler.java
fortress/src/java/org/apache/excalibur/fortress/util
AbstractRoleManager.java
ConfigurableRoleManager.java ContextBuilder.java
ContextManager.java ContextManagerConstants.java
ExcaliburRoleManager.java
fortress/src/test/org/apache/excalibur/fortress/test
ContainerProfile.java
fortress/src/test/org/apache/excalibur/fortress/util/test
ConfigurableRoleManagerTestCase.java
ExcaliburRoleManagerTestCase.java
Log:
Make fortress instrumentable (and gets it compiling)
Submitted by: Peter Royal
Revision Changes Path
1.12 +6 -0 jakarta-avalon-excalibur/depchecker.xml
Index: depchecker.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- depchecker.xml 11 Apr 2002 17:36:22 -0000 1.11
+++ depchecker.xml 13 Apr 2002 01:39:56 -0000 1.12
@@ -256,6 +256,12 @@
<property name="path" value="${excalibur-instrument-manager-interfaces.jar}"/>
<property name="proj.home" value="${basedir}/../instrument-manager"/>
</ant>
+ </target><target name="checkManager">
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="name" value="excalibur-instrument-manager.jar"/>
+ <property name="path" value="${excalibur-instrument-manager.jar}"/>
+ <property name="proj.home" value="${basedir}/../instrument-manager"/>
+ </ant>
</target>
<target name="checkTestcase">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
1.7 +2 -0 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 13 Apr 2002 01:07:31 -0000 1.6
+++ build.xml 13 Apr 2002 01:39:56 -0000 1.7
@@ -19,6 +19,7 @@
<pathelement location="${excalibur-scratchpad.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
+ <pathelement location="${excalibur-instrument-manager.jar}"/>
<pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
<pathelement location="${excalibur-event.jar}"/>
@@ -43,6 +44,7 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManagerInterfaces"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManager"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
1.30 +5 -5 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AbstractContainer.java 12 Apr 2002 11:01:46 -0000 1.29
+++ AbstractContainer.java 13 Apr 2002 01:39:56 -0000 1.30
@@ -17,9 +17,9 @@
import org.apache.avalon.excalibur.event.Queue;
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;
@@ -43,7 +43,7 @@
* Manager can expose that to the instantiating class.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.29 $ $Date: 2002/04/12 11:01:46 $
+ * @version CVS $Revision: 1.30 $ $Date: 2002/04/13 01:39:56 $
*/
public abstract class AbstractContainer
extends AbstractLogEnabled
@@ -126,7 +126,7 @@
* <component role="org.apache.avalon.excalibur.datasource.DataSourceComponent"
* id="default-connection"
* class="org.apache.avalon.excalibur.datasource.JdbcDataSourceComponent"
- * handler="org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler">
+ * handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler">
*
* <!-- Component specific configuration -->
*
1.37 +4 -4 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManager.java
Index: ContainerManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManager.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ContainerManager.java 4 Apr 2002 16:04:28 -0000 1.36
+++ ContainerManager.java 13 Apr 2002 01:39:56 -0000 1.37
@@ -21,11 +21,11 @@
* <code>
* //
* ContextBuilder contextBuilder = new ContextBuilder ();
- * contextBuilder.setContainerClass( Thread.currentThread().getContextClassLoader().loadClass( "org.apache.avalon.excalibur.fortress.test.TestContainer" ) );
+ * contextBuilder.setContainerClass( Thread.currentThread().getContextClassLoader().loadClass( "org.apache.excalibur.fortress.test.TestContainer" ) );
* contextBuilder.setContextDirectory( "./" );
* contextBuilder.setWorkDirectory( "./" );
- * contextBuilder.setContainerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xconf" );
- * contextBuilder.setLoggerManagerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xlog" );
+ * contextBuilder.setContainerConfiguration( "resource://org.apache.excalibur.fortress/test/ContainerProfile.xconf" );
+ * contextBuilder.setLoggerManagerConfiguration( "resource://org.apache.excalibur.fortress/test/ContainerProfile.xlog" );
*
* ContextManager contextManager = new ContextManager( null, contextBuilder.getContext(), null );
* contextManager.initialize();
@@ -54,7 +54,7 @@
* </pre>
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.36 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.37 $ $Date: 2002/04/13 01:39:56 $
*/
public interface ContainerManager extends Disposable, Initializable
{
1.9 +7 -7 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComponentFactory.java 4 Apr 2002 16:04:28 -0000 1.8
+++ ComponentFactory.java 13 Apr 2002 01:39:56 -0000 1.9
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.8 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.9 $ $Date: 2002/04/13 01:39:56 $
* @since 4.0
*/
public class ComponentFactory
@@ -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;
}
}
1.13 +7 -7 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java
Index: FactoryComponentHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FactoryComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.12
+++ FactoryComponentHandler.java 13 Apr 2002 01:39:56 -0000 1.13
@@ -24,7 +24,7 @@
* and destroyed correctly.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.12 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.13 $ $Date: 2002/04/13 01:39:56 $
* @since 4.0
*/
public final class FactoryComponentHandler
@@ -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
};
}
1.14 +8 -8 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java
Index: PerThreadComponentHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PerThreadComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.13
+++ PerThreadComponentHandler.java 13 Apr 2002 01:39:56 -0000 1.14
@@ -23,10 +23,10 @@
* and destroyed correctly.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.13 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.14 $ $Date: 2002/04/13 01:39:56 $
* @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
};
}
1.16 +8 -8 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java
Index: PoolableComponentHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PoolableComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.15
+++ PoolableComponentHandler.java 13 Apr 2002 01:39:57 -0000 1.16
@@ -26,10 +26,10 @@
* and destroyed correctly.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.15 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.16 $ $Date: 2002/04/13 01:39:57 $
* @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
};
}
1.12 +8 -8 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java
Index: ThreadSafeComponentHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ThreadSafeComponentHandler.java 4 Apr 2002 16:04:28 -0000 1.11
+++ ThreadSafeComponentHandler.java 13 Apr 2002 01:39:57 -0000 1.12
@@ -25,10 +25,10 @@
* and destroyed correctly.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.11 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.12 $ $Date: 2002/04/13 01:39:57 $
* @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
};
}
1.7 +2 -2 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java
Index: AbstractRoleManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractRoleManager.java 4 Apr 2002 16:04:28 -0000 1.6
+++ AbstractRoleManager.java 13 Apr 2002 01:39:57 -0000 1.7
@@ -17,7 +17,7 @@
* information is hard-coded.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/04/13 01:39:57 $
* @since 4.1
*/
public abstract class AbstractRoleManager
@@ -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 );
1.8 +2 -2 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ConfigurableRoleManager.java
Index: ConfigurableRoleManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ConfigurableRoleManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConfigurableRoleManager.java 4 Apr 2002 16:04:28 -0000 1.7
+++ ConfigurableRoleManager.java 13 Apr 2002 01:39:57 -0000 1.8
@@ -20,7 +20,7 @@
* in the org.apache.avalon.component package.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.8 $ $Date: 2002/04/13 01:39:57 $
* @since 4.1
*/
public class ConfigurableRoleManager
@@ -86,7 +86,7 @@
components[ j ].getAttribute( "class", null );
final String handlerClassName =
components[ j ].getAttribute( "handler",
- "org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler" );
+ "org.apache.excalibur.fortress.handler.PerThreadComponentHandler" );
setup( shorts, classes, handlers, shorthand, role, className, handlerClassName );
}
1.8 +1 -1 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
Index: ContextBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContextBuilder.java 4 Apr 2002 16:04:28 -0000 1.7
+++ ContextBuilder.java 13 Apr 2002 01:39:57 -0000 1.8
@@ -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 );
1.15 +8 -8 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ContextManager.java 8 Apr 2002 06:14:33 -0000 1.14
+++ ContextManager.java 13 Apr 2002 01:39:57 -0000 1.15
@@ -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;
@@ -60,7 +60,7 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
- * @version CVS $Revision: 1.14 $ $Date: 2002/04/08 06:14:33 $
+ * @version CVS $Revision: 1.15 $ $Date: 2002/04/13 01:39:57 $
* @since 4.1
*/
public class ContextManager implements ContextManagerConstants
@@ -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
{
1.6 +2 -1 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java
Index: ContextManagerConstants.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextManagerConstants.java 4 Apr 2002 16:04:28 -0000 1.5
+++ ContextManagerConstants.java 13 Apr 2002 01:39:57 -0000 1.6
@@ -13,7 +13,7 @@
* Provides constants used to access the Context object for containers.
*
* @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/04/13 01:39:57 $
*/
public interface ContextManagerConstants extends ContainerManagerConstants
{
@@ -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";
1.8 +14 -14 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java
Index: ExcaliburRoleManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExcaliburRoleManager.java 4 Apr 2002 16:04:28 -0000 1.7
+++ ExcaliburRoleManager.java 13 Apr 2002 01:39:57 -0000 1.8
@@ -15,7 +15,7 @@
* information is hard-coded.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.8 $ $Date: 2002/04/13 01:39:57 $
* @since 4.1
*/
public class ExcaliburRoleManager
@@ -58,67 +58,67 @@
setup( shorts, classes, handlers, "cache",
"org.apache.avalon.excalibur.cache.Cache",
"org.apache.avalon.excalibur.cache.DefaultCache",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
setup( shorts, classes, handlers, "lru-cache",
"org.apache.avalon.excalibur.cache.Cache",
"org.apache.avalon.excalibur.cache.LRUCache",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
/* Set up DataSource relations */
setup( shorts, classes, handlers, "jdbc-datasource",
"org.apache.avalon.excalibur.datasource.DataSourceComponent",
"org.apache.avalon.excalibur.datasource.JdbcDataSource",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
setup( shorts, classes, handlers, "j2ee-datasource",
"org.apache.avalon.excalibur.datasource.DataSourceComponent",
"org.apache.avalon.excalibur.datasource.J2eeDataSource",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
setup( shorts, classes, handlers, "informix-datasource",
"org.apache.avalon.excalibur.datasource.DataSourceComponent",
"org.apache.avalon.excalibur.datasource.InformixDataSource",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
/* Set up i18n relations */
setup( shorts, classes, handlers, "i18n",
"org.apache.avalon.excalibur.i18n.BundleSelector",
"org.apache.avalon.excalibur.i18n.BundleSelector",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
/* Set up Monitor relations */
setup( shorts, classes, handlers, "monitor",
"org.apache.avalon.excalibur.monitor.Monitor",
"org.apache.avalon.excalibur.monitor.ActiveMonitor",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
setup( shorts, classes, handlers, "passive-monitor",
"org.apache.avalon.excalibur.monitor.Monitor",
"org.apache.avalon.excalibur.monitor.PassiveMonitor",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
/* Set up XPath relations */
setup( shorts, classes, handlers, "xalan-xpath",
"org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
"org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
setup( shorts, classes, handlers, "jaxpath",
"org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
"org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
/* Set up SourceResolver relations */
setup( shorts, classes, handlers, "resolver",
"org.apache.avalon.excalibur.source.SourceResolver",
"org.apache.avalon.excalibur.source.SourceResolverImpl",
- "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" );
+ "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
/* Set up XML parser relations */
setup( shorts, classes, handlers, "parser",
"org.apache.avalon.excalibur.xml.Parser",
"org.apache.avalon.excalibur.xml.JaxpParser",
- "org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler" );
+ "org.apache.excalibur.fortress.handler.PerThreadComponentHandler" );
setup( shorts, classes, handlers, "xerces-parser",
"org.apache.avalon.excalibur.xml.Parser",
"org.apache.avalon.excalibur.xml.XercesParser",
- "org.apache.avalon.excalibur.fortress.handler.FactoryComponentHandler" );
+ "org.apache.excalibur.fortress.handler.FactoryComponentHandler" );
m_shorthands = Collections.unmodifiableMap( shorts );
m_classNames = Collections.unmodifiableMap( classes );
1.16 +5 -5 jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java
Index: ContainerProfile.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContainerProfile.java 4 Apr 2002 16:04:28 -0000 1.15
+++ ContainerProfile.java 13 Apr 2002 01:39:57 -0000 1.16
@@ -33,7 +33,7 @@
* Used as a basis for the PoolComparisonProfile Tests
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version $Id: ContainerProfile.java,v 1.15 2002/04/04 16:04:28 bloritsch Exp $
+ * @version $Id: ContainerProfile.java,v 1.16 2002/04/13 01:39:57 jefft Exp $
*/
public final class ContainerProfile
extends TestCase
@@ -96,12 +96,12 @@
long cmStart = System.currentTimeMillis();
ContextBuilder contextBuilder = new ContextBuilder();
- contextBuilder.setContainerClass( "org.apache.avalon.excalibur.fortress.test.TestContainer" );
+ contextBuilder.setContainerClass( "org.apache.excalibur.fortress.test.TestContainer" );
contextBuilder.setContextDirectory( "./" );
contextBuilder.setWorkDirectory( "./" );
- contextBuilder.setContainerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xconf" );
- contextBuilder.setLoggerManagerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xlog" );
- contextBuilder.setRoleManagerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles" );
+ contextBuilder.setContainerConfiguration( "resource://org.apache.excalibur.fortress/test/ContainerProfile.xconf" );
+ contextBuilder.setLoggerManagerConfiguration( "resource://org.apache.excalibur.fortress/test/ContainerProfile.xlog" );
+ contextBuilder.setRoleManagerConfiguration( "resource://org.apache.excalibur.fortress/test/ContainerProfile.roles" );
ContextManager contextManager = new ContextManager( contextBuilder.getContext(), null );
contextManager.initialize();
1.7 +11 -11 jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java
Index: ConfigurableRoleManagerTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ConfigurableRoleManagerTestCase.java 4 Apr 2002 13:17:48 -0000 1.6
+++ ConfigurableRoleManagerTestCase.java 13 Apr 2002 01:39:57 -0000 1.7
@@ -5,10 +5,10 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.fortress.util.test;
+package org.apache.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;
/**
@@ -17,7 +17,7 @@
* in the org.apache.avalon.component package.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 13:17:48 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/04/13 01:39:57 $
* @since 4.1
*/
public class ConfigurableRoleManagerTestCase
@@ -40,7 +40,7 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader() );
roles.configure( builder.build( this.getClass().getClassLoader()
- .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles" ) ) );
+ .getResourceAsStream( "org.apache.excalibur.fortress/test/ContainerProfile.roles" ) ) );
assertEquals(
roles.getClassForName( "datasource" ),
@@ -65,7 +65,7 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader() );
roles.configure( builder.build( this.getClass().getClassLoader()
- .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles" ) ) );
+ .getResourceAsStream( "org.apache.excalibur.fortress/test/ContainerProfile.roles" ) ) );
assertEquals(
roles.getNameForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource" ) ),
@@ -90,7 +90,7 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader() );
roles.configure( builder.build( this.getClass().getClassLoader()
- .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles" ) ) );
+ .getResourceAsStream( "org.apache.excalibur.fortress/test/ContainerProfile.roles" ) ) );
assertEquals(
roles.getRoleForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource" ) ),
@@ -115,7 +115,7 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader() );
roles.configure( builder.build( this.getClass().getClassLoader()
- .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles" ) ) );
+ .getResourceAsStream( "org.apache.excalibur.fortress/test/ContainerProfile.roles" ) ) );
Class[] classes = roles.getClassesForRole( "org.apache.avalon.excalibur.datasource.DataSourceComponent" );
@@ -148,19 +148,19 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader() );
roles.configure( builder.build( this.getClass().getClassLoader()
- .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles" ) ) );
+ .getResourceAsStream( "org.apache.excalibur.fortress/test/ContainerProfile.roles" ) ) );
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.JaxpParser" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.PoolableComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.PoolableComponentHandler" )
);
}
}
1.6 +16 -16 jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java
Index: ExcaliburRoleManagerTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExcaliburRoleManagerTestCase.java 4 Apr 2002 13:17:48 -0000 1.5
+++ ExcaliburRoleManagerTestCase.java 13 Apr 2002 01:39:57 -0000 1.6
@@ -5,10 +5,10 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.fortress.util.test;
+package org.apache.excalibur.fortress.util.test;
import junit.framework.TestCase;
-import org.apache.avalon.excalibur.fortress.util.ExcaliburRoleManager;
+import org.apache.excalibur.fortress.util.ExcaliburRoleManager;
/**
* Configurable RoleManager implementation. It populates the RoleManager
@@ -16,7 +16,7 @@
* in the org.apache.avalon.component package.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 13:17:48 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/04/13 01:39:57 $
* @since 4.1
*/
public class ExcaliburRoleManagerTestCase
@@ -308,55 +308,55 @@
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.cache.DefaultCache" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.cache.LRUCache" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.J2eeDataSource" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.InformixDataSource" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.i18n.BundleSelector" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.monitor.PassiveMonitor" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.source.SourceResolverImpl" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.JaxpParser" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.PerThreadComponentHandler" )
);
assertEquals(
roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.XercesParser" ) ),
- Class.forName( "org.apache.avalon.excalibur.fortress.handler.FactoryComponentHandler" )
+ Class.forName( "org.apache.excalibur.fortress.handler.FactoryComponentHandler" )
);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>