mcconnell 2002/09/27 04:10:46
Modified: assembly/src/java/org/apache/excalibur/merlin/container
ContainerResource.java DefaultContainer.java
Log:
replace start operation with startup to avoid Tomcat related conflict.
Revision Changes Path
1.3 +3 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerResource.java
Index: ContainerResource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerResource.java 16 Sep 2002 21:42:42 -0000 1.2
+++ ContainerResource.java 27 Sep 2002 11:10:46 -0000 1.3
@@ -22,6 +22,7 @@
import org.apache.excalibur.merlin.resource.DefaultResource;
import org.apache.excalibur.merlin.resource.LifestyleHandler;
import org.apache.excalibur.meta.info.ServiceDescriptor;
+import org.apache.excalibur.merlin.ExceptionHelper;
/**
@@ -253,6 +254,7 @@
catch( Throwable e )
{
final String error = "Unexpected error during container execution.";
+ getLogger().error( ExceptionHelper.packException( error, e ) );
m_error = new ContainerException( error, e );
}
}
1.42 +4 -5
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java
Index: DefaultContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- DefaultContainer.java 16 Sep 2002 21:42:42 -0000 1.41
+++ DefaultContainer.java 27 Sep 2002 11:10:46 -0000 1.42
@@ -39,7 +39,6 @@
import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
import org.apache.excalibur.merlin.container.ContainerResource;
import org.apache.excalibur.merlin.service.Handler;
-import org.apache.excalibur.merlin.service.ServiceURLFactory;
import org.apache.excalibur.merlin.service.Registry;
/**
@@ -343,7 +342,7 @@
// request startup of any unstarted components
//
- m_manager.start();
+ m_manager.startup();
//
// startup all of the subsidiary containers
@@ -411,7 +410,7 @@
// stop the local components
//
- m_manager.stop( m_map.getShutdownGraph() );
+ m_manager.shutdown( m_map.getShutdownGraph() );
m_state = StateEvent.STOPPED;
getLogger().debug("container shutdown complete");
@@ -482,7 +481,7 @@
try
{
- m_manager.start( );
+ m_manager.startup( );
}
catch( Throwable e )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
