Hello Berin! This day I have submitted several messages to the list, but to make tracking easier I'm not sending a cummulative patch.
My other messages comment on the changes but I will repeat some breif comments here. 1) smothing build process added a dependency on lifecycle to fortress/build.xml 2) changed the version of log4j from 1.2.7 to 1.2.8 plz do it as it's best -- I don't know if it's best to bump the version or not, I'm just proposing this 3) tweaked a bit store/default.properties as the name of jisp*jar was misspelled there (cosmetic) 4) moved m_extManager.makeReadOnly() around AbstractManager to make life easier (see my reply to Shash) 5) most controversial part: Shash asked for adding the root ServiceManager to m_childContext. Let's judge the following way: since ContextManager is no longer final (a great change, thanks :-) Shash will be able to do that himself. As for the broader audience, let's not add unnecessary duplication: contextextualize()/service(). Moreover with the section 4) Shash will be more then happier I believe :-) Is the proposed change okay to you? 6) along the lines of our other thread this patch includes a .setContextRootURL() into FortressConfig -- the other thread contains the reasoning -- I beleive this method will help servlet developers interested in Fortress to shake off embarassement and head off along a smoth path, rather then a path of trial and error :-) diff -ru orig/avalon-excalibur/check-targets.properties avalon-excalibur/check-targets.properties --- orig/avalon-excalibur/check-targets.properties 2003-02-11 07:40:26.000000000 +0300 +++ avalon-excalibur/check-targets.properties 2003-06-04 10:20:43.000000000 +0400 @@ -64,7 +64,7 @@ junit.dist.url=http://www.junit.org/ # Log4J -log4j.version=1.2.7 +log4j.version=1.2.8 log4j.id=log4j log4j.license=${asl.license} log4j.license.url=${asl.license.url} diff -ru orig/avalon-excalibur/fortress/build.xml avalon-excalibur/fortress/build.xml --- orig/avalon-excalibur/fortress/build.xml 2003-06-04 09:27:12.000000000 +0400 +++ avalon-excalibur/fortress/build.xml 2003-06-04 10:08:25.000000000 +0400 @@ -106,6 +106,7 @@ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/> <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/> <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkI18n"/> + <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLifecycle"/> <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass"> <property name="proj.jar.name" value="xml-apis.jar"/> <property name="class" value="org.xml.sax.InputSource"/> diff -ru orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java --- orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java 2003-06-04 09:27:24.000000000 +0400 +++ avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java 2003-06-04 12:28:13.000000000 +0400 @@ -295,8 +295,7 @@ */ m_extManager.addCreatorExtension( new InstrumentableCreator( m_instrumentManager ) ); - // just to be on the safe side - m_extManager.makeReadOnly(); + // m_extManager will be made readonly in initialize() } /** @@ -615,6 +614,9 @@ public void initialize() throws CompositeException, Exception { + // just to be on the safe side + m_extManager.makeReadOnly(); + // go over all components final Iterator i = m_components.iterator(); final BoundedFifoBuffer buffer = new BoundedFifoBuffer( Math.max( m_components.size(), 1 ) ); diff -ru orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java --- orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java 2003-05-29 09:59:28.000000000 +0400 +++ avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java 2003-06-04 14:28:39.000000000 +0400 @@ -65,6 +65,7 @@ import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceManager; +import org.apache.avalon.excalibur.logger.LoggerManager; /** * This is the default implementation of the @@ -198,12 +199,17 @@ try { final Context implContext = m_contextManager.getChildContext(); - ContainerUtil.enableLogging( instance, m_logger ); - ContainerUtil.contextualize( instance, implContext ); final ServiceManager serviceManager = (ServiceManager) getContextEntry( managerContext, SERVICE_MANAGER ); + final LoggerManager loggerManager = + (LoggerManager) serviceManager.lookup( LoggerManager.ROLE ); + + ContainerUtil.enableLogging( instance, loggerManager.getDefaultLogger() ); + ContainerUtil.contextualize( instance, implContext ); + + ContainerUtil.service( instance, serviceManager ); final Configuration config = diff -ru orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java --- orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java 2003-06-04 09:27:32.000000000 +0400 +++ avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java 2003-06-04 14:18:13.000000000 +0400 @@ -719,7 +719,6 @@ manager.makeReadOnly(); m_containerManagerContext.put( SERVICE_MANAGER, manager ); - m_childContext.put( SERVICE_MANAGER, manager ); } /** diff -ru orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/FortressConfig.java avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/FortressConfig.java --- orig/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/FortressConfig.java 2003-05-29 09:59:36.000000000 +0400 +++ avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/FortressConfig.java 2003-06-04 14:30:38.000000000 +0400 @@ -61,6 +61,7 @@ import org.apache.excalibur.mpool.PoolManager; import java.io.File; +import java.net.URL; /** * Helper class to create a m_context for the ContextManager. @@ -212,6 +213,11 @@ m_context.put( ContextManagerConstants.CONTEXT_DIRECTORY, new File( directory ) ); } + public void setContextRootURL( final URL url ) + { + m_context.put( ContextManagerConstants.CONTEXT_DIRECTORY, url ); + } + public void setLoggerCategory( final String category ) { m_context.put( ContextManagerConstants.LOG_CATEGORY, category ); diff -ru orig/avalon-excalibur/logger/default.properties avalon-excalibur/logger/default.properties --- orig/avalon-excalibur/logger/default.properties 2003-04-22 04:07:56.000000000 +0400 +++ avalon-excalibur/logger/default.properties 2003-06-04 10:21:07.000000000 +0400 @@ -40,7 +40,7 @@ jdbc.jar=${lib.repo}/jdbc2_0-stdext.jar mail.jar=${lib.repo}/mail.jar jms.jar=${lib.repo}/jms.jar -log4j.jar=${avalon-framework.home}/lib/log4j-1.2.7.jar +log4j.jar=${avalon-framework.home}/lib/log4j-1.2.8.jar # For unit testing: diff -ru orig/avalon-excalibur/sourceresolve/src/fortress.meta/services.list avalon-excalibur/sourceresolve/src/fortress.meta/services.list --- orig/avalon-excalibur/sourceresolve/src/fortress.meta/services.list 2003-05-23 20:52:54.000000000 +0400 +++ avalon-excalibur/sourceresolve/src/fortress.meta/services.list 2003-06-04 13:28:30.000000000 +0400 @@ -1,3 +1,2 @@ -"org.apache.excalibur.source.SourceFactory" org.apache.excalibur.source.SourceResolver org.apache.excalibur.source.SourceFactory diff -ru orig/avalon-excalibur/store/default.properties avalon-excalibur/store/default.properties --- orig/avalon-excalibur/store/default.properties 2003-02-06 16:38:34.000000000 +0300 +++ avalon-excalibur/store/default.properties 2003-06-04 10:43:54.000000000 +0400 @@ -21,7 +21,7 @@ avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar # ----- Jisp 2.0.1 ----- -jisp.jar=lib/Jisp2.0.1.jar +jisp.jar=lib/jisp-2.0.1.jar # -------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
