CVS: plexus-container-new/src/java/org/apache/plexus DefaultPlexusContainer.java,1.20,1.21

Update of /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus
In directory eng.werken.com:/tmp/cvs-serv1555

Modified Files:
	DefaultPlexusContainer.java 
Log Message:
o use XmlPullConfigurationBuilder

Index: DefaultPlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/DefaultPlexusContainer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- DefaultPlexusContainer.java	2 May 2003 14:53:35 -0000	1.20
+++ DefaultPlexusContainer.java	3 May 2003 00:42:48 -0000	1.21
@@ -63,7 +63,7 @@
 import org.apache.plexus.classloader.DefaultResourceManager;
 import org.apache.plexus.classloader.ResourceManagerFactory;
 import org.apache.plexus.configuration.ConfigurationResourceException;
-import org.apache.plexus.configuration.DefaultConfigurationBuilder;
+import org.apache.plexus.configuration.XmlPullConfigurationBuilder;
 import org.apache.plexus.context.DefaultContext;
 import org.apache.plexus.lifecycle.LifecycleHandler;
 import org.apache.plexus.lifecycle.LifecycleHandlerFactory;
@@ -74,7 +74,6 @@
 import org.apache.plexus.service.repository.ComponentRepositoryFactory;
 import org.apache.plexus.util.ContextMapAdapter;
 import org.apache.plexus.util.InterpolationFilterReader;
-import org.xml.sax.InputSource;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -141,7 +140,7 @@
     private DefaultResourceManager resourceManager;
 
     /** Default Configuration Builder. */
-    private DefaultConfigurationBuilder builder;
+    private XmlPullConfigurationBuilder builder;
 
     /** Default configuration. */
     private Configuration defaultConfiguration;
@@ -155,7 +154,7 @@
      */
     public DefaultPlexusContainer()
     {
-        builder = new DefaultConfigurationBuilder();
+        builder = new XmlPullConfigurationBuilder();
     }
 
     // ----------------------------------------------------------------------
@@ -332,7 +331,7 @@
                                              "most likely corrupt." );
         }
 
-        setDefaultConfiguration( builder.build( new InputSource( new InputStreamReader( is ) ) ) );
+        setDefaultConfiguration( builder.parse( new InputStreamReader( is ) ) );
     }
 
     /** Initialize the configuration.
@@ -346,7 +345,7 @@
             new InterpolationFilterReader( getConfigurationReader(),
                                            new ContextMapAdapter( getContext() ) );
 
-        setConfiguration( builder.build( new InputSource( interpolationFilterReader ) ) );
+        setConfiguration( builder.parse( interpolationFilterReader ) );
     }
 
     /** Initialize Logging.