You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2002/09/27 11:55:05 UTC
cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly ContainerManager.java
mcconnell 2002/09/27 02:55:05
Modified: assembly/src/java/org/apache/excalibur/merlin/assembly
ContainerManager.java
Log:
Updated attribute key ry for the service selector class.
Revision Changes Path
1.36 +10 -10 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
Index: ContainerManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ContainerManager.java 16 Sep 2002 21:42:42 -0000 1.35
+++ ContainerManager.java 27 Sep 2002 09:55:05 -0000 1.36
@@ -344,9 +344,9 @@
*
* @exception Exception if a start related error occurs
*/
- public void start( ) throws Exception
+ public void startup( ) throws Exception
{
- start( m_map.getStartupGraph() );
+ startup( m_map.getStartupGraph() );
}
/**
@@ -357,7 +357,7 @@
* @param profiles the profiles to start
* @exception Exception if a start related error occurs
*/
- public void start( Profile[] profiles ) throws Exception
+ public void startup( Profile[] profiles ) throws Exception
{
if( profiles.length == 0 )
@@ -386,16 +386,16 @@
/**
* Stops the manager resulting in the stopping of all local componets.
*/
- public void stop( )
+ public void shutdown( )
{
- stop( m_map.getShutdownGraph() );
+ shutdown( m_map.getShutdownGraph() );
}
/**
* Stope the set of componets matching the supplied profiles.
* @param shutdown the set of profiles to shutdown
*/
- public void stop( Profile[] shutdown )
+ public void shutdown( Profile[] shutdown )
{
if( shutdown.length == 0 )
@@ -1327,7 +1327,7 @@
// manager
//
- StageDescriptor[] phases = profile.getType().getPhases();
+ StageDescriptor[] phases = profile.getType().getStages();
for( int i=0; i<phases.length; i++ )
{
StageDescriptor stage = phases[i];
@@ -1565,7 +1565,7 @@
// otherwise, look for a default phase type selector - if none
// use the DefaultSelector
- return getSelector( phase.getReference(), phase.getAttribute("avalon:selector") );
+ return getSelector( phase.getReference(), phase.getAttribute("avalon:service.selector") );
}
private Selector getSelector( DependencyDescriptor dependency )
@@ -1575,7 +1575,7 @@
// otherwise, look for a default service type selector - if none
// use the DefaultSelector
- return getSelector( dependency.getReference(), dependency.getAttribute("avalon:selector") );
+ return getSelector( dependency.getReference(), dependency.getAttribute("avalon:service.selector") );
}
private void logDependency( Logger logger, String lead, Profile[] result )
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>