avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/test/org/apache/avalon/excalibur/fortress/util/test ConfigurableRoleManagerTestCase.java ExcaliburRoleManagerTestCase.java
Date Thu, 04 Apr 2002 13:17:48 GMT
jefft       02/04/04 05:17:48

  Modified:    fortress/src/java/org/apache/avalon/excalibur/fortress
                        AbstractContainer.java ContainerManager.java
               fortress/src/java/org/apache/avalon/excalibur/fortress/handler
                        ComponentFactory.java FactoryComponentHandler.java
                        PerThreadComponentHandler.java
                        PoolableComponentHandler.java
                        ThreadSafeComponentHandler.java
               fortress/src/java/org/apache/avalon/excalibur/fortress/util
                        AbstractRoleManager.java
                        ConfigurableRoleManager.java
                        ExcaliburRoleManager.java
               fortress/src/test/org/apache/avalon/excalibur/fortress/test
                        ContainerProfile.java
               fortress/src/test/org/apache/avalon/excalibur/fortress/util/test
                        ConfigurableRoleManagerTestCase.java
                        ExcaliburRoleManagerTestCase.java
  Log:
  Change package name from system to fortress
  
  Revision  Changes    Path
  1.27      +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/AbstractContainer.java
  
  Index: AbstractContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/AbstractContainer.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- AbstractContainer.java	3 Apr 2002 22:55:58 -0000	1.26
  +++ AbstractContainer.java	4 Apr 2002 13:17:48 -0000	1.27
  @@ -43,7 +43,7 @@
    * Manager can expose that to the instantiating class.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.26 $ $Date: 2002/04/03 22:55:58 $
  + * @version CVS $Revision: 1.27 $ $Date: 2002/04/04 13:17:48 $
    */
   public abstract class AbstractContainer
       extends AbstractLogEnabled
  @@ -126,7 +126,7 @@
        *   &lt;component role="org.apache.avalon.excalibur.datasource.DataSourceComponent"
        *                 id="default-connection"
        *                 class="org.apache.avalon.excalibur.datasource.JdbcDataSourceComponent"
  -     *                 handler="org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"&gt;
  +     *                 handler="org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"&gt;
        *
        *    &lt;!-- Component specific configuration --&gt;
        *
  
  
  
  1.35      +4 -4      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/ContainerManager.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ContainerManager.java	3 Apr 2002 22:55:58 -0000	1.34
  +++ ContainerManager.java	4 Apr 2002 13:17:48 -0000	1.35
  @@ -21,11 +21,11 @@
    * <code>
    *    //
    *    ContextBuilder contextBuilder = new ContextBuilder ();
  - *    contextBuilder.setContainerClass( Thread.currentThread().getContextClassLoader().loadClass(
"org.apache.avalon.excalibur.system.test.TestContainer" ) );
  + *    contextBuilder.setContainerClass( Thread.currentThread().getContextClassLoader().loadClass(
"org.apache.avalon.excalibur.fortress.test.TestContainer" ) );
    *    contextBuilder.setContextDirectory( "./" );
    *    contextBuilder.setWorkDirectory( "./" );
  - *    contextBuilder.setContainerConfiguration( "resource://org/apache/avalon/excalibur/system/test/ContainerProfile.xconf"
);
  - *    contextBuilder.setLoggerManagerConfiguration( "resource://org/apache/avalon/excalibur/system/test/ContainerProfile.xlog"
);
  + *    contextBuilder.setContainerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xconf"
);
  + *    contextBuilder.setLoggerManagerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xlog"
);
    *
    *    ContextManager contextManager = new ContextManager( null, contextBuilder.getContext(),
null );
    *    contextManager.initialize();
  @@ -54,7 +54,7 @@
    * </pre>
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.34 $ $Date: 2002/04/03 22:55:58 $
  + * @version CVS $Revision: 1.35 $ $Date: 2002/04/04 13:17:48 $
    */
   public interface ContainerManager extends Disposable, Initializable
   {
  
  
  
  1.7       +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/ComponentFactory.java
  
  Index: ComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/ComponentFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ComponentFactory.java	3 Apr 2002 23:02:56 -0000	1.6
  +++ ComponentFactory.java	4 Apr 2002 13:17:48 -0000	1.7
  @@ -9,10 +9,10 @@
   
   import org.apache.avalon.excalibur.instrument.CounterInstrument;
   import org.apache.avalon.excalibur.instrument.Instrumentable;
  -import org.apache.avalon.excalibur.instrument.Instrement;
  +import org.apache.avalon.excalibur.instrument.Instrument;
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.excalibur.mpool.ObjectFactory;
  -import org.apache.avalon.excalibur.system.util.RoleManager;
  +import org.apache.avalon.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
  @@ -33,7 +33,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2002/04/03 23:02:56 $
  + * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.0
    */
   public class ComponentFactory
  
  
  
  1.11      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/FactoryComponentHandler.java
  
  Index: FactoryComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/FactoryComponentHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- FactoryComponentHandler.java	3 Apr 2002 23:02:56 -0000	1.10
  +++ FactoryComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.11
  @@ -10,8 +10,8 @@
   import org.apache.avalon.excalibur.instrument.Instrumentable;
   import org.apache.avalon.excalibur.instrument.Instrument;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.system.Container;
  -import org.apache.avalon.excalibur.system.util.RoleManager;
  +import org.apache.avalon.excalibur.fortress.Container;
  +import org.apache.avalon.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -24,7 +24,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.10 $ $Date: 2002/04/03 23:02:56 $
  + * @version CVS $Revision: 1.11 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.0
    */
   public final class FactoryComponentHandler
  
  
  
  1.12      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/PerThreadComponentHandler.java
  
  Index: PerThreadComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/PerThreadComponentHandler.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PerThreadComponentHandler.java	3 Apr 2002 23:02:56 -0000	1.11
  +++ PerThreadComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.12
  @@ -10,8 +10,8 @@
   import org.apache.avalon.excalibur.instrument.Instrumentable;
   import org.apache.avalon.excalibur.instrument.Instrument;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.system.Container;
  -import org.apache.avalon.excalibur.system.util.RoleManager;
  +import org.apache.avalon.excalibur.fortress.Container;
  +import org.apache.avalon.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -23,7 +23,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.11 $ $Date: 2002/04/03 23:02:56 $
  + * @version CVS $Revision: 1.12 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.0
    */
   public final class PerThreadComponentHandler implements ComponentHandler
  
  
  
  1.14      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/PoolableComponentHandler.java
  
  Index: PoolableComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/PoolableComponentHandler.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PoolableComponentHandler.java	3 Apr 2002 23:02:56 -0000	1.13
  +++ PoolableComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.14
  @@ -12,8 +12,8 @@
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.excalibur.mpool.Pool;
   import org.apache.avalon.excalibur.mpool.PoolManager;
  -import org.apache.avalon.excalibur.system.Container;
  -import org.apache.avalon.excalibur.system.util.RoleManager;
  +import org.apache.avalon.excalibur.fortress.Container;
  +import org.apache.avalon.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -26,7 +26,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.13 $ $Date: 2002/04/03 23:02:56 $
  + * @version CVS $Revision: 1.14 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.0
    */
   public final class PoolableComponentHandler implements ComponentHandler
  
  
  
  1.10      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/ThreadSafeComponentHandler.java
  
  Index: ThreadSafeComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/handler/ThreadSafeComponentHandler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ThreadSafeComponentHandler.java	3 Apr 2002 23:02:56 -0000	1.9
  +++ ThreadSafeComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.10
  @@ -10,8 +10,8 @@
   import org.apache.avalon.excalibur.instrument.Instrumentable;
   import org.apache.avalon.excalibur.instrument.Instrument;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.system.Container;
  -import org.apache.avalon.excalibur.system.util.RoleManager;
  +import org.apache.avalon.excalibur.fortress.Container;
  +import org.apache.avalon.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.component.Component;
  @@ -25,7 +25,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2002/04/03 23:02:56 $
  + * @version CVS $Revision: 1.10 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.0
    */
   public final class ThreadSafeComponentHandler implements ComponentHandler
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/util/AbstractRoleManager.java
  
  Index: AbstractRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/util/AbstractRoleManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractRoleManager.java	3 Apr 2002 23:13:46 -0000	1.4
  +++ AbstractRoleManager.java	4 Apr 2002 13:17:48 -0000	1.5
  @@ -17,7 +17,7 @@
    * information is hard-coded.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2002/04/03 23:13:46 $
  + * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.1
    */
   public abstract class AbstractRoleManager
  @@ -106,7 +106,7 @@
           }
           catch( Exception e )
           {
  -            handlerKlass = org.apache.avalon.excalibur.system.handler.PerThreadComponentHandler.class;
  +            handlerKlass = org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler.class;
           }
   
           shorts.put( shortName, klass );
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/util/ConfigurableRoleManager.java
  
  Index: ConfigurableRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/util/ConfigurableRoleManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ConfigurableRoleManager.java	3 Apr 2002 23:13:46 -0000	1.5
  +++ ConfigurableRoleManager.java	4 Apr 2002 13:17:48 -0000	1.6
  @@ -20,7 +20,7 @@
    * in the org.apache.avalon.component package.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/04/03 23:13:46 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.1
    */
   public class ConfigurableRoleManager
  @@ -86,7 +86,7 @@
                       components[ j ].getAttribute( "class", null );
                   final String handlerClassName =
                       components[ j ].getAttribute( "handler",
  -                                                  "org.apache.avalon.excalibur.system.handler.PerThreadComponentHandler"
);
  +                                                  "org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler"
);
   
                   setup( shorts, classes, handlers, shorthand, role, className, handlerClassName
);
               }
  
  
  
  1.6       +14 -14    jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/util/ExcaliburRoleManager.java
  
  Index: ExcaliburRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/excalibur/fortress/util/ExcaliburRoleManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExcaliburRoleManager.java	3 Apr 2002 23:13:46 -0000	1.5
  +++ ExcaliburRoleManager.java	4 Apr 2002 13:17:48 -0000	1.6
  @@ -15,7 +15,7 @@
    * information is hard-coded.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/04/03 23:13:46 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.1
    */
   public class ExcaliburRoleManager
  @@ -58,67 +58,67 @@
           setup( shorts, classes, handlers, "cache",
                  "org.apache.avalon.excalibur.cache.Cache",
                  "org.apache.avalon.excalibur.cache.DefaultCache",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
           setup( shorts, classes, handlers, "lru-cache",
                  "org.apache.avalon.excalibur.cache.Cache",
                  "org.apache.avalon.excalibur.cache.LRUCache",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
   
           /* Set up DataSource relations */
           setup( shorts, classes, handlers, "jdbc-datasource",
                  "org.apache.avalon.excalibur.datasource.DataSourceComponent",
                  "org.apache.avalon.excalibur.datasource.JdbcDataSource",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
           setup( shorts, classes, handlers, "j2ee-datasource",
                  "org.apache.avalon.excalibur.datasource.DataSourceComponent",
                  "org.apache.avalon.excalibur.datasource.J2eeDataSource",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
           setup( shorts, classes, handlers, "informix-datasource",
                  "org.apache.avalon.excalibur.datasource.DataSourceComponent",
                  "org.apache.avalon.excalibur.datasource.InformixDataSource",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
   
           /* Set up i18n relations */
           setup( shorts, classes, handlers, "i18n",
                  "org.apache.avalon.excalibur.i18n.BundleSelector",
                  "org.apache.avalon.excalibur.i18n.BundleSelector",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
   
           /* Set up Monitor relations */
           setup( shorts, classes, handlers, "monitor",
                  "org.apache.avalon.excalibur.monitor.Monitor",
                  "org.apache.avalon.excalibur.monitor.ActiveMonitor",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
           setup( shorts, classes, handlers, "passive-monitor",
                  "org.apache.avalon.excalibur.monitor.Monitor",
                  "org.apache.avalon.excalibur.monitor.PassiveMonitor",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
   
           /* Set up XPath relations */
           setup( shorts, classes, handlers, "xalan-xpath",
                  "org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
                  "org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
           setup( shorts, classes, handlers, "jaxpath",
                  "org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
                  "org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
   
           /* Set up SourceResolver relations */
           setup( shorts, classes, handlers, "resolver",
                  "org.apache.avalon.excalibur.source.SourceResolver",
                  "org.apache.avalon.excalibur.source.SourceResolverImpl",
  -               "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
);
  +               "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
);
   
           /* Set up XML parser relations */
           setup( shorts, classes, handlers, "parser",
                  "org.apache.avalon.excalibur.xml.Parser",
                  "org.apache.avalon.excalibur.xml.JaxpParser",
  -               "org.apache.avalon.excalibur.system.handler.PerThreadComponentHandler" );
  +               "org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler"
);
           setup( shorts, classes, handlers, "xerces-parser",
                  "org.apache.avalon.excalibur.xml.Parser",
                  "org.apache.avalon.excalibur.xml.XercesParser",
  -               "org.apache.avalon.excalibur.system.handler.FactoryComponentHandler" );
  +               "org.apache.avalon.excalibur.fortress.handler.FactoryComponentHandler" );
   
           m_shorthands = Collections.unmodifiableMap( shorts );
           m_classNames = Collections.unmodifiableMap( classes );
  
  
  
  1.14      +9 -9      jakarta-avalon-excalibur/fortress/src/test/org/apache/avalon/excalibur/fortress/test/ContainerProfile.java
  
  Index: ContainerProfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/avalon/excalibur/fortress/test/ContainerProfile.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ContainerProfile.java	3 Apr 2002 23:22:38 -0000	1.13
  +++ ContainerProfile.java	4 Apr 2002 13:17:48 -0000	1.14
  @@ -14,10 +14,10 @@
   import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
   import org.apache.avalon.excalibur.monitor.Monitor;
  -import org.apache.avalon.excalibur.system.ContainerManager;
  -import org.apache.avalon.excalibur.system.DefaultContainerManager;
  -import org.apache.avalon.excalibur.system.util.ContextBuilder;
  -import org.apache.avalon.excalibur.system.util.ContextManager;
  +import org.apache.avalon.excalibur.fortress.ContainerManager;
  +import org.apache.avalon.excalibur.fortress.DefaultContainerManager;
  +import org.apache.avalon.excalibur.fortress.util.ContextBuilder;
  +import org.apache.avalon.excalibur.fortress.util.ContextManager;
   import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
   import org.apache.avalon.excalibur.testcase.LatchedThreadGroup;
   import org.apache.avalon.excalibur.xml.Parser;
  @@ -33,7 +33,7 @@
    * Used as a basis for the PoolComparisonProfile Tests
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version $Id: ContainerProfile.java,v 1.13 2002/04/03 23:22:38 bloritsch Exp $
  + * @version $Id: ContainerProfile.java,v 1.14 2002/04/04 13:17:48 jefft Exp $
    */
   public final class ContainerProfile
       extends TestCase
  @@ -96,12 +96,12 @@
   
           long cmStart = System.currentTimeMillis();
           ContextBuilder contextBuilder = new ContextBuilder();
  -        contextBuilder.setContainerClass( "org.apache.avalon.excalibur.system.test.TestContainer"
);
  +        contextBuilder.setContainerClass( "org.apache.avalon.excalibur.fortress.test.TestContainer"
);
           contextBuilder.setContextDirectory( "./" );
           contextBuilder.setWorkDirectory( "./" );
  -        contextBuilder.setContainerConfiguration( "resource://org/apache/avalon/excalibur/system/test/ContainerProfile.xconf"
);
  -        contextBuilder.setLoggerManagerConfiguration( "resource://org/apache/avalon/excalibur/system/test/ContainerProfile.xlog"
);
  -        contextBuilder.setRoleManagerConfiguration( "resource://org/apache/avalon/excalibur/system/test/ContainerProfile.roles"
);
  +        contextBuilder.setContainerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xconf"
);
  +        contextBuilder.setLoggerManagerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.xlog"
);
  +        contextBuilder.setRoleManagerConfiguration( "resource://org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles"
);
   
           ContextManager contextManager = new ContextManager( contextBuilder.getContext(),
null );
           contextManager.initialize();
  
  
  
  1.6       +9 -9      jakarta-avalon-excalibur/fortress/src/test/org/apache/avalon/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java
  
  Index: ConfigurableRoleManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/avalon/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ConfigurableRoleManagerTestCase.java	3 Apr 2002 23:48:33 -0000	1.5
  +++ ConfigurableRoleManagerTestCase.java	4 Apr 2002 13:17:48 -0000	1.6
  @@ -17,7 +17,7 @@
    * in the org.apache.avalon.component package.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/04/03 23:48:33 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.1
    */
   public class ConfigurableRoleManagerTestCase
  @@ -40,7 +40,7 @@
           DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
           ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader()
);
           roles.configure( builder.build( this.getClass().getClassLoader()
  -                                        .getResourceAsStream( "org/apache/avalon/excalibur/system/test/ContainerProfile.roles"
) ) );
  +                                        .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles"
) ) );
   
           assertEquals(
               roles.getClassForName( "datasource" ),
  @@ -65,7 +65,7 @@
           DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
           ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader()
);
           roles.configure( builder.build( this.getClass().getClassLoader()
  -                                        .getResourceAsStream( "org/apache/avalon/excalibur/system/test/ContainerProfile.roles"
) ) );
  +                                        .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles"
) ) );
   
           assertEquals(
               roles.getNameForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource"
) ),
  @@ -90,7 +90,7 @@
           DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
           ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader()
);
           roles.configure( builder.build( this.getClass().getClassLoader()
  -                                        .getResourceAsStream( "org/apache/avalon/excalibur/system/test/ContainerProfile.roles"
) ) );
  +                                        .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles"
) ) );
   
           assertEquals(
               roles.getRoleForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource"
) ),
  @@ -115,7 +115,7 @@
           DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
           ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader()
);
           roles.configure( builder.build( this.getClass().getClassLoader()
  -                                        .getResourceAsStream( "org/apache/avalon/excalibur/system/test/ContainerProfile.roles"
) ) );
  +                                        .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles"
) ) );
   
           Class[] classes = roles.getClassesForRole( "org.apache.avalon.excalibur.datasource.DataSourceComponent"
);
   
  @@ -148,19 +148,19 @@
           DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
           ConfigurableRoleManager roles = new ConfigurableRoleManager( null, this.getClass().getClassLoader()
);
           roles.configure( builder.build( this.getClass().getClassLoader()
  -                                        .getResourceAsStream( "org/apache/avalon/excalibur/system/test/ContainerProfile.roles"
) ) );
  +                                        .getResourceAsStream( "org.apache.avalon.excalibur.fortress/test/ContainerProfile.roles"
) ) );
   
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.JaxpParser"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.PoolableComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.PoolableComponentHandler"
)
           );
       }
   }
  
  
  
  1.5       +14 -14    jakarta-avalon-excalibur/fortress/src/test/org/apache/avalon/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java
  
  Index: ExcaliburRoleManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/avalon/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExcaliburRoleManagerTestCase.java	3 Apr 2002 23:48:33 -0000	1.4
  +++ ExcaliburRoleManagerTestCase.java	4 Apr 2002 13:17:48 -0000	1.5
  @@ -16,7 +16,7 @@
    * in the org.apache.avalon.component package.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2002/04/03 23:48:33 $
  + * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 13:17:48 $
    * @since 4.1
    */
   public class ExcaliburRoleManagerTestCase
  @@ -308,55 +308,55 @@
   
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.cache.DefaultCache"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.cache.LRUCache"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.JdbcDataSource"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.J2eeDataSource"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.datasource.InformixDataSource"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.i18n.BundleSelector"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.monitor.PassiveMonitor"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.source.SourceResolverImpl"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.ThreadSafeComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.JaxpParser"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.PerThreadComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.PerThreadComponentHandler"
)
           );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.xml.XercesParser"
) ),
  -            Class.forName( "org.apache.avalon.excalibur.system.handler.FactoryComponentHandler"
)
  +            Class.forName( "org.apache.avalon.excalibur.fortress.handler.FactoryComponentHandler"
)
           );
       }
   }
  
  
  

--
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