donaldp 2003/03/24 20:09:50
Modified: src/java/org/apache/avalon/cornerstone/services/connection
AbstractHandlerFactory.java AbstractService.java
Log:
Use framework based wrapper CM
Revision Changes Path
1.12 +2 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractHandlerFactory.java
Index: AbstractHandlerFactory.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractHandlerFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractHandlerFactory.java 22 Mar 2003 12:50:27 -0000 1.11
+++ AbstractHandlerFactory.java 25 Mar 2003 04:09:50 -0000 1.12
@@ -60,6 +60,7 @@
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.component.WrapperComponentManager;
/**
* Helper class to extend to create handler factorys.
@@ -104,7 +105,7 @@
ContainerUtil.enableLogging( handler, getLogger() );
ContainerUtil.contextualize( handler, m_context );
ContainerUtil.service( handler, m_serviceManager );
- ContainerUtil.compose( handler, new AdaptingComponentManager(
m_serviceManager ) );
+ ContainerUtil.compose( handler, new WrapperComponentManager(
m_serviceManager ) );
ContainerUtil.configure( handler, m_configuration );
ContainerUtil.initialize( handler );
1.20 +2 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java
Index: AbstractService.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractService.java 22 Mar 2003 12:50:27 -0000 1.19
+++ AbstractService.java 25 Mar 2003 04:09:50 -0000 1.20
@@ -60,6 +60,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -132,7 +133,7 @@
ContainerUtil.service( m_factory, serviceManager );
try
{
- ContainerUtil.compose( m_factory, new AdaptingComponentManager(
serviceManager ) );
+ ContainerUtil.compose( m_factory, new WrapperComponentManager(
serviceManager ) );
}
catch( final ComponentException ce )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
