Author: jboynes
Date: Mon Apr 10 17:21:13 2006
New Revision: 393125
URL: http://svn.apache.org/viewcvs?rev=393125&view=rev
Log:
reduce the number of hard-coded loaders in the bootstrap
move ones not needed to load the system configuration into the system
configuration
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
incubator/tuscany/java/sca/core/src/main/resources/system.module
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java?rev=393125&r1=393124&r2=393125&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
Mon Apr 10 17:21:13 2006
@@ -105,25 +105,21 @@
List<Component> components = module.getComponents();
+ // bootstrap the minimal set of loaders needed to read the system
module files
+ // all others should be defined in the system.module file
+ components.add(bootstrapLoader(factory, introspector,
ModuleLoader.class));
+ components.add(bootstrapLoader(factory, introspector,
ModuleFragmentLoader.class));
components.add(bootstrapLoader(factory, introspector,
ComponentLoader.class));
- components.add(bootstrapLoader(factory, introspector,
ComponentTypeLoader.class));
components.add(bootstrapLoader(factory, introspector,
EntryPointLoader.class));
- components.add(bootstrapLoader(factory, introspector,
ExternalServiceLoader.class));
components.add(bootstrapLoader(factory, introspector,
InterfaceJavaLoader.class));
- components.add(bootstrapLoader(factory, introspector,
InterfaceWSDLLoader.class));
- components.add(bootstrapLoader(factory, introspector,
ModuleFragmentLoader.class));
- components.add(bootstrapLoader(factory, introspector,
ModuleLoader.class));
- components.add(bootstrapLoader(factory, introspector,
PropertyLoader.class));
- components.add(bootstrapLoader(factory, introspector,
ReferenceLoader.class));
- components.add(bootstrapLoader(factory, introspector,
ServiceLoader.class));
-
components.add(bootstrapLoader(factory, introspector,
SystemImplementationLoader.class));
components.add(bootstrapLoader(factory, introspector,
SystemBindingLoader.class));
+ // do not add additional loaders above - they should be in the
system.module file
+ // bootstrap the registries needed by the bootstrap loaders above
bootstrapService(factory, module, StAXLoaderRegistry.class,
StAXLoaderRegistryImpl.class);
bootstrapService(factory, module, SystemAssemblyFactory.class,
SystemAssemblyFactoryImpl.class);
bootstrapService(factory, module, ComponentTypeIntrospector.class,
Java5ComponentTypeIntrospector.class);
-
ModuleComponent mc = factory.createModuleComponent();
mc.setName(name);
Modified: incubator/tuscany/java/sca/core/src/main/resources/system.module
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/resources/system.module?rev=393125&r1=393124&r2=393125&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/resources/system.module (original)
+++ incubator/tuscany/java/sca/core/src/main/resources/system.module Mon Apr 10
17:21:13 2006
@@ -23,11 +23,31 @@
<system:implementation.system
class="org.apache.tuscany.core.loader.impl.WSDLDefinitionRegistryImpl"/>
</component>
+ <component
name="org.apache.tuscany.core.loader.assembly.ComponentTypeLoader">
+ <system:implementation.system
class="org.apache.tuscany.core.loader.assembly.ComponentTypeLoader"/>
+ </component>
+
+ <component
name="org.apache.tuscany.core.loader.assembly.ExternalServiceLoader">
+ <system:implementation.system
class="org.apache.tuscany.core.loader.assembly.ExternalServiceLoader"/>
+ </component>
+
<component name="org.apache.tuscany.core.loader.assembly.ImportWSDLLoader">
<system:implementation.system
class="org.apache.tuscany.core.loader.assembly.ImportWSDLLoader"/>
</component>
<component
name="org.apache.tuscany.core.loader.assembly.InterfaceWSDLLoader">
<system:implementation.system
class="org.apache.tuscany.core.loader.assembly.InterfaceWSDLLoader"/>
+ </component>
+
+ <component name="org.apache.tuscany.core.loader.assembly.PropertyLoader">
+ <system:implementation.system
class="org.apache.tuscany.core.loader.assembly.PropertyLoader"/>
+ </component>
+
+ <component name="org.apache.tuscany.core.loader.assembly.ReferenceLoader">
+ <system:implementation.system
class="org.apache.tuscany.core.loader.assembly.ReferenceLoader"/>
+ </component>
+
+ <component name="org.apache.tuscany.core.loader.assembly.ServiceLoader">
+ <system:implementation.system
class="org.apache.tuscany.core.loader.assembly.ServiceLoader"/>
</component>
</module>
