avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test ContainerProfile.java
Date Thu, 07 Nov 2002 08:42:23 GMT
donaldp     2002/11/07 00:42:22

  Modified:    fortress/src/java/org/apache/excalibur/fortress/lookup
                        FortressServiceManager.java
               fortress/src/test/org/apache/excalibur/fortress/test
                        ContainerProfile.java
  Log:
  Move fortress to useing the framework wrapper classes.
  
  Revision  Changes    Path
  1.18      +5 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceManager.java
  
  Index: FortressServiceManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceManager.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- FortressServiceManager.java	3 Oct 2002 03:21:14 -0000	1.17
  +++ FortressServiceManager.java	7 Nov 2002 08:42:22 -0000	1.18
  @@ -56,6 +56,8 @@
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.ServiceSelector;
  +import org.apache.avalon.framework.service.WrapperServiceManager;
  +import org.apache.avalon.framework.service.WrapperServiceSelector;
   import org.apache.excalibur.container.legacy.*;
   import org.apache.excalibur.container.lookup.AbstractServiceManager;
   import org.apache.excalibur.fortress.Container;
  @@ -101,7 +103,7 @@
                                      final Context context )
       {
           this( container, ( parent != null ) ?
  -                         new ComponentManager2ServiceManager( parent ) :
  +                         new WrapperServiceManager( parent ) :
                            null,
                 extManager,
                 context );
  @@ -147,7 +149,7 @@
   
           if( temp instanceof ComponentSelector )
           {
  -            return new ComponentSelector2ServiceSelector( role, (ComponentSelector)temp
);
  +            return new WrapperServiceSelector( role, (ComponentSelector)temp );
           }
   
           if( !( temp instanceof ComponentHandler ) )
  
  
  
  1.28      +6 -7      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java
  
  Index: ContainerProfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ContainerProfile.java	24 Sep 2002 21:23:00 -0000	1.27
  +++ ContainerProfile.java	7 Nov 2002 08:42:22 -0000	1.28
  @@ -49,6 +49,7 @@
   */
   package org.apache.excalibur.fortress.test;
   
  +import java.net.URL;
   import junit.framework.TestCase;
   import junit.textui.TestRunner;
   import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
  @@ -65,14 +66,12 @@
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.logger.NullLogger;
   import org.apache.avalon.framework.service.ServiceManager;
  -import org.apache.excalibur.container.legacy.ComponentManager2ServiceManager;
  +import org.apache.avalon.framework.service.WrapperServiceManager;
   import org.apache.excalibur.fortress.ContainerManager;
   import org.apache.excalibur.fortress.DefaultContainerManager;
   import org.apache.excalibur.fortress.container.DefaultContainer;
   import org.apache.excalibur.fortress.util.ContextBuilder;
   
  -import java.net.URL;
  -
   /**
    * Used as a basis for the PoolComparisonProfile Tests
    *
  @@ -102,7 +101,7 @@
           super( name );
   
           // Set to debug to see more useful information.
  -        m_logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
  +        m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO );
       }
   
       /*---------------------------------------------------------------
  @@ -125,7 +124,7 @@
           manager.setLogger( logKitLogger );
           manager.contextualize( context );
           DefaultLogKitManager logmanager = new DefaultLogKitManager();
  -        logmanager.setLogger(logKitLogger );
  +        logmanager.setLogger( logKitLogger );
           logmanager.contextualize( context );
           logmanager.configure( getLogKitConfig() );
           manager.setLogKitManager( logmanager );
  @@ -167,7 +166,7 @@
   
           resetMemory();
   
  -        lookupTest( "Test Case: ECM_ContainerManager_UseageTime", container.getServiceManager(),
new ComponentManager2ServiceManager( manager ) );
  +        lookupTest( "Test Case: ECM_ContainerManager_UseageTime", container.getServiceManager(),
new WrapperServiceManager( manager ) );
   
           resetMemory();
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message