Author: jboynes
Date: Mon Apr 10 17:10:38 2006
New Revision: 393124
URL: http://svn.apache.org/viewcvs?rev=393124&view=rev
Log:
separate bootstrap of the StAX loader from the setup of the
ModuleConfigurationLoader
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.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=393124&r1=393123&r2=393124&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
Mon Apr 10 17:10:38 2006
@@ -16,9 +16,13 @@
*/
package org.apache.tuscany.core.client;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.stream.XMLInputFactory;
+
+import org.apache.tuscany.common.monitor.MonitorFactory;
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
-import org.apache.tuscany.common.monitor.MonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
@@ -39,10 +43,6 @@
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
import org.apache.tuscany.model.scdl.loader.impl.SCDLAssemblyModelLoaderImpl;
-import javax.xml.stream.XMLInputFactory;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @version $Rev$ $Date$
*/
@@ -73,8 +73,8 @@
/**
* Returns a default list of configuration builders.
*
- * @return a default list of configuration builders
* @param monitorFactory
+ * @return a default list of configuration builders
*/
public static List<ContextFactoryBuilder> getBuilders(MonitorFactory
monitorFactory) {
List<ContextFactoryBuilder> configBuilders = new
ArrayList<ContextFactoryBuilder>();
@@ -84,7 +84,7 @@
return configBuilders;
}
- private static final String SYSTEM_LOADER_COMPONENT = "tuscany.loader";
+ public static final String SYSTEM_LOADER_COMPONENT = "tuscany.loader";
/**
* Returns the default module configuration loader.
@@ -94,18 +94,21 @@
* @return the default module configuration loader
*/
public static ModuleComponentConfigurationLoader
getConfigurationLoader(SystemCompositeContext systemContext,
AssemblyModelContext modelContext) throws ConfigurationException {
- // Bootstrap the StAX loader module
- bootstrapStaxLoader(systemContext, modelContext);
return new StAXModuleComponentConfigurationLoaderImpl(modelContext,
XMLInputFactory.newInstance(),
systemContext.resolveInstance(StAXLoaderRegistry.class));
}
- private static CompositeContext bootstrapStaxLoader(SystemCompositeContext
systemContext, AssemblyModelContext modelContext) throws ConfigurationException
{
- CompositeContext loaderContext = (CompositeContext)
systemContext.getContext(SYSTEM_LOADER_COMPONENT);
- if (loaderContext == null) {
- ModuleComponent loaderComponent =
StAXUtil.bootstrapLoader(SYSTEM_LOADER_COMPONENT, modelContext);
- loaderContext = registerModule(systemContext, loaderComponent);
- loaderContext.fireEvent(EventContext.MODULE_START, null);
- }
+ /**
+ * Bootstrap the StAX-based loader.
+ *
+ * @param parentContext the parent system context
+ * @param modelContext
+ * @return the system context for the loader
+ * @throws ConfigurationException
+ */
+ public static CompositeContext bootstrapStaxLoader(SystemCompositeContext
parentContext, AssemblyModelContext modelContext) throws ConfigurationException
{
+ ModuleComponent loaderComponent =
StAXUtil.bootstrapLoader(SYSTEM_LOADER_COMPONENT, modelContext);
+ CompositeContext loaderContext = registerModule(parentContext,
loaderComponent);
+ loaderContext.fireEvent(EventContext.MODULE_START, null);
return loaderContext;
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java?rev=393124&r1=393123&r2=393124&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
Mon Apr 10 17:10:38 2006
@@ -88,6 +88,7 @@
// Load and start the system configuration
SystemCompositeContext systemContext = runtime.getSystemContext();
+ BootstrapHelper.bootstrapStaxLoader(systemContext, modelContext);
ModuleComponentConfigurationLoader loader =
BootstrapHelper.getConfigurationLoader(systemContext, modelContext);
ModuleComponent systemModuleComponent =
loader.loadSystemModuleComponent(SYSTEM_MODULE_COMPONENT,
SYSTEM_MODULE_COMPONENT);
CompositeContext context =
BootstrapHelper.registerModule(systemContext, systemModuleComponent);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java?rev=393124&r1=393123&r2=393124&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
Mon Apr 10 17:10:38 2006
@@ -112,6 +112,7 @@
// Load and start the system configuration
SystemCompositeContext systemContext = runtime.getSystemContext();
+ BootstrapHelper.bootstrapStaxLoader(systemContext, modelContext);
ModuleComponentConfigurationLoader loader =
BootstrapHelper.getConfigurationLoader(systemContext, modelContext);
ModuleComponent systemModuleComponent =
loader.loadSystemModuleComponent(SYSTEM_MODULE_COMPONENT,
SYSTEM_MODULE_COMPONENT);
CompositeContext context =
BootstrapHelper.registerModule(systemContext, systemModuleComponent);
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java?rev=393124&r1=393123&r2=393124&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
Mon Apr 10 17:10:38 2006
@@ -82,6 +82,7 @@
// Load and start the system configuration
try {
SystemCompositeContext systemContext = runtime.getSystemContext();
+ BootstrapHelper.bootstrapStaxLoader(systemContext, modelContext);
ModuleComponentConfigurationLoader loader =
BootstrapHelper.getConfigurationLoader(systemContext, modelContext);
ModuleComponent systemModuleComponent =
loader.loadSystemModuleComponent(SYSTEM_MODULE_COMPONENT,
SYSTEM_MODULE_COMPONENT);
CompositeContext context =
BootstrapHelper.registerModule(systemContext, systemModuleComponent);
