Author: jmarino
Date: Wed Feb 7 23:50:47 2007
New Revision: 504814
URL: http://svn.apache.org/viewvc?view=rev&rev=504814
Log:
move registration of Java objects from CompositeComponent to ComponentManager;
remove unused code in connector
Added:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
(contents, props changed)
- copied, changed from r504606,
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
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/AbstractCompositeBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.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/builder/ConnectorImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.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/AutowireResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
Wed Feb 7 23:50:47 2007
@@ -104,11 +104,6 @@
public void connect(InboundWire sourceWire, OutboundWire targetWire,
boolean optimizable)
throws WiringException {
Map<Operation<?>, OutboundInvocationChain> targetChains =
targetWire.getInvocationChains();
-// if (SCAObject.SYSTEM_SCHEME.equals(targetWire.getUri().getScheme()))
{
-// sourceWire.setTargetWire(targetWire);
-// // system services do not need to have their chains processed,
return
-// return;
-// }
for (InboundInvocationChain inboundChain :
sourceWire.getInvocationChains().values()) {
// match invocation chains
OutboundInvocationChain outboundChain =
targetChains.get(inboundChain.getOperation());
@@ -330,30 +325,6 @@
}
// invocations from inbound to outbound chains are always synchronous
as they occur in services and references
sourceChain.addInterceptor(new SynchronousBridgingInterceptor(head));
- }
-
- /**
- * Connects an outbound wire to its target in a composite.
- *
- * @param sourceWire the source wire to connect
- * @throws WiringException
- */
- protected void connect(SCAObject source, OutboundWire sourceWire,
SCAObject target) throws WiringException {
- if (target instanceof Component) {
- connect(source, sourceWire, (Component) target);
- } else if (target instanceof Reference) {
- connect(source, sourceWire, (Reference) target);
- } else if (target instanceof Service) {
- connect(source, sourceWire, (Service) target);
- } else if (target == null) {
- URI sourceName = sourceWire.getUri();
- URI targetName = sourceWire.getTargetUri();
- throw new TargetServiceNotFoundException("Target service not
found", sourceName, targetName);
- } else {
- URI sourceName = sourceWire.getUri();
- URI targetName = sourceWire.getTargetUri();
- throw new InvalidTargetTypeException("Invalid target type",
sourceName, targetName);
- }
}
protected void connect(SCAObject source, OutboundWire sourceWire,
Reference target) throws WiringException {
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=504814&r1=504813&r2=504814
==============================================================================
---
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
Wed Feb 7 23:50:47 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.component;
import java.net.URI;
+import java.util.List;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ComponentRegistrationException;
@@ -48,6 +49,30 @@
* @throws ComponentRegistrationException
*/
void unregister(Component component) throws ComponentRegistrationException;
+
+ /**
+ * Register a simple Java Object as a system component. This is primarily
intended for use by bootstrap code to
+ * create the initial configuration components.
+ *
+ * @param uri the uri of the resulting component
+ * @param service the service interface the component should expose
+ * @param instance the Object that will become the component's
implementation
+ * @throws ComponentRegistrationException
+ */
+ <S, I extends S> void registerJavaObject(URI uri, Class<S> service, I
instance)
+ throws ComponentRegistrationException;
+
+ /**
+ * Register a simple Java Object as a system component. This is primarily
intended for use by bootstrap code to
+ * create the initial configuration components.
+ *
+ * @param uri the name of the resulting component
+ * @param services the service interfaces the component should expose
+ * @param instance the Object that will become the component's
implementation
+ * @throws ComponentRegistrationException
+ */
+ <S, I extends S> void registerJavaObject(URI uri, List<Class<?>> services,
I instance)
+ throws ComponentRegistrationException;
/**
* Returns the component with the given URI
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=504814&r1=504813&r2=504814
==============================================================================
---
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
Wed Feb 7 23:50:47 2007
@@ -35,6 +35,7 @@
import org.apache.tuscany.core.component.event.ComponentStart;
import org.apache.tuscany.core.component.event.ComponentStop;
+import
org.apache.tuscany.core.implementation.composite.SystemSingletonAtomicComponent;
/**
* Default implementation of the component manager
@@ -73,9 +74,6 @@
synchronized (children) {
children.add(uri);
}
-// if (!parentToChildren.containsKey(uri)) {
-// parentToChildren.put(uri, new ArrayList<URI>());
-// }
if (managementService != null && component instanceof AtomicComponent)
{
// FIXME shouldn't it take the canonical name and also not
distinguish atomic components?
managementService.registerComponent(component.getUri().toString(),
component);
@@ -83,6 +81,16 @@
if (component instanceof CompositeComponent) {
component.addListener(this);
}
+ }
+
+ public <S, I extends S> void registerJavaObject(URI uri, Class<S> service,
I instance)
+ throws ComponentRegistrationException {
+ register(new SystemSingletonAtomicComponent<S, I>(uri, null, service,
instance));
+ }
+
+ public <S, I extends S> void registerJavaObject(URI uri, List<Class<?>>
services, I instance)
+ throws ComponentRegistrationException {
+ register(new SystemSingletonAtomicComponent<S, I>(uri, null, services,
instance));
}
public void unregister(Component component) throws
ComponentRegistrationException {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
Wed Feb 7 23:50:47 2007
@@ -28,12 +28,9 @@
DeploymentContext deploymentContext)
throws BuilderException {
for (ComponentDefinition<? extends Implementation<?>> definition :
componentType.getComponents().values()) {
-// try {
builderRegistry.build(component, definition, deploymentContext);
+ // JFM TODO
//component.register(child);
-// } catch (ComponentRegistrationException e) {
-// throw new BuilderInstantiationException("Error registering
component", e);
-// }
}
for (ServiceDefinition definition :
componentType.getServices().values()) {
try {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
Wed Feb 7 23:50:47 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core.implementation.composite;
import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -28,9 +26,7 @@
import org.w3c.dom.Document;
import org.apache.tuscany.spi.builder.Connector;
-import org.apache.tuscany.spi.component.ComponentRegistrationException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.MalformedNameException;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.extension.CompositeComponentExtension;
@@ -68,40 +64,11 @@
super(name, parent, connector, propertyValues);
}
- public <S, I extends S> void registerJavaObject(String name, Class<S>
service, I instance)
- throws ComponentRegistrationException {
- URI uri;
- try {
- uri = new URI(name);
- } catch (URISyntaxException e) {
- throw new MalformedNameException(e);
- }
- register(new SystemSingletonAtomicComponent<S, I>(uri, this, service,
instance));
- }
-
- public <S, I extends S> void registerJavaObject(String name,
List<Class<?>> services, I instance)
- throws ComponentRegistrationException {
- URI uri;
- try {
- uri = new URI(name);
- } catch (URISyntaxException e) {
- throw new MalformedNameException(e);
- }
- register(new SystemSingletonAtomicComponent<S, I>(uri, this, services,
instance));
- }
-
public void start() {
synchronized (lock) {
if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
throw new IllegalStateException("Composite not in
UNINITIALIZED state");
}
-
-// for (SCAObject child : systemChildren.values()) {
-// child.start();
-// }
-// for (SCAObject child : children.values()) {
-// child.start();
-// }
initializeLatch.countDown();
initialized = true;
lifecycleState = INITIALIZED;
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=504814&r1=504813&r2=504814
==============================================================================
---
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
Wed Feb 7 23:50:47 2007
@@ -24,6 +24,18 @@
import org.osoa.sca.ComponentContext;
+import org.apache.tuscany.spi.bootstrap.ComponentNames;
+import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.ComponentException;
+import org.apache.tuscany.spi.component.ComponentRegistrationException;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.services.management.TuscanyManagementService;
+
import org.apache.tuscany.core.bootstrap.Bootstrapper;
import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
import org.apache.tuscany.core.component.ComponentManager;
@@ -35,17 +47,6 @@
import org.apache.tuscany.host.management.ManagementService;
import org.apache.tuscany.host.runtime.InitializationException;
import org.apache.tuscany.host.runtime.TuscanyRuntime;
-import org.apache.tuscany.spi.bootstrap.ComponentNames;
-import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
-import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.component.ComponentException;
-import org.apache.tuscany.spi.component.ComponentRegistrationException;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.deployer.Deployer;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.services.management.TuscanyManagementService;
/**
* @version $Rev$ $Date$
@@ -157,10 +158,10 @@
// deploy the system scdl
try {
tuscanySystem = deploySystemScdl(bootstrapper.createDeployer(),
- systemComponent,
- ComponentNames.TUSCANY_SYSTEM,
- getSystemScdl(),
- getClass().getClassLoader());
+ systemComponent,
+ ComponentNames.TUSCANY_SYSTEM,
+ getSystemScdl(),
+ getClass().getClassLoader());
} catch (LoaderException e) {
throw new InitializationException(e);
} catch (BuilderException e) {
@@ -200,41 +201,15 @@
protected void registerSystemComponents(CompositeComponent
systemComponent) throws InitializationException {
try {
- systemComponent.registerJavaObject(RuntimeInfo.COMPONENT_NAME,
RuntimeInfo.class, runtimeInfo);
- systemComponent.registerJavaObject("MonitorFactory",
MonitorFactory.class, getMonitorFactory());
- systemComponent.registerJavaObject("ComponentManager",
ComponentManager.class, componentManager);
+ componentManager.registerJavaObject(RuntimeInfo.COMPONENT_URI,
RuntimeInfo.class, runtimeInfo);
+ URI uri = URI.create("MonitorFactory");
+ componentManager.registerJavaObject(uri, MonitorFactory.class,
getMonitorFactory());
+ //JFM TODO need autowire to deal with returning a component
manager
+ //systemComponent.registerJavaObject("ComponentManager",
ComponentManager.class, componentManager);
} catch (ComponentRegistrationException e) {
throw new InitializationException(e);
}
}
-
-/*
- protected Deployer locateDeployer() throws InitializationException {
- SCAObject deployerComponent =
tuscanySystem.getChild(ComponentNames.TUSCANY_DEPLOYER);
- if (!(deployerComponent instanceof AtomicComponent)) {
- throw new InitializationException("Deployer must be an atomic
component");
- }
- try {
- return (Deployer) ((AtomicComponent)
deployerComponent).getTargetInstance();
- } catch (TargetResolutionException e) {
- throw new InitializationException(e);
- }
- }
-*/
-
-/*
- protected WireService locateWireService() throws InitializationException {
- SCAObject wireServiceComponent =
tuscanySystem.getChild(ComponentNames.TUSCANY_WIRE_SERVICE);
- if (!(wireServiceComponent instanceof AtomicComponent)) {
- throw new InitializationException("WireService must be an atomic
component");
- }
- try {
- return (WireService) ((AtomicComponent)
wireServiceComponent).getTargetInstance();
- } catch (TargetResolutionException e) {
- throw new InitializationException(e);
- }
- }
-*/
protected CompositeComponent deploySystemScdl(Deployer deployer,
CompositeComponent parent,
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
Wed Feb 7 23:50:47 2007
@@ -52,8 +52,6 @@
public void testConnectTargetNotFound() throws Exception {
CompositeComponent parent =
EasyMock.createMock(CompositeComponent.class);
- parent.getChild(EasyMock.isA(String.class));
- EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(parent);
try {
AtomicComponent source = createAtomicSource(parent);
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
Wed Feb 7 23:50:47 2007
@@ -123,7 +123,6 @@
inboundWire.setContainer(atomicTarget);
parent = EasyMock.createNiceMock(CompositeComponent.class);
-
EasyMock.expect(parent.getChild(TARGET.toString())).andReturn(atomicTarget);
EasyMock.replay(parent);
componentManager.register(atomicTarget);
}
Copied:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
(from r504606,
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/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=504814&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java&r1=504606&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
Wed Feb 7 23:50:47 2007
@@ -16,39 +16,38 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.composite;
+package org.apache.tuscany.core.component;
import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.DuplicateNameException;
-import org.apache.tuscany.spi.component.SCAObject;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.event.ComponentStart;
-import org.apache.tuscany.core.component.event.ComponentStop;
/**
* @version $Rev$ $Date$
*/
public class JavaObjectRegistrationTestCase extends TestCase {
- private CompositeComponent composite;
+ private ComponentManager componentManager;
public void testRegistration() throws Exception {
MockComponent instance = new MockComponent();
- composite.registerJavaObject("foo", MockComponent.class, instance);
- SCAObject child = composite.getChild("foo");
- assertTrue(child instanceof AtomicComponent);
- MockComponent resolvedInstance = (MockComponent) ((AtomicComponent)
child).getTargetInstance();
+ URI uri = URI.create("foo");
+ componentManager.registerJavaObject(uri, MockComponent.class,
instance);
+ Component component = componentManager.getComponent(URI.create("foo"));
+ assertTrue(component instanceof AtomicComponent);
+ MockComponent resolvedInstance = (MockComponent) ((AtomicComponent)
component).getTargetInstance();
assertSame(instance, resolvedInstance);
}
public void testDuplicateRegistration() throws Exception {
MockComponent instance = new MockComponent();
- composite.registerJavaObject("foo", MockComponent.class, instance);
+ URI uri = URI.create("foo");
+ componentManager.registerJavaObject(uri, MockComponent.class,
instance);
try {
- composite.registerJavaObject("foo", MockComponent.class, instance);
+ componentManager.registerJavaObject(uri, MockComponent.class,
instance);
fail();
} catch (DuplicateNameException e) {
// ok
@@ -56,22 +55,18 @@
}
public void testAutowireToObject() throws Exception {
- MockComponent instance = new MockComponent();
- composite.registerJavaObject("foo", MockComponent.class, instance);
- assertNotNull(composite.resolveAutowire(MockComponent.class));
- assertNull(composite.resolveExternalAutowire(MockComponent.class));
+// 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 {
super.setUp();
- composite = new CompositeComponentImpl(URI.create("component"), null,
null, null);
- composite.start();
- composite.publish(new ComponentStart(this, null));
+ componentManager = new ComponentManagerImpl();
}
protected void tearDown() throws Exception {
- composite.publish(new ComponentStop(this, null));
- composite.stop();
super.tearDown();
}
Propchange:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=504814&r1=504813&r2=504814
==============================================================================
---
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
Wed Feb 7 23:50:47 2007
@@ -119,8 +119,8 @@
public void testBoot1Deployment() throws Exception {
URL scdl = BootstrapDeployerTestCase.class.getResource("boot1.scdl");
implementation.setScdlLocation(scdl);
- CompositeComponent parent = createNiceMock(CompositeComponent.class);
- URI uri = URI.create("scasystem://parent");
+ CompositeComponent parent =
EasyMock.createMock(CompositeComponent.class);
+ URI uri = URI.create("sca://parent");
EasyMock.expect(parent.getUri()).andReturn(uri).atLeastOnce();
parent.register(isA(SCAObject.class));
replay(parent);
@@ -146,8 +146,6 @@
assertNotNull(component);
verify(parent);
component.start();
- SCAObject newDeployer =
component.getChild(ComponentNames.TUSCANY_DEPLOYER);
- assertNotNull(newDeployer);
}
protected void setUp() throws Exception {
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java
Wed Feb 7 23:50:47 2007
@@ -57,15 +57,6 @@
verify(parent);
}
- public void testNamespaceIsolationAutowire() throws Exception {
- Foo foo = new Foo() {
- };
- CompositeComponent parent = new
CompositeComponentImpl(URI.create("parent"), null, null, null);
- parent.registerJavaObject("foo", Foo.class, foo);
- CompositeComponent component = new
CompositeComponentImpl(URI.create("test"), parent, null, null);
- assertNotNull(component.resolveAutowire(Foo.class));
- }
-
protected void setUp() throws Exception {
super.setUp();
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
Wed Feb 7 23:50:47 2007
@@ -35,21 +35,7 @@
*/
public class CompositeComponentImplTestCase extends TestCase {
- public void testRegisterSystemService() throws Exception {
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Foo.class);
- CompositeComponent parent = new
CompositeComponentImpl(URI.create("foo"), null, null, null);
- AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
-
EasyMock.expect(component.getUri()).andReturn(URI.create("bar")).atLeastOnce();
- List<InboundWire> wires = TestUtils.createInboundWires(services);
-
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
- EasyMock.replay(component);
- parent.register(component);
- assertNotNull(parent.getChild("bar"));
- EasyMock.verify(component);
- }
-
- public void testRegister() throws Exception {
+ public void testRegisterService() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
CompositeComponent parent = new
CompositeComponentImpl(URI.create("foo"), null, null, null);
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
Wed Feb 7 23:50:47 2007
@@ -120,8 +120,6 @@
componentManager.register(fooComponent);
CompositeComponent parent = createMock(CompositeComponent.class);
- parent.getChild(isA(String.class));
- expectLastCall().andReturn(fooComponent).anyTimes();
replay(parent);
ComponentDefinition<JavaImplementation> sourceDefinition =
createPlainSource(URI.create("fooPlainClient"));
@@ -156,8 +154,6 @@
componentManager.register(fooComponent);
CompositeComponent parent = createMock(CompositeComponent.class);
- parent.getChild(isA(String.class));
- expectLastCall().andReturn(fooComponent).anyTimes();
replay(parent);
ComponentDefinition<JavaImplementation> sourceDefinition1 =
createSource(URI.create("fooCleint1"));
Modified:
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java
(original)
+++
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java
Wed Feb 7 23:50:47 2007
@@ -30,8 +30,9 @@
public interface RuntimeInfo {
/**
* The default name that the runtime should assign to the component
providing this service.
+ * TODO implement Tuscany component domains
*/
- String COMPONENT_NAME = "RuntimeInfo";
+ URI COMPONENT_URI = URI.create("sca://RuntimeInfo");
/**
* Returns the SCA domain associated with this runtime.
Modified:
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java
(original)
+++
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java
Wed Feb 7 23:50:47 2007
@@ -68,7 +68,7 @@
/**
* Sets the info this runtime should make available to service components.
The instance supplied here should be
- * registered in the system composite with the name [EMAIL PROTECTED]
RuntimeInfo#COMPONENT_NAME "RuntimeInfo"}.
+ * registered in the system composite with the name [EMAIL PROTECTED]
RuntimeInfo#COMPONENT_URI "RuntimeInfo"}.
*
* @param runtimeInfo the information this runtime should make available
to service components
*/
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
Wed Feb 7 23:50:47 2007
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.spi.component;
-import java.util.List;
-
import org.w3c.dom.Document;
import org.apache.tuscany.spi.event.RuntimeEventListener;
@@ -57,30 +55,6 @@
* @throws ComponentRegistrationException
*/
void register(SCAObject object) throws ComponentRegistrationException;
-
- /**
- * Register a simple Java Object as a system component. This is primarily
intended for use by bootstrap code to
- * create the initial configuration components.
- *
- * @param name the name of the resulting component
- * @param service the service interface the component should expose
- * @param instance the Object that will become the component's
implementation
- * @throws ComponentRegistrationException
- */
- <S, I extends S> void registerJavaObject(String name, Class<S> service, I
instance)
- throws ComponentRegistrationException;
-
- /**
- * Register a simple Java Object as a system component. This is primarily
intended for use by bootstrap code to
- * create the initial configuration components.
- *
- * @param name the name of the resulting component
- * @param services the service interfaces the component should expose
- * @param instance the Object that will become the component's
implementation
- * @throws ComponentRegistrationException
- */
- <S, I extends S> void registerJavaObject(String name, List<Class<?>>
services, I instance)
- throws ComponentRegistrationException;
/**
* Returns the child associated with a given name
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=504814&r1=504813&r2=504814
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
Wed Feb 7 23:50:47 2007
@@ -101,16 +101,6 @@
publish(event);
}
- public <S, I extends S> void registerJavaObject(String name, Class<S>
service, I instance)
- throws ComponentRegistrationException {
- throw new UnsupportedOperationException();
- }
-
- public <S, I extends S> void registerJavaObject(String name,
List<Class<?>> services, I instance)
- throws ComponentRegistrationException {
- throw new UnsupportedOperationException();
- }
-
public Document getPropertyValue(String name) {
return propertyValues.get(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
