cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 55490 - cocoon/trunk/src/core/test/org/apache/cocoon/core/container
Date Mon, 25 Oct 2004 07:04:06 GMT
Author: cziegeler
Date: Mon Oct 25 00:04:05 2004
New Revision: 55490

Modified:
   cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
Log:
Setup manager even without xtest configuration

Modified: cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
==============================================================================
--- cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java	(original)
+++ cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java	Mon
Oct 25 00:04:05 2004
@@ -23,6 +23,7 @@
 
 import org.apache.avalon.excalibur.logger.LoggerManager;
 import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
 import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.context.Context;
@@ -151,9 +152,10 @@
 
         if( resource != null ) {
             getLogger().debug( "Loading resource " + resourceName );
-            prepare( resource.openStream() );
+            this.prepare( resource.openStream() );
         } else {
             getLogger().debug( "Resource not found " + resourceName );
+            this.prepare( null );
         }
     }
 
@@ -171,17 +173,22 @@
     protected final void prepare( final InputStream testconf )
     throws Exception {
         if ( getLogger().isDebugEnabled() ) {
-            getLogger().debug( "ContainerTestCase.initialize" );
+            getLogger().debug( "Initializing " + this.getName() );
         }
 
         final DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
-        final Configuration conf = builder.build( testconf );
+        final Configuration conf;
+        if ( testconf != null ) {
+            conf = builder.build( testconf );
+        } else {
+            conf = new DefaultConfiguration("", "-");
+        }
 
-        Context context = this.setupContext( conf.getChild( "context" ) );
+        final Context context = this.setupContext( conf.getChild( "context" ) );
 
-        setupManagers( conf.getChild( "components" ),
-                       conf.getChild( "roles" ),
-                       context );
+        this.setupManagers( conf.getChild( "components" ),
+                            conf.getChild( "roles" ),
+                            context );
     }
 
     /* (non-Javadoc)
@@ -230,7 +237,7 @@
                 }
             }
         }
-        addContext( context );
+        this.addContext( context );
         return context ;
     }
 

Mime
View raw message