hammant 02/05/12 03:47:12
Modified: overlord/src/java/org/apache/avalon/overlord Overlord.java
overlord/src/java/org/apache/avalon/overlord/collectors
SocketCollector.java
Added: overlord/lib avalon-framework.jar excalibur-i18n-1.0.jar
Removed: overlord/lib avalon-excalibur-4.1.jar
avalon-framework-4.1.2.jar
Log:
compose(..) becomes service(..)
Revision Changes Path
1.1 jakarta-avalon-apps/overlord/lib/avalon-framework.jar
<<Binary file>>
1.1 jakarta-avalon-apps/overlord/lib/excalibur-i18n-1.0.jar
<<Binary file>>
1.10 +14 -14
jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java
Index: Overlord.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Overlord.java 11 May 2002 07:04:19 -0000 1.9
+++ Overlord.java 12 May 2002 10:47:12 -0000 1.10
@@ -15,9 +15,9 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -41,13 +41,13 @@
*/
public class Overlord
extends AbstractLogEnabled
- implements Contextualizable, Composable, Configurable, Initializable,
Disposable, Block, GatheringServer
+ implements Contextualizable, Serviceable, Configurable, Initializable,
Disposable, Block, GatheringServer
{
private static final Resources REZ =
ResourceManager.getPackageResources( Overlord.class );
private BlockContext m_context;
- private ComponentManager m_componentManager;
+ private ServiceManager m_serviceManager;
private Configuration m_configuration;
private TimeScheduler m_scheduler;
private TimeTriggerFactory m_triggerFactory;
@@ -59,13 +59,13 @@
m_context = (BlockContext)context;
}
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_componentManager = componentManager;
+ m_serviceManager = serviceManager;
m_scheduler =
- (TimeScheduler)m_componentManager.lookup( TimeScheduler.ROLE );
+ (TimeScheduler)m_serviceManager.lookup( TimeScheduler.ROLE );
}
public void configure( final Configuration configuration )
@@ -103,7 +103,7 @@
(Collector)Class.forName( clazz ).newInstance();
setupComponent( collector,
logger.getChildLogger( name ),
- m_context, m_componentManager, conf );
+ m_context, m_serviceManager, conf );
addCollector( name, collector );
}
@@ -246,7 +246,7 @@
final String message =
REZ.getString( "overlord.error.collector.find", name );
getLogger().error( message );
- throw new ComponentException( message );
+ throw new ServiceException( message );
}
collector.execute();
@@ -255,7 +255,7 @@
private void setupComponent( final Component component,
final Logger logger,
final Context context,
- final ComponentManager componentManager,
+ final ServiceManager serviceManager,
final Configuration configuration )
throws Exception
{
@@ -269,9 +269,9 @@
( (Contextualizable)component ).contextualize( context );
}
- if ( component instanceof Composable )
+ if ( component instanceof Serviceable )
{
- ( (Composable)component ).compose( componentManager );
+ ( (Serviceable)component ).service( serviceManager );
}
if ( component instanceof Configurable )
1.5 +7 -7
jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/collectors/SocketCollector.java
Index: SocketCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/collectors/SocketCollector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SocketCollector.java 1 Mar 2002 14:10:21 -0000 1.4
+++ SocketCollector.java 12 May 2002 10:47:12 -0000 1.5
@@ -11,9 +11,9 @@
import java.net.InetAddress;
import java.net.Socket;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -31,7 +31,7 @@
*/
public abstract class SocketCollector
extends AbstractLogEnabled
- implements Composable, Configurable, Initializable, Collector
+ implements Serviceable, Configurable, Initializable, Collector
{
private static final Resources REZ =
ResourceManager.getPackageResources( SocketCollector.class );
@@ -43,11 +43,11 @@
private int m_port;
private String m_socketType;
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
m_socketManager =
- (SocketManager)componentManager.lookup( SocketManager.ROLE );
+ (SocketManager)serviceManager.lookup( SocketManager.ROLE );
}
public void configure( final Configuration configuration )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
