Author: jboynes
Date: Wed Apr  5 11:50:35 2006
New Revision: 391712

URL: http://svn.apache.org/viewcvs?rev=391712&view=rev
Log:
switch to StAX loader

Modified:
    
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java

Modified: 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java?rev=391712&r1=391711&r2=391712&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
 Wed Apr  5 11:50:35 2006
@@ -26,7 +26,6 @@
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.config.ConfigurationException;
-import 
org.apache.tuscany.core.config.impl.ModuleComponentConfigurationLoaderImpl;
 import 
org.apache.tuscany.core.config.impl.StAXModuleComponentConfigurationLoaderImpl;
 import org.apache.tuscany.core.context.SystemAggregateContext;
 import org.apache.tuscany.core.context.AggregateContext;
@@ -88,7 +87,6 @@
         return configBuilders;
     }
 
-    private static final boolean useStax = false;
     private static final String SYSTEM_LOADER_COMPONENT = "tuscany.loader";
 
     /**
@@ -101,12 +99,7 @@
     public static ModuleComponentConfigurationLoader 
getConfigurationLoader(SystemAggregateContext systemContext, 
AssemblyModelContext modelContext) throws ConfigurationException {
         // Bootstrap the StAX loader module
         bootstrapStaxLoader(systemContext, modelContext);
-
-        if (useStax) {
-            return new 
StAXModuleComponentConfigurationLoaderImpl(modelContext, 
XMLInputFactory.newInstance(), 
systemContext.resolveInstance(StAXLoaderRegistry.class));
-        } else {
-            return new ModuleComponentConfigurationLoaderImpl(modelContext);
-        }
+        return new StAXModuleComponentConfigurationLoaderImpl(modelContext, 
XMLInputFactory.newInstance(), 
systemContext.resolveInstance(StAXLoaderRegistry.class));
     }
 
     private static AggregateContext bootstrapStaxLoader(SystemAggregateContext 
systemContext, AssemblyModelContext modelContext) throws ConfigurationException 
{


Reply via email to