You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by cz...@apache.org on 2002/06/04 08:40:39 UTC
cvs commit: jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component InstrumentComponentHandler.java InstrumentComponentManager.java InstrumentComponentSelector.java
cziegeler 2002/06/03 23:40:39
Modified: instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component
InstrumentComponentHandler.java
InstrumentComponentManager.java
InstrumentComponentSelector.java
Log:
Changed in order to get a compilable version
Revision Changes Path
1.6 +8 -8 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component/InstrumentComponentHandler.java
Index: InstrumentComponentHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component/InstrumentComponentHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InstrumentComponentHandler.java 10 Apr 2002 05:39:37 -0000 1.5
+++ InstrumentComponentHandler.java 4 Jun 2002 06:40:39 -0000 1.6
@@ -13,7 +13,7 @@
import org.apache.avalon.excalibur.component.ComponentHandler;
import org.apache.avalon.excalibur.component.DefaultComponentFactory;
import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.excalibur.component.LogkitLoggerManager;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.component.ComponentManager;
@@ -25,7 +25,7 @@
/**
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/04/10 05:39:37 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/06/04 06:40:39 $
* @since 4.1
*/
public abstract class InstrumentComponentHandler
@@ -34,7 +34,7 @@
{
/** Instrumentable Name assigned to this Instrumentable */
private String m_instrumentableName = "component-manager";
-
+
/*---------------------------------------------------------------
* Static Methods
*-------------------------------------------------------------*/
@@ -60,7 +60,7 @@
final ComponentManager componentManager,
final Context context,
final RoleManager roleManager,
- final LogKitManager logkitManager,
+ final LogkitLoggerManager logkitManager,
final InstrumentManager instrumentManager,
final String instrumentableName )
throws Exception
@@ -111,10 +111,10 @@
{
handler = new DefaultComponentHandler( factory, configuration );
}
-
+
// Register the new handler with the instrumentManager if it exists.
((Instrumentable)handler).setInstrumentableName( instrumentableName );
-
+
return handler;
}
@@ -128,7 +128,7 @@
public InstrumentComponentHandler()
{
}
-
+
/*---------------------------------------------------------------
* Instrumentable Methods
*-------------------------------------------------------------*/
@@ -149,7 +149,7 @@
{
m_instrumentableName = name;
}
-
+
/**
* Gets the name of the Instrumentable.
*
1.4 +10 -10 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component/InstrumentComponentManager.java
Index: InstrumentComponentManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component/InstrumentComponentManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InstrumentComponentManager.java 3 Apr 2002 13:18:29 -0000 1.3
+++ InstrumentComponentManager.java 4 Jun 2002 06:40:39 -0000 1.4
@@ -16,14 +16,14 @@
import org.apache.avalon.excalibur.component.ComponentHandler;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.excalibur.component.LogkitLoggerManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
/**
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/04/03 13:18:29 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/06/04 06:40:39 $
* @since 4.1
*/
public class InstrumentComponentManager
@@ -35,7 +35,7 @@
/** Instrumentable Name assigned to this Instrumentable */
private String m_instrumentableName = "component-manager";
-
+
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
@@ -77,14 +77,14 @@
final Configuration configuration,
final Context context,
final RoleManager roleManager,
- final LogKitManager logkitManager )
+ final LogkitLoggerManager logkitManager )
throws Exception
{
if( m_instrumentManager == null )
{
throw new IllegalStateException( "The InstrumentManager was not yet set." );
}
-
+
String instrumentableName =
configuration.getAttribute( "instrumentable", configuration.getName() );
@@ -114,10 +114,10 @@
throws Exception
{
m_instrumentManager.registerInstrumentable( this, m_instrumentableName );
-
+
super.initialize();
}
-
+
/*---------------------------------------------------------------
* InstrumentManageable Methods
*-------------------------------------------------------------*/
@@ -131,7 +131,7 @@
{
m_instrumentManager = instrumentManager;
}
-
+
/*---------------------------------------------------------------
* Instrumentable Methods
*-------------------------------------------------------------*/
@@ -152,7 +152,7 @@
{
m_instrumentableName = name;
}
-
+
/**
* Gets the name of the Instrumentable.
*
@@ -194,7 +194,7 @@
Collection values = getComponentHandlers().values();
Instrumentable[] children = new Instrumentable[ values.size() ];
values.toArray( children );
-
+
return children;
}
}
1.4 +8 -8 jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component/InstrumentComponentSelector.java
Index: InstrumentComponentSelector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component/InstrumentComponentSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InstrumentComponentSelector.java 3 Apr 2002 13:18:29 -0000 1.3
+++ InstrumentComponentSelector.java 4 Jun 2002 06:40:39 -0000 1.4
@@ -16,7 +16,7 @@
import org.apache.avalon.excalibur.component.ComponentHandler;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.excalibur.component.LogkitLoggerManager;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
@@ -24,7 +24,7 @@
/**
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/04/03 13:18:29 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/06/04 06:40:39 $
* @since 4.1
*/
public class InstrumentComponentSelector
@@ -35,7 +35,7 @@
/** Instrumentable Name assigned to this Instrumentable */
private String m_instrumentableName;
-
+
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
@@ -80,12 +80,12 @@
final ComponentManager componentManager,
final Context context,
final RoleManager roleManager,
- final LogKitManager logkitManager )
+ final LogkitLoggerManager logkitManager )
throws Exception
{
String instrumentableName =
configuration.getAttribute( "instrumentable", configuration.getAttribute( "name" ) );
-
+
return InstrumentComponentHandler.getComponentHandler( componentClass,
configuration,
componentManager,
@@ -109,7 +109,7 @@
{
m_instrumentManager = instrumentManager;
}
-
+
/*---------------------------------------------------------------
* Instrumentable Methods
*-------------------------------------------------------------*/
@@ -130,7 +130,7 @@
{
m_instrumentableName = name;
}
-
+
/**
* Gets the name of the Instrumentable.
*
@@ -172,7 +172,7 @@
Collection values = getComponentHandlers().values();
Instrumentable[] children = new Instrumentable[ values.size() ];
values.toArray( children );
-
+
return children;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>