Author: jmarino
Date: Sun Feb 18 11:19:23 2007
New Revision: 508947
URL: http://svn.apache.org/viewvc?view=rev&rev=508947
Log:
externalize creation of ServiceContract from SystemSingletonAtomicComponent
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManager.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManagerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManager.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManager.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManager.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManager.java
Sun Feb 18 11:19:23 2007
@@ -24,6 +24,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.event.RuntimeEventListener;
+import org.apache.tuscany.spi.model.ServiceContract;
/**
* Responsible for tracking and managing the component tree for a runtime
instance. The tree corresponds to components
@@ -55,11 +56,11 @@
* create the initial configuration components.
*
* @param uri the uri of the resulting component
- * @param service the service interface the component should expose
+ * @param service the service contract the component should expose
* @param instance the Object that will become the component's
implementation
* @throws RegistrationException
*/
- <S, I extends S> void registerJavaObject(URI uri, Class<S> service, I
instance)
+ <S, I extends S> void registerJavaObject(URI uri, ServiceContract<S>
service, I instance)
throws RegistrationException;
/**
@@ -67,11 +68,11 @@
* create the initial configuration components.
*
* @param uri the name of the resulting component
- * @param services the service interfaces the component should expose
+ * @param services the service contracts the component should expose
* @param instance the Object that will become the component's
implementation
* @throws RegistrationException
*/
- <S, I extends S> void registerJavaObject(URI uri, List<Class<?>> services,
I instance)
+ <S, I extends S> void registerJavaObject(URI uri, List<ServiceContract<?>>
services, I instance)
throws RegistrationException;
/**
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManagerImpl.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManagerImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/ComponentManagerImpl.java
Sun Feb 18 11:19:23 2007
@@ -68,7 +68,7 @@
}
}
- public <S, I extends S> void registerJavaObject(URI uri, Class<S> service,
I instance)
+ public <S, I extends S> void registerJavaObject(URI uri,
ServiceContract<S> service, I instance)
throws RegistrationException {
SystemSingletonAtomicComponent<S, I> component =
new SystemSingletonAtomicComponent<S, I>(uri, service, instance);
@@ -80,7 +80,7 @@
}
}
- public <S, I extends S> void registerJavaObject(URI uri, List<Class<?>>
services, I instance)
+ public <S, I extends S> void registerJavaObject(URI uri,
List<ServiceContract<?>> services, I instance)
throws RegistrationException {
SystemSingletonAtomicComponent<S, I> component =
new SystemSingletonAtomicComponent<S, I>(uri, services, instance);
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
Sun Feb 18 11:19:23 2007
@@ -28,17 +28,12 @@
import org.apache.tuscany.spi.component.TargetInitializationException;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.extension.AbstractComponentExtension;
-import org.apache.tuscany.spi.idl.InvalidServiceContractException;
-import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
-
/**
* An [EMAIL PROTECTED] org.apache.tuscany.spi.component.AtomicComponent} used
when registering objects directly into a composite
*
@@ -47,31 +42,19 @@
public class SystemSingletonAtomicComponent<S, T extends S> extends
AbstractComponentExtension
implements AtomicComponent {
private T instance;
- // JFM FIXME remove and externalize service contract
- private JavaInterfaceProcessorRegistry interfaceProcessorRegistry = new
JavaInterfaceProcessorRegistryImpl();
private List<ServiceContract> serviceContracts = new
ArrayList<ServiceContract>();
- public SystemSingletonAtomicComponent(URI name, Class<S> interfaze, T
instance) {
+ public SystemSingletonAtomicComponent(URI name, ServiceContract<S>
contract, T instance) {
super(name);
this.instance = instance;
- try {
- initWire(interfaze);
- } catch (InvalidServiceContractException e) {
- // JFM FIXME this will go away when we externalize ServiceContract
- e.printStackTrace();
- }
+ this.serviceContracts.add(contract);
}
- public SystemSingletonAtomicComponent(URI name, List<Class<?>> services, T
instance) {
+ public SystemSingletonAtomicComponent(URI name, List<ServiceContract<?>>
services, T instance) {
super(name);
this.instance = instance;
- for (Class<?> interfaze : services) {
- try {
- initWire(interfaze);
- } catch (InvalidServiceContractException e) {
- // JFM FIXME this will go away when we externalize
ServiceContract
- e.printStackTrace();
- }
+ for (ServiceContract<?> contract : services) {
+ serviceContracts.add(contract);
}
}
@@ -146,11 +129,6 @@
public List<ServiceContract> getServiceContracts() {
return serviceContracts;
- }
-
- private void initWire(Class<?> interfaze) throws
InvalidServiceContractException {
- JavaServiceContract serviceContract =
interfaceProcessorRegistry.introspect(interfaze);
- serviceContracts.add(serviceContract);
}
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
Sun Feb 18 11:19:23 2007
@@ -20,7 +20,9 @@
import java.net.URI;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import javax.xml.stream.XMLInputFactory;
import org.osoa.sca.ComponentContext;
@@ -35,8 +37,11 @@
import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.idl.InvalidServiceContractException;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.resolver.ResolutionException;
import org.apache.tuscany.spi.services.management.TuscanyManagementService;
@@ -46,6 +51,7 @@
import org.apache.tuscany.core.component.ComponentManager;
import org.apache.tuscany.core.component.ComponentManagerImpl;
import org.apache.tuscany.core.component.event.ComponentStart;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import
org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
import org.apache.tuscany.core.resolver.AutowireResolver;
@@ -83,6 +89,7 @@
private CompositeComponent systemComponent;
private CompositeComponent tuscanySystem;
private AutowireResolver resolver;
+ private JavaInterfaceProcessorRegistry interfaceProcessorRegistry;
protected AbstractRuntime(Class<I> runtimeInfoType) {
this(runtimeInfoType, new NullMonitorFactory());
@@ -92,6 +99,7 @@
this.runtimeInfoType = runtimeInfoType;
this.monitorFactory = monitorFactory;
xmlFactory =
XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory",
getClass().getClassLoader());
+ this.interfaceProcessorRegistry = new
JavaInterfaceProcessorRegistryImpl();
}
public URL getSystemScdl() {
@@ -162,7 +170,7 @@
URI name = ComponentNames.TUSCANY_SYSTEM_ROOT.resolve("main");
Bootstrapper bootstrapper = createBootstrapper();
- registerSystemComponents();
+ registerBaselineSystemComponents();
// deploy the system scdl
Collection<Component> components;
@@ -216,23 +224,48 @@
return new DefaultBootstrapper(getMonitorFactory(), xmlFactory,
componentManager, resolver, connector);
}
- protected void registerSystemComponents() throws InitializationException {
+ protected void registerBaselineSystemComponents() throws
InitializationException {
+ registerSystemComponent(RUNTIME_INFO_URI, runtimeInfoType,
runtimeInfo);
+ registerSystemComponent(MONITOR_URI, MonitorFactory.class,
getMonitorFactory());
+ // register the component manager with itself so it can be autowired
+ registerSystemComponent(COMPONENT_MGR_URI, ComponentManager.class,
componentManager);
+ registerSystemComponent(AUTOWIRE_RESOLVER_URI, AutowireResolver.class,
resolver);
+ }
+
+ @SuppressWarnings({"unchecked"})
+ protected <S, I extends S> void registerSystemComponent(URI uri, Class<S>
type, I component)
+ throws InitializationException {
try {
- componentManager.registerJavaObject(RUNTIME_INFO_URI,
runtimeInfoType, runtimeInfo);
- componentManager.registerJavaObject(MONITOR_URI,
MonitorFactory.class, getMonitorFactory());
- // register the component manager with itself so it can be
autowired
- componentManager.registerJavaObject(COMPONENT_MGR_URI,
ComponentManager.class, componentManager);
- componentManager.registerJavaObject(AUTOWIRE_RESOLVER_URI,
AutowireResolver.class, resolver);
+ ServiceContract contract =
interfaceProcessorRegistry.introspect(type);
+ componentManager.registerJavaObject(uri, contract, component);
} catch (RegistrationException e) {
throw new InitializationException(e);
+ } catch (InvalidServiceContractException e) {
+ throw new InitializationException(e);
+ }
+ }
+
+ protected <I> void registerSystemComponent(URI uri, List<Class<?>> types,
I component)
+ throws InitializationException {
+ try {
+ List<ServiceContract<?>> contracts = new
ArrayList<ServiceContract<?>>();
+ for (Class<?> type : types) {
+
contracts.add(this.interfaceProcessorRegistry.introspect(type));
+
+ }
+ componentManager.registerJavaObject(uri, contracts, component);
+ } catch (RegistrationException e) {
+ throw new InitializationException(e);
+ } catch (InvalidServiceContractException e) {
+ throw new InitializationException(e);
}
}
protected Collection<Component> deploySystemScdl(Deployer deployer,
- CompositeComponent parent,
- URI name,
- URL systemScdl,
- ClassLoader
systemClassLoader)
+ CompositeComponent parent,
+ URI name,
+ URL systemScdl,
+ ClassLoader
systemClassLoader)
throws LoaderException, BuilderException, ComponentException,
ResolutionException {
SystemCompositeImplementation impl = new
SystemCompositeImplementation();
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
Sun Feb 18 11:19:23 2007
@@ -23,6 +23,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.DuplicateNameException;
+import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
@@ -35,7 +36,9 @@
public void testRegistration() throws Exception {
MockComponent instance = new MockComponent();
URI uri = URI.create("foo");
- componentManager.registerJavaObject(uri, MockComponent.class,
instance);
+ ServiceContract<MockComponent> contract = new
ServiceContract<MockComponent>(MockComponent.class){
+ };
+ componentManager.registerJavaObject(uri, contract, instance);
Component component = componentManager.getComponent(URI.create("foo"));
assertTrue(component instanceof AtomicComponent);
MockComponent resolvedInstance = (MockComponent) ((AtomicComponent)
component).getTargetInstance();
@@ -45,20 +48,15 @@
public void testDuplicateRegistration() throws Exception {
MockComponent instance = new MockComponent();
URI uri = URI.create("foo");
- componentManager.registerJavaObject(uri, MockComponent.class,
instance);
+ ServiceContract<MockComponent> contract = new
ServiceContract<MockComponent>(MockComponent.class){
+ };
+ componentManager.registerJavaObject(uri, contract, instance);
try {
- componentManager.registerJavaObject(uri, MockComponent.class,
instance);
+ componentManager.registerJavaObject(uri,contract, instance);
fail();
} catch (DuplicateNameException e) {
// ok
}
- }
-
- public void testAutowireToObject() throws Exception {
-// MockComponent instance = new MockComponent();
-// componentManager.registerJavaObject("foo", MockComponent.class,
instance);
-// assertNotNull(componentManager.resolveAutowire(MockComponent.class));
-//
assertNull(componentManager.resolveExternalAutowire(MockComponent.class));
}
protected void setUp() throws Exception {
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
Sun Feb 18 11:19:23 2007
@@ -28,6 +28,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -38,6 +39,7 @@
import org.apache.tuscany.spi.model.Property;
import org.apache.tuscany.spi.model.PropertyValue;
import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.ServiceDefinition;
import junit.framework.TestCase;
@@ -46,6 +48,7 @@
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.ComponentManager;
import org.apache.tuscany.core.component.ComponentManagerImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import
org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.mock.component.BasicInterface;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
@@ -65,7 +68,6 @@
private DeploymentContext deploymentContext;
private ComponentDefinition<SystemCompositeImplementation>
componentDefinition;
private SystemCompositeImplementation implementation;
- private ComponentManager manager;
private URI componentId;
@SuppressWarnings("unchecked")
@@ -147,14 +149,17 @@
}
}
+ @SuppressWarnings({"unchecked"})
protected void setUp() throws Exception {
super.setUp();
componentId = URI.create("sca://localhost/parent");
XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
DefaultAutowireResolver resolver = new DefaultAutowireResolver();
- manager = new ComponentManagerImpl(null, resolver);
+ ComponentManager manager = new ComponentManagerImpl(null, resolver);
Connector connector = new ConnectorImpl(manager);
- manager.registerJavaObject(URI.create("ComponentManager"),
ComponentManager.class, manager);
+ JavaInterfaceProcessorRegistry registry = new
JavaInterfaceProcessorRegistryImpl();
+ ServiceContract contract = registry.introspect(ComponentManager.class);
+ manager.registerJavaObject(URI.create("ComponentManager"), contract,
manager);
NullMonitorFactory monitorFactory = new NullMonitorFactory();
Bootstrapper bootstrapper =
new DefaultBootstrapper(monitorFactory, xmlFactory, manager,
resolver, connector);
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java
Sun Feb 18 11:19:23 2007
@@ -23,6 +23,7 @@
import java.util.List;
import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
@@ -32,27 +33,39 @@
public class SystemSingletonAtomicComponentTestCase extends TestCase {
public void testGetInstance() throws TargetException {
+ ServiceContract<Foo> contract = new ServiceContract<Foo>(Foo.class) {
+
+ };
FooImpl foo = new FooImpl();
SystemSingletonAtomicComponent<Foo, FooImpl> component =
- new SystemSingletonAtomicComponent<Foo,
FooImpl>(URI.create("foo"), Foo.class, foo);
+ new SystemSingletonAtomicComponent<Foo,
FooImpl>(URI.create("foo"), contract, foo);
assertEquals(foo, component.getTargetInstance());
}
public void testGetInstanceMultipleServices() throws TargetException {
FooImpl foo = new FooImpl();
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Foo.class);
- services.add(Bar.class);
+ List<ServiceContract<?>> services = new
ArrayList<ServiceContract<?>>();
+ services.add(new ServiceContract<Foo>(Foo.class) {
+ });
+ services.add(new ServiceContract<Bar>(Bar.class) {
+ });
SystemSingletonAtomicComponent<Foo, FooImpl> component =
new SystemSingletonAtomicComponent<Foo,
FooImpl>(URI.create("foo"), services, foo);
assertEquals(foo, component.getTargetInstance());
}
public void testOptimizable() {
+ ServiceContract<Foo> contract = new ServiceContract<Foo>(Foo.class) {
+ };
FooImpl foo = new FooImpl();
SystemSingletonAtomicComponent<Foo, FooImpl> component =
- new SystemSingletonAtomicComponent<Foo,
FooImpl>(URI.create("foo"), Foo.class, foo);
+ new SystemSingletonAtomicComponent<Foo,
FooImpl>(URI.create("foo"), contract, foo);
assertTrue(component.isOptimizable());
+ }
+
+
+ protected void setUp() throws Exception {
+ super.setUp();
}
private interface Foo {
Modified:
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java?view=diff&rev=508947&r1=508946&r2=508947
==============================================================================
---
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
(original)
+++
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
Sun Feb 18 11:19:23 2007
@@ -21,10 +21,7 @@
import java.net.URI;
import java.util.Collection;
-import org.apache.tuscany.core.runtime.AbstractRuntime;
-import org.apache.tuscany.host.runtime.InitializationException;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeImplementation;
@@ -32,6 +29,9 @@
import org.apache.tuscany.spi.services.artifact.ArtifactRepository;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.core.runtime.AbstractRuntime;
+import org.apache.tuscany.host.runtime.InitializationException;
+
/**
* @version $Rev$ $Date$
*/
@@ -42,22 +42,19 @@
super(MavenRuntimeInfo.class);
}
- protected void registerSystemComponents() throws InitializationException {
- super.registerSystemComponents();
- try {
-
getComponentManager().registerJavaObject(MavenEmbeddedArtifactRepository.COMPONENT_NAME,
- ArtifactRepository.class,
- artifactRepository);
- } catch (RegistrationException e) {
- throw new InitializationException(e);
- }
+ protected void registerBaselineSystemComponents() throws
InitializationException {
+ super.registerBaselineSystemComponents();
+ registerSystemComponent(MavenEmbeddedArtifactRepository.COMPONENT_NAME,
+ ArtifactRepository.class,
+ artifactRepository);
}
public void setArtifactRepository(ArtifactRepository artifactRepository) {
this.artifactRepository = artifactRepository;
}
- public Collection<Component>
deployTestScdl(ComponentDefinition<CompositeImplementation> definition) throws
Exception {
+ public Collection<Component>
deployTestScdl(ComponentDefinition<CompositeImplementation> definition)
+ throws Exception {
Deployer deployer = getDeployer();
return deployer.deploy(null, definition);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
