Author: jboynes
Date: Wed Mar 29 19:12:48 2006
New Revision: 389977
URL: http://svn.apache.org/viewcvs?rev=389977&view=rev
Log:
remove autowire magic for the AssemblyFactory
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/loader/StAXUtil.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeLoaderTestCase.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=389977&r1=389976&r2=389977&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 Mar 29 19:12:48 2006
@@ -99,9 +99,10 @@
* @return the default module configuration loader
*/
public static ModuleComponentConfigurationLoader
getConfigurationLoader(SystemAggregateContext systemContext,
AssemblyModelContext modelContext) throws ConfigurationException {
+ // Bootstrap the StAX loader module
+ bootstrapStaxLoader(systemContext, modelContext);
+
if (useStax) {
- // Bootstrap the StAX loader module
- bootstrapStaxLoader(systemContext, modelContext);
return new
StAXModuleComponentConfigurationLoaderImpl(modelContext,
XMLInputFactory.newInstance(),
systemContext.resolveInstance(StAXLoaderRegistry.class));
} else {
return new ModuleComponentConfigurationLoaderImpl(modelContext);
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=389977&r1=389976&r2=389977&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
Wed Mar 29 19:12:48 2006
@@ -115,7 +115,8 @@
components.add(bootstrapLoader(factory,
SystemImplementationLoader.class));
components.add(bootstrapLoader(factory, SystemBindingLoader.class));
- bootstrapLoaderRegistry(factory, module);
+ bootstrapService(factory, module, StAXLoaderRegistry.class,
StAXLoaderRegistryImpl.class);
+ bootstrapService(factory, module, SystemAssemblyFactory.class,
SystemAssemblyFactoryImpl.class);
ModuleComponent mc = factory.createModuleComponent();
mc.setName(name);
@@ -134,12 +135,12 @@
return component;
}
- private static void bootstrapLoaderRegistry(SystemAssemblyFactory factory,
Module module) {
- String epName = StAXLoaderRegistry.class.getName();
- String compName = StAXLoaderRegistryImpl.class.getName();
+ private static <T> void bootstrapService(SystemAssemblyFactory factory,
Module module, Class<T> service, Class<? extends T> impl) {
+ String epName = service.getName();
+ String compName = impl.getName();
- Component component = factory.createSystemComponent(compName,
StAXLoaderRegistry.class, StAXLoaderRegistryImpl.class, Scope.MODULE);
- EntryPoint entryPoint = factory.createSystemEntryPoint(epName,
StAXLoaderRegistry.class, compName);
+ Component component = factory.createSystemComponent(compName, service,
impl, Scope.MODULE);
+ EntryPoint entryPoint = factory.createSystemEntryPoint(epName,
service, compName);
module.getComponents().add(component);
module.getEntryPoints().add(entryPoint);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java?rev=389977&r1=389976&r2=389977&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
Wed Mar 29 19:12:48 2006
@@ -22,18 +22,18 @@
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.AssemblyFactory;
+import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
import org.apache.tuscany.model.assembly.AssemblyModelObject;
/**
* @version $Rev$ $Date$
*/
public abstract class AbstractLoader<T extends AssemblyModelObject> implements
StAXElementLoader<T> {
- protected AssemblyFactory factory;
+ protected SystemAssemblyFactory factory;
protected StAXLoaderRegistry registry;
@Autowire
- public void setFactory(AssemblyFactory factory) {
+ public void setFactory(SystemAssemblyFactory factory) {
this.factory = factory;
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java?rev=389977&r1=389976&r2=389977&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
Wed Mar 29 19:12:48 2006
@@ -577,12 +577,6 @@
return instanceInterface.cast(messageFactory);
} else if (ProxyFactoryFactory.class.equals(instanceInterface)) {
return instanceInterface.cast(proxyFactoryFactory);
- } else if
(instanceInterface.isAssignableFrom(SystemAssemblyFactory.class)) {
- if (assemblyFactory != null) {
- return instanceInterface.cast(assemblyFactory);
- } else {
- return autowireContext.resolveInstance(instanceInterface);
- }
}
NameToScope mapping = autowireIndex.get(instanceInterface);
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeLoaderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeLoaderTestCase.java?rev=389977&r1=389976&r2=389977&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeLoaderTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeLoaderTestCase.java
Wed Mar 29 19:12:48 2006
@@ -23,15 +23,15 @@
import junit.framework.TestCase;
-import org.apache.tuscany.model.assembly.ComponentType;
-import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
+import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
+import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.assembly.AbstractLoader;
import org.apache.tuscany.core.loader.assembly.ComponentTypeLoader;
import org.apache.tuscany.core.loader.assembly.ServiceLoader;
import org.apache.tuscany.core.loader.impl.StAXLoaderRegistryImpl;
-import org.apache.tuscany.core.config.ConfigurationLoadException;
-import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
+import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
+import org.apache.tuscany.model.assembly.ComponentType;
+import org.apache.tuscany.model.assembly.Service;
/**
* @version $Rev$ $Date$
@@ -39,7 +39,7 @@
public class ComponentTypeLoaderTestCase extends TestCase {
private XMLInputFactory xmlFactory;
private StAXLoaderRegistry registry;
- private AssemblyFactoryImpl assemblyFactory;
+ private SystemAssemblyFactoryImpl assemblyFactory;
private ResourceLoaderImpl resourceLoader;
public void testMinimal() throws XMLStreamException,
ConfigurationLoadException {
@@ -57,7 +57,7 @@
protected void setUp() throws Exception {
super.setUp();
xmlFactory = XMLInputFactory.newInstance();
- assemblyFactory = new AssemblyFactoryImpl();
+ assemblyFactory = new SystemAssemblyFactoryImpl();
registry = new StAXLoaderRegistryImpl();
register(new ComponentTypeLoader());
register(new ServiceLoader());
