You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/07 17:19:42 UTC
svn commit: r504606 [1/5] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/bootstrap/
core/src/main/java/org/apache/tuscany/core/builder/ core/src/main/java/or...
Author: jmarino
Date: Wed Feb 7 08:19:34 2007
New Revision: 504606
URL: http://svn.apache.org/viewvc?view=rev&rev=504606
Log:
transition checkin to move to register components and connect using ComponentManager; related work to continue moving to using URIs by removing references to getName() and isSystem()
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/TargetComponentNotFoundException.java (with props)
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java (contents, props changed)
- copied, changed from r503287, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
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/component/WorkContextImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.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/implementation/composite/CompositeBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ReferenceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.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/implementation/java/JavaComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvokerInvocationExceptionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvokerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvokerThrowableTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.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/ConnectorPostProcessTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/InboundtoOutboundConnectTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/OutboundToInboundConnectTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.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/builder/SynchronousForwardCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/ComponentManagerImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.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/AutowireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.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/composite/CompositeComponentResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ReferenceImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ServiceImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/ResourceObjectFactoryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.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/component/SCAObject.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/UriHelper.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionAutowireTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceBindingExtensionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceBindingExtensionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/util/URIHelperTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandlerTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvoker.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalCallbackTargetInvoker.java Wed Feb 7 08:19:34 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.binding.local;
import java.util.Map;
+import java.net.URI;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -54,7 +55,7 @@
}
private Message invoke(Operation operation, Message msg) throws Throwable {
- Object targetAddress = msg.popFromAddress();
+ URI targetAddress = msg.popFromAddress();
if (targetAddress == null) {
throw new AssertionError("Popped a null from address from message");
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java Wed Feb 7 08:19:34 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.binding.local;
+import java.net.URI;
+
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.util.UriHelper;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
@@ -34,7 +36,7 @@
*/
public class LocalTargetInvoker extends AbstractLocalTargetInvoker {
private OutboundInvocationChain chain;
- private Object fromAddress;
+ private URI fromAddress;
private boolean contractHasCallback;
public LocalTargetInvoker(Operation operation, OutboundWire outboundWire) {
@@ -42,7 +44,7 @@
chain = outboundWire.getInvocationChains().get(operation);
assert chain != null;
if (outboundWire.getUri() != null) {
- fromAddress = UriHelper.getBaseName(outboundWire.getUri());
+ fromAddress = URI.create(UriHelper.getBaseName(outboundWire.getUri()));
}
contractHasCallback = outboundWire.getServiceContract().getCallbackClass() != null;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Wed Feb 7 08:19:34 2007
@@ -130,7 +130,7 @@
public RuntimeComponent createRuntime() {
DefaultRuntime runtime = new DefaultRuntime();
CompositeComponent systemComponent =
- new CompositeComponentImpl(ComponentNames.TUSCANY_SYSTEM_ROOT, runtime, null, true);
+ new CompositeComponentImpl(ComponentNames.TUSCANY_SYSTEM_ROOT, runtime, null);
runtime.setSystemComponent(systemComponent);
CompositeComponent rootComponent =
new CompositeComponentImpl(ComponentNames.TUSCANY_APPLICATION_ROOT, runtime, null, null);
@@ -232,7 +232,7 @@
* @return a new Connector
*/
public Connector createConnector() {
- return new ConnectorImpl();
+ return new ConnectorImpl(componentManager);
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Wed Feb 7 08:19:34 2007
@@ -25,7 +25,6 @@
import org.osoa.sca.annotations.EagerInit;
-import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BindingBuilder;
import org.apache.tuscany.spi.builder.BuilderConfigException;
@@ -155,11 +154,11 @@
componentManager.register(component);
return component;
} catch (BuilderException e) {
- e.addContextName(componentDefinition.getName().toString());
+ e.addContextName(componentDefinition.getUri().toString());
throw e;
} catch (ComponentRegistrationException e) {
BuilderInstantiationException bie = new BuilderInstantiationException("Error registering component", e);
- bie.addContextName(componentDefinition.getName().toString());
+ bie.addContextName(componentDefinition.getUri().toString());
throw bie;
}
}
@@ -178,7 +177,6 @@
serviceDefinition.addBinding(new LocalBindingDefinition());
}
}
- boolean system = parent.isSystem();
URI targetUri = serviceDefinition.getTarget();
URI serviceUri;
try {
@@ -186,7 +184,7 @@
} catch (URISyntaxException e) {
throw new BuilderConfigException(e);
}
- Service service = new ServiceImpl(serviceUri, parent, serviceContract, targetUri, system);
+ Service service = new ServiceImpl(serviceUri, parent, serviceContract, targetUri);
for (BindingDefinition definition : serviceDefinition.getBindings()) {
Class<?> bindingClass = definition.getClass();
// noinspection SuspiciousMethodCalls
@@ -201,9 +199,9 @@
if (uri == null) {
throw new MissingWireTargetException("Service uri not specified");
}
- String path = uri.getPath();
+ //String path = uri.getPath();
ServiceContract<?> contract = serviceDefinition.getServiceContract();
- wireService.createWires(binding, contract, path);
+ wireService.createWires(binding, contract, uri.toString());
}
service.addServiceBinding(binding);
}
@@ -241,11 +239,7 @@
if (wireService != null) {
URI targetUri = bindingDefinition.getTargetUri();
// it is possible for a binding to not have a URI
- QualifiedName targetName = null;
- if (targetUri != null) {
- targetName = new QualifiedName(targetUri.getPath());
- }
- wireService.createWires(binding, contract, targetName);
+ wireService.createWires(binding, contract, targetUri);
}
reference.addReferenceBinding(binding);
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 08:19:34 2007
@@ -24,7 +24,6 @@
import org.osoa.sca.annotations.Constructor;
-import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.builder.MissingWireTargetException;
@@ -44,6 +43,7 @@
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.util.UriHelper;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
@@ -68,11 +68,12 @@
public class ConnectorImpl implements Connector {
private WireService wireService;
private WirePostProcessorRegistry postProcessorRegistry;
- //private ComponentManager componentManager;
+ private ComponentManager componentManager;
private WorkContext workContext;
private WorkScheduler scheduler;
- public ConnectorImpl() {
+ public ConnectorImpl(ComponentManager componentManager) {
+ this.componentManager = componentManager;
}
@Constructor
@@ -83,7 +84,7 @@
@Autowire WorkContext workContext) {
this.wireService = wireService;
this.postProcessorRegistry = processorRegistry;
- //this.componentManager = componentManager;
+ this.componentManager = componentManager;
this.scheduler = scheduler;
this.workContext = workContext;
}
@@ -103,11 +104,11 @@
public void connect(InboundWire sourceWire, OutboundWire targetWire, boolean optimizable)
throws WiringException {
Map<Operation<?>, OutboundInvocationChain> targetChains = targetWire.getInvocationChains();
- if (sourceWire.getContainer() != null && sourceWire.getContainer().isSystem()) {
- sourceWire.setTargetWire(targetWire);
- // system services do not need to have their chains processed, return
- return;
- }
+// 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());
@@ -133,19 +134,17 @@
* @param targetWire the target wire to connect to
* @param optimizable true if the wire connection can be optimized
* @throws WiringException
+ * @deprecated
*/
public void connect(OutboundWire sourceWire, InboundWire targetWire, boolean optimizable)
throws WiringException {
+ assert sourceWire.getTargetUri() != null;
SCAObject source = sourceWire.getContainer();
assert source != null;
SCAObject target = targetWire.getContainer();
assert target != null;
Map<Operation<?>, InboundInvocationChain> targetChains = targetWire.getInvocationChains();
- if (sourceWire.getContainer() != null && sourceWire.getContainer().isSystem()) {
- sourceWire.setTargetWire(targetWire);
- // system services do not need to have their chains processed, return
- return;
- }
+ String portName = sourceWire.getTargetUri().getFragment();
// match outbound to inbound chains
for (OutboundInvocationChain outboundChain : sourceWire.getInvocationChains().values()) {
Operation<?> operation = outboundChain.getOperation();
@@ -158,11 +157,6 @@
TargetInvoker invoker;
if (target instanceof Component) {
Component component = (Component) target;
- QualifiedName wireTargetName = sourceWire.getTargetName();
- String portName = null;
- if (wireTargetName != null) {
- portName = wireTargetName.getPortName();
- }
try {
invoker = component.createTargetInvoker(portName, inboundOperation, targetWire);
} catch (TargetInvokerCreationException e) {
@@ -218,8 +212,9 @@
}
// create source callback chains and connect them if target callback chains exist
+ //String sourceName = UriHelper.getBaseName(source.getUri());
Map<Operation<?>, OutboundInvocationChain> sourceCallbackChains =
- targetWire.getSourceCallbackInvocationChains(source.getName());
+ targetWire.getSourceCallbackInvocationChains(source.getUri());
for (InboundInvocationChain inboundChain : sourceWire.getTargetCallbackInvocationChains().values()) {
Operation<?> operation = inboundChain.getOperation();
if (sourceCallbackChains != null && sourceCallbackChains.get(operation) != null) {
@@ -236,7 +231,7 @@
assert opName != null;
Operation targetOp = targetContract.getCallbackOperations().get(opName);
OutboundInvocationChain outboundChain = wireService.createOutboundChain(targetOp);
- targetWire.addSourceCallbackInvocationChain(source.getName(), targetOp, outboundChain);
+ targetWire.addSourceCallbackInvocationChain(source.getUri(), targetOp, outboundChain);
if (source instanceof Component) {
Component component = (Component) source;
TargetInvoker invoker;
@@ -344,7 +339,6 @@
* @throws WiringException
*/
protected void connect(SCAObject source, OutboundWire sourceWire, SCAObject target) throws WiringException {
- assert sourceWire.getTargetName() != null;
if (target instanceof Component) {
connect(source, sourceWire, (Component) target);
} else if (target instanceof Reference) {
@@ -363,7 +357,6 @@
}
protected void connect(SCAObject source, OutboundWire sourceWire, Reference target) throws WiringException {
- assert sourceWire.getTargetName() != null;
InboundWire targetWire = null;
for (ReferenceBinding binding : target.getReferenceBindings()) {
InboundWire candidate = binding.getInboundWire();
@@ -387,7 +380,6 @@
}
protected void connect(SCAObject source, OutboundWire sourceWire, Service target) throws WiringException {
- assert sourceWire.getTargetName() != null;
InboundWire targetWire = null;
for (ServiceBinding binding : target.getServiceBindings()) {
InboundWire candidate = binding.getInboundWire();
@@ -406,21 +398,13 @@
protected void connect(SCAObject source, OutboundWire sourceWire, Component target)
throws WiringException {
- assert sourceWire.getTargetName() != null;
- QualifiedName targetName = sourceWire.getTargetName();
+ URI targetUri = sourceWire.getTargetUri();
+ assert targetUri != null;
InboundWire targetWire;
- // FIXME JFM should we move getInboundSystemWire up to Component?
- if (target instanceof CompositeComponent && source.isSystem()) {
- targetWire = ((CompositeComponent) target).getInboundSystemWire(targetName.getPortName());
- } else {
- targetWire = target.getInboundWire(targetName.getPortName());
- }
+ targetWire = target.getTargetWire(sourceWire.getTargetUri().getFragment());
if (targetWire == null) {
- URI sourceName = sourceWire.getUri();
- throw new TargetServiceNotFoundException("Target service does not exist or is not configured with a "
- + "local binding",
- sourceName,
- sourceWire.getTargetUri());
+ URI sourceUri = sourceWire.getUri();
+ throw new TargetServiceNotFoundException("Target not found ", sourceUri, targetUri);
}
checkIfWireable(sourceWire, targetWire);
boolean optimizable = isOptimizable(source.getScope(), target.getScope());
@@ -441,11 +425,7 @@
outboundWire.setTargetWire(targetWire);
return;
}
- if (outboundWire.getContainer().isSystem()) {
- targetWire = parent.resolveSystemAutowire(interfaze);
- } else {
- targetWire = parent.resolveAutowire(interfaze);
- }
+ targetWire = parent.resolveAutowire(interfaze);
} catch (TargetResolutionException e) {
URI sourceName = outboundWire.getUri();
URI targetName = outboundWire.getTargetUri();
@@ -526,17 +506,21 @@
for (ServiceBinding binding : service.getServiceBindings()) {
InboundWire inboundWire = binding.getInboundWire();
OutboundWire outboundWire = binding.getOutboundWire();
- // For a composite reference only, since its outbound wire comes from its parent composite,
- // the corresponding target would not lie in its parent but rather in its parent's parent
- SCAObject target;
- if (service.isSystem()) {
- target = parent.getSystemChild(outboundWire.getTargetName().getPartName());
- } else {
- target = parent.getChild(outboundWire.getTargetName().getPartName());
+ URI sourceUri = outboundWire.getUri();
+ URI targetUri = outboundWire.getTargetUri();
+ String fragment = targetUri.getFragment();
+ URI defragUri = UriHelper.getDefragmentedName(targetUri);
+ Component targetComponent = componentManager.getComponent(defragUri);
+ if (targetComponent == null) {
+ throw new TargetComponentNotFoundException("Target not found", sourceUri, targetUri);
+ }
+ InboundWire targetWire = targetComponent.getTargetWire(fragment);
+ if (targetWire == null) {
+ throw new TargetServiceNotFoundException("Target not found", sourceUri, targetUri);
}
- // connect the outbound service wire to the target
- connect(binding, outboundWire, target);
- // NB: this connect must be done after the outbound service chain is connected to its target above
+ checkIfWireable(outboundWire, targetWire);
+ boolean optimizable = isOptimizable(service.getScope(), targetComponent.getScope());
+ connect(outboundWire, targetWire, optimizable);
connect(inboundWire, outboundWire, true);
}
}
@@ -576,32 +560,29 @@
// connect outbound wires for component references to their targets
for (List<OutboundWire> referenceWires : component.getOutboundWires().values()) {
for (OutboundWire outboundWire : referenceWires) {
- try {
- if (component.isSystem()) {
- if (outboundWire.isAutowire()) {
- autowire(outboundWire, parent);
-
- } else {
- SCAObject target = parent.getSystemChild(outboundWire.getTargetName().getPartName());
- connect(component, outboundWire, target);
- }
- } else {
- if (outboundWire.isAutowire()) {
- autowire(outboundWire, parent);
- } else {
- if (outboundWire.getTargetName() == null) {
- URI source = outboundWire.getUri();
- URI target = outboundWire.getTargetUri();
- throw new MissingWireTargetException("Target name was null", source, target);
- }
- SCAObject target = parent.getChild(outboundWire.getTargetName().getPartName());
- connect(component, outboundWire, target);
- }
+ if (outboundWire.isAutowire()) {
+ autowire(outboundWire, parent);
+ } else {
+ if (outboundWire.getTargetUri() == null) {
+ URI source = outboundWire.getUri();
+ URI target = outboundWire.getTargetUri();
+ throw new MissingWireTargetException("Target name was null", source, target);
+ }
+ URI sourceUri = outboundWire.getUri();
+ URI targetUri = outboundWire.getTargetUri();
+ String fragment = targetUri.getFragment();
+ URI defragUri = UriHelper.getDefragmentedName(targetUri);
+ Component targetComponent = componentManager.getComponent(defragUri);
+ if (targetComponent == null) {
+ throw new TargetComponentNotFoundException("Target not found", sourceUri, targetUri);
+ }
+ InboundWire targetWire = targetComponent.getTargetWire(fragment);
+ if (targetWire == null) {
+ throw new TargetServiceNotFoundException("Target not found", sourceUri, targetUri);
}
- } catch (WiringException e) {
- e.addContextName(component.getName());
- e.addContextName(parent.getName());
- throw e;
+ checkIfWireable(outboundWire, targetWire);
+ boolean optimizable = isOptimizable(component.getScope(), component.getScope());
+ connect(outboundWire, targetWire, optimizable);
}
}
}
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/TargetComponentNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/TargetComponentNotFoundException.java?view=auto&rev=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/TargetComponentNotFoundException.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/TargetComponentNotFoundException.java Wed Feb 7 08:19:34 2007
@@ -0,0 +1,18 @@
+package org.apache.tuscany.core.builder;
+
+import java.net.URI;
+
+import org.apache.tuscany.spi.builder.WiringException;
+
+/**
+ * Indicates the target component of a reference was not found
+ *
+ * @version $Rev$ $Date$
+ */
+public class TargetComponentNotFoundException extends WiringException {
+
+ public TargetComponentNotFoundException(String message, URI sourceName, URI targetName) {
+ super(message, sourceName, targetName);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/TargetComponentNotFoundException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/TargetComponentNotFoundException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 08:19:34 2007
@@ -25,7 +25,9 @@
import org.apache.tuscany.spi.event.RuntimeEventListener;
/**
- * Responsible for tracking and managing the component tree for a runtime instance
+ * Responsible for tracking and managing the component tree for a runtime instance. The tree corresponds to components
+ * deployed to the current runtime and hence may be sparse in comparison to the assembly component hierarchy for the SCA
+ * domain as parents and children may be distributed to different runtimes.
*
* @version $Rev$ $Date$
*/
@@ -33,13 +35,26 @@
/**
* Registers a component which will be managed by the runtime
- * @param component the component
+ *
+ * @param component the component
* @throws ComponentRegistrationException
*/
void register(Component component) throws ComponentRegistrationException;
+ /**
+ * Deregisters a component
+ *
+ * @param component the component to deregister
+ * @throws ComponentRegistrationException
+ */
void unregister(Component component) throws ComponentRegistrationException;
- Component getComponent(URI name);
+ /**
+ * Returns the component with the given URI
+ *
+ * @param uri the component URI
+ * @return the component or null if not found
+ */
+ Component getComponent(URI 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=504606&r1=504605&r2=504606
==============================================================================
--- 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 08:19:34 2007
@@ -19,6 +19,8 @@
package org.apache.tuscany.core.component;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -29,6 +31,7 @@
import org.apache.tuscany.spi.component.DuplicateNameException;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.services.management.TuscanyManagementService;
+import org.apache.tuscany.spi.util.UriHelper;
import org.apache.tuscany.core.component.event.ComponentStart;
import org.apache.tuscany.core.component.event.ComponentStop;
@@ -41,9 +44,11 @@
public class ComponentManagerImpl implements ComponentManager {
private TuscanyManagementService managementService;
private Map<URI, Component> components;
+ private Map<URI, List<URI>> parentToChildren;
public ComponentManagerImpl() {
components = new ConcurrentHashMap<URI, Component>();
+ parentToChildren = new ConcurrentHashMap<URI, List<URI>>();
}
public ComponentManagerImpl(TuscanyManagementService managementService) {
@@ -53,14 +58,27 @@
public void register(Component component) throws ComponentRegistrationException {
URI uri = component.getUri();
+ assert uri != null;
if (components.containsKey(uri)) {
throw new DuplicateNameException(uri.toString());
}
components.put(uri, component);
-
+ URI parentUri = UriHelper.getParentNameAsUri(uri);
+ List<URI> children = parentToChildren.get(parentUri);
+ if (children == null) {
+ children = new ArrayList<URI>();
+ parentToChildren.put(parentUri, children);
+ }
+ // the parent may not be registered in this VM
+ 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.getName(), component);
+ managementService.registerComponent(component.getUri().toString(), component);
}
if (component instanceof CompositeComponent) {
component.addListener(this);
@@ -68,7 +86,9 @@
}
public void unregister(Component component) throws ComponentRegistrationException {
- components.remove(component.getUri());
+ URI uri = component.getUri();
+ components.remove(uri);
+ parentToChildren.remove(uri);
component.removeListener(this);
}
@@ -80,16 +100,28 @@
// This could be faster but it is not an operation that is performed often
if (event instanceof ComponentStart) {
URI uri = ((ComponentStart) event).getComponentUri();
- for (Map.Entry<URI, Component> entry : components.entrySet()) {
- if (entry.getKey().toString().startsWith(uri.toString())) {
-//xcv enable entry.getValue().start();
+ List<URI> children = parentToChildren.get(uri);
+ if (children != null) {
+ synchronized (children) {
+ for (URI childUri : children) {
+ // performs a depth-first traversal as the children will recursively fire start events
+ Component child = components.get(childUri);
+ assert child != null;
+ child.start();
+ }
}
}
} else if (event instanceof ComponentStop) {
URI uri = ((ComponentStop) event).getComponentUri();
- for (Map.Entry<URI, Component> entry : components.entrySet()) {
- if (entry.getKey().toString().startsWith(uri.toString())) {
-// xcv enable entry.getValue().stop();
+ List<URI> children = parentToChildren.get(uri);
+ if (children != null) {
+ synchronized (children) {
+ for (URI childUri : children) {
+ // performs a depth-first traversal as the children will recursively fire stop events
+ Component child = components.get(childUri);
+ assert child != null;
+ child.stop();
+ }
}
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java Wed Feb 7 08:19:34 2007
@@ -23,6 +23,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -78,15 +79,15 @@
}
@SuppressWarnings("unchecked")
- public LinkedList<Object> getCurrentCallbackRoutingChain() {
+ public LinkedList<URI> getCurrentCallbackRoutingChain() {
Map<Object, Object> map = workContext.get();
if (map == null) {
return null;
}
- return (LinkedList<Object>) map.get(CALLBACK_ROUTING_CHAIN);
+ return (LinkedList<URI>) map.get(CALLBACK_ROUTING_CHAIN);
}
- public void setCurrentCallbackRoutingChain(LinkedList<Object> callbackRoutingChain) {
+ public void setCurrentCallbackRoutingChain(LinkedList<URI> callbackRoutingChain) {
Map<Object, Object> map = getWorkContextMap();
map.put(CALLBACK_ROUTING_CHAIN, callbackRoutingChain);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java Wed Feb 7 08:19:34 2007
@@ -114,7 +114,7 @@
}
return ctx.getInstance();
}
- throw new TargetNotFoundException(component.getName());
+ throw new TargetNotFoundException(component.getUri().toString());
}
public void persistNew(AtomicComponent component, String id, Object instance, long expiration)
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java Wed Feb 7 08:19:34 2007
@@ -153,7 +153,7 @@
try {
ctx = new InstanceWrapperImpl(component, component.createInstance());
} catch (ObjectCreationException e) {
- e.addContextName(component.getName());
+ e.addContextName(component.getUri().toString());
throw e;
}
ctx.start();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java Wed Feb 7 08:19:34 2007
@@ -121,7 +121,7 @@
}
return instance;
} else {
- throw new TargetNotFoundException(component.getName());
+ throw new TargetNotFoundException(component.getUri().toString());
}
} catch (StoreReadException e) {
throw new TargetResolutionException("Error retrieving target instance", e);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java Wed Feb 7 08:19:34 2007
@@ -22,6 +22,8 @@
import java.util.Map;
import java.util.Set;
+import org.osoa.sca.annotations.Constructor;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.SCAObject;
@@ -33,7 +35,6 @@
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.WirePostProcessorExtension;
-import org.osoa.sca.annotations.Constructor;
/**
* This processor is responsible to add an interceptor to invocation chain if the source and target operations have
@@ -78,9 +79,9 @@
if (callbackOperations == null || callbackOperations.isEmpty()) {
return;
}
- Object targetAddress = source.getContainer().getName();
+ //Object targetAddress = UriHelper.getBaseName(source.getUri());
Map<Operation<?>, OutboundInvocationChain> callbackChains =
- target.getSourceCallbackInvocationChains(targetAddress);
+ target.getSourceCallbackInvocationChains(source.getUri());
if (callbackChains == null) {
// callback chains could be null
return;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java Wed Feb 7 08:19:34 2007
@@ -80,7 +80,7 @@
targetOperation = entry.getKey();
sourceOperation =
getSourceOperation(source.getInvocationChains().keySet(), targetOperation.getName());
-
+
if (null != sourceOperation) {
argsDataBindings = resolveArgsDataBindings(targetOperation);
@@ -110,12 +110,12 @@
&& !allowsPassByReference
&& callbackOperations != null
&& !callbackOperations.isEmpty()) {
- Object targetAddress = source.getContainer().getName();
+ //URI targetAddress = UriHelper.getBaseName(source.getUri());
Map<Operation<?>, InboundInvocationChain> callbackChains = source.getTargetCallbackInvocationChains();
for (Map.Entry<Operation<?>, InboundInvocationChain> entry : callbackChains.entrySet()) {
targetOperation = entry.getKey();
sourceOperation =
- getSourceOperation(target.getSourceCallbackInvocationChains(targetAddress).keySet(),
+ getSourceOperation(target.getSourceCallbackInvocationChains(source.getUri()).keySet(),
targetOperation.getName());
argsDataBindings = resolveArgsDataBindings(targetOperation);
@@ -128,7 +128,7 @@
entry.getValue().addInterceptor(0, passByValueInterceptor);
tailInterceptor =
- target.getSourceCallbackInvocationChains(targetAddress).get(sourceOperation)
+ target.getSourceCallbackInvocationChains(source.getUri()).get(sourceOperation)
.getTailInterceptor();
if (tailInterceptor != null) {
tailInterceptor.setNext(passByValueInterceptor);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Wed Feb 7 08:19:34 2007
@@ -91,7 +91,7 @@
try {
load(parent, componentDefinition, deploymentContext);
} catch (LoaderException e) {
- e.addContextName(componentDefinition.getName().toString());
+ e.addContextName(componentDefinition.getUri().toString());
throw e;
}
Component component = (Component) build(parent, componentDefinition, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java Wed Feb 7 08:19:34 2007
@@ -104,7 +104,8 @@
try {
initInvoker.invokeEvent(instance);
} catch (ObjectCallbackException e) {
- throw new TargetInitializationException("Error initializing component instance", getName(), e);
+ String uri = getUri().toString();
+ throw new TargetInitializationException("Error initializing component instance", uri, e);
}
}
}
@@ -114,7 +115,7 @@
try {
destroyInvoker.invokeEvent(instance);
} catch (ObjectCallbackException e) {
- throw new TargetDestructionException("Error destroying component instance", getName(), e);
+ throw new TargetDestructionException("Error destroying component instance", getUri().toString(), e);
}
}
}
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 08:19:34 2007
@@ -2,7 +2,6 @@
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.BuilderInstantiationException;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ComponentRegistrationException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
@@ -29,12 +28,12 @@
DeploymentContext deploymentContext) throws BuilderException {
for (ComponentDefinition<? extends Implementation<?>> definition : componentType.getComponents().values()) {
- try {
- Component child = builderRegistry.build(component, definition, deploymentContext);
- component.register(child);
- } catch (ComponentRegistrationException e) {
- throw new BuilderInstantiationException("Error registering component", e);
- }
+// try {
+ builderRegistry.build(component, definition, deploymentContext);
+ //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=504606&r1=504605&r2=504606
==============================================================================
--- 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 08:19:34 2007
@@ -31,7 +31,6 @@
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.SCAObject;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.extension.CompositeComponentExtension;
@@ -97,12 +96,12 @@
throw new IllegalStateException("Composite not in UNINITIALIZED state");
}
- for (SCAObject child : systemChildren.values()) {
- child.start();
- }
- for (SCAObject child : children.values()) {
- child.start();
- }
+// for (SCAObject child : systemChildren.values()) {
+// child.start();
+// }
+// for (SCAObject child : children.values()) {
+// child.start();
+// }
initializeLatch.countDown();
initialized = true;
lifecycleState = INITIALIZED;
@@ -115,12 +114,6 @@
return;
}
- for (SCAObject child : children.values()) {
- child.stop();
- }
- for (SCAObject child : systemChildren.values()) {
- child.stop();
- }
publish(new ComponentStop(this, getUri()));
// need to block a start until reset is complete
initializeLatch = new CountDownLatch(2);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java Wed Feb 7 08:19:34 2007
@@ -40,7 +40,7 @@
DeploymentContext deploymentContext) throws BuilderException {
CompositeImplementation implementation = componentDefinition.getImplementation();
CompositeComponentType<?, ?, ?> componentType = implementation.getComponentType();
- URI name = componentDefinition.getName();
+ URI name = componentDefinition.getUri();
CompositeComponentImpl component = new CompositeComponentImpl(name, parent, connector, null);
return build(parent, component, componentType, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java Wed Feb 7 08:19:34 2007
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.core.implementation.composite;
-import java.util.Map;
import java.net.URI;
+import java.util.Map;
import org.w3c.dom.Document;
@@ -32,7 +32,6 @@
* @version $Rev$ $Date$
*/
public class CompositeComponentImpl extends AbstractCompositeComponent {
- private boolean systemComposite;
/**
* Constructor specifying property values
@@ -52,21 +51,14 @@
/**
* Constructor specifying if the composite is a system composite
*
- * @param name the name of this Component
- * @param parent this component's parent
- * @param connector the connector to use for wires
- * @param systemComposite true if the composite is a system composite
+ * @param name the name of this Component
+ * @param parent this component's parent
+ * @param connector the connector to use for wires
*/
public CompositeComponentImpl(URI name,
CompositeComponent parent,
- Connector connector,
- boolean systemComposite) {
+ Connector connector) {
super(name, parent, connector, null);
- this.systemComposite = systemComposite;
- }
-
- public boolean isSystem() {
- return systemComposite;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ReferenceImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ReferenceImpl.java Wed Feb 7 08:19:34 2007
@@ -38,19 +38,12 @@
public class ReferenceImpl extends AbstractSCAObject implements Reference {
private ServiceContract<?> serviceContract;
private List<ReferenceBinding> bindings = new ArrayList<ReferenceBinding>();
- private boolean system;
-
- public ReferenceImpl(URI name, CompositeComponent parent, ServiceContract<?> contract) {
- this(name, parent, contract, false);
- }
public ReferenceImpl(URI name,
CompositeComponent parent,
- ServiceContract<?> contract,
- boolean system) {
+ ServiceContract<?> contract) {
super(name, parent);
this.serviceContract = contract;
- this.system = system;
}
public Scope getScope() {
@@ -84,8 +77,4 @@
}
}
- @Override
- public boolean isSystem() {
- return system;
- }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ServiceImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ServiceImpl.java Wed Feb 7 08:19:34 2007
@@ -38,21 +38,18 @@
public class ServiceImpl extends AbstractSCAObject implements Service {
private ServiceContract<?> serviceContract;
private List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
- private boolean system;
private URI targetUri;
public ServiceImpl(URI name, CompositeComponent parent, ServiceContract<?> contract) {
- this(name, parent, contract, null, false);
+ this(name, parent, contract, null);
}
public ServiceImpl(URI name,
CompositeComponent parent,
ServiceContract<?> contract,
- URI targetUri,
- boolean system) {
+ URI targetUri) {
super(name, parent);
this.serviceContract = contract;
- this.system = system;
this.targetUri = targetUri;
}
@@ -91,8 +88,4 @@
}
}
- @Override
- public boolean isSystem() {
- return system;
- }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java Wed Feb 7 08:19:34 2007
@@ -39,9 +39,6 @@
public class SystemCompositeBuilder extends AbstractCompositeBuilder<SystemCompositeImplementation> {
private TuscanyManagementService managementService;
- public SystemCompositeBuilder() {
- }
-
public SystemCompositeBuilder(BuilderRegistry builderRegistry,
Connector connector,
TuscanyManagementService managementService) {
@@ -55,8 +52,8 @@
DeploymentContext deploymentContext) throws BuilderException {
SystemCompositeImplementation impl = componentDefinition.getImplementation();
CompositeComponentType<?, ?, ?> componentType = impl.getComponentType();
- URI name = componentDefinition.getName();
- CompositeComponent component = new CompositeComponentImpl(name, parent, connector, true);
+ URI name = componentDefinition.getUri();
+ CompositeComponent component = new CompositeComponentImpl(name, parent, connector);
component.setManagementService(managementService);
build(parent, component, componentType, deploymentContext);
return component;
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -130,6 +130,11 @@
return inboundWires.get(serviceName);
}
+
+ public InboundWire getTargetWire(String targetName) {
+ return getInboundWire(targetName);
+ }
+
public void addOutboundWire(OutboundWire wire) {
throw new UnsupportedOperationException();
}
@@ -145,10 +150,6 @@
public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
return null;
- }
-
- public boolean isSystem() {
- return true;
}
private void initWire(Class<?> interfaze) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Wed Feb 7 08:19:34 2007
@@ -123,7 +123,7 @@
configuration.addConstructorParamType(clazz);
}
configuration.setMonitor(monitor);
- configuration.setName(definition.getName());
+ configuration.setName(definition.getUri());
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
// handle properties
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java Wed Feb 7 08:19:34 2007
@@ -117,7 +117,7 @@
for (Class<?> clazz : constr.getParameterTypes()) {
configuration.addConstructorParamType(clazz);
}
- configuration.setName(definition.getName());
+ configuration.setName(definition.getUri());
SystemAtomicComponentImpl component = new SystemAtomicComponentImpl(configuration);
// handle properties
Map<String, PropertyValue<?>> propertyValues = definition.getPropertyValues();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java Wed Feb 7 08:19:34 2007
@@ -45,10 +45,6 @@
return null;
}
- public boolean isSystem() {
- return true;
- }
-
protected ObjectFactory<?> createWireFactory(Class<?> interfaze, OutboundWire wire) {
return new OptimizedWireObjectFactory(wire);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java Wed Feb 7 08:19:34 2007
@@ -96,7 +96,7 @@
T instance = null;
if (mappedName == null) {
try {
- InboundWire wire = parent.resolveSystemAutowire(type);
+ InboundWire wire = parent.resolveAutowire(type);
if (wire != null) {
instance = (T) wire.getTargetService();
}
@@ -113,7 +113,7 @@
}
return instance;
} else {
- SCAObject child = parent.getSystemChild(mappedName);
+ SCAObject child = parent.getChild(mappedName);
if (child instanceof AtomicComponent) {
try {
AtomicComponent component = (AtomicComponent) child;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Wed Feb 7 08:19:34 2007
@@ -161,7 +161,7 @@
for (ReferenceDefinition ref : type.getReferences().values()) {
if (ref.isAutowire()) {
ReferenceTarget referenceTarget = new ReferenceTarget();
- String compName = componentDefinition.getName().toString();
+ String compName = componentDefinition.getUri().toString();
URI refName = URI.create(compName + ref.getUri().toString());
referenceTarget.setReferenceName(refName);
componentDefinition.add(referenceTarget);
@@ -243,9 +243,10 @@
QualifiedName qName = new QualifiedName(target);
try {
if (qName.getPortName() == null) {
- targetURI = new URI(qName.getPartName());
+ targetURI = new URI(componentDefinition.getUri() + "/" + qName.getPartName());
} else {
- targetURI = new URI(qName.getPartName() + "#" + qName.getPartName());
+ targetURI =
+ new URI(componentDefinition.getUri() + "/" + qName.getPartName() + "#" + qName.getPortName());
}
} catch (URISyntaxException e) {
throw new InvalidReferenceException("Illegal URI", name, e);
@@ -272,7 +273,7 @@
if (referenceTarget == null) {
referenceTarget = new ReferenceTarget();
try {
- referenceTarget.setReferenceName(new URI(componentDefinition.getName() + "#" + name));
+ referenceTarget.setReferenceName(new URI(componentDefinition.getUri() + "#" + name));
} catch (URISyntaxException e) {
throw new IllegalSCDLNameException(e);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Wed Feb 7 08:19:34 2007
@@ -85,9 +85,10 @@
QualifiedName qName = new QualifiedName(target);
try {
if (qName.getPortName() == null) {
- targetUri = new URI(target);
+ targetUri = new URI(parent.getUri() + "/" + target);
} else {
- targetUri = new URI(qName.getPartName() + "#" + qName.getPortName());
+ targetUri =
+ new URI(parent.getUri() + "/" + qName.getPartName() + "#" + qName.getPortName());
}
} catch (URISyntaxException e) {
throw new IllegalSCDLNameException(e);
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 08:19:34 2007
@@ -210,7 +210,7 @@
/*
protected Deployer locateDeployer() throws InitializationException {
- SCAObject deployerComponent = tuscanySystem.getSystemChild(ComponentNames.TUSCANY_DEPLOYER);
+ SCAObject deployerComponent = tuscanySystem.getChild(ComponentNames.TUSCANY_DEPLOYER);
if (!(deployerComponent instanceof AtomicComponent)) {
throw new InitializationException("Deployer must be an atomic component");
}
@@ -224,7 +224,7 @@
/*
protected WireService locateWireService() throws InitializationException {
- SCAObject wireServiceComponent = tuscanySystem.getSystemChild(ComponentNames.TUSCANY_WIRE_SERVICE);
+ SCAObject wireServiceComponent = tuscanySystem.getChild(ComponentNames.TUSCANY_WIRE_SERVICE);
if (!(wireServiceComponent instanceof AtomicComponent)) {
throw new InitializationException("WireService must be an atomic component");
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java Wed Feb 7 08:19:34 2007
@@ -45,8 +45,8 @@
private OutboundWire targetWire;
private String callbackReferenceName;
private Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- private Map<Object, Map<Operation<?>, OutboundInvocationChain>> callbackSourceChainMaps =
- new HashMap<Object, Map<Operation<?>, OutboundInvocationChain>>();
+ private Map<URI, Map<Operation<?>, OutboundInvocationChain>> callbackSourceChainMaps =
+ new HashMap<URI, Map<Operation<?>, OutboundInvocationChain>>();
private SCAObject container;
private AtomicComponent targetComponent;
private boolean optimizable;
@@ -110,16 +110,16 @@
chains.put(operation, chain);
}
- public Map<Operation<?>, OutboundInvocationChain> getSourceCallbackInvocationChains(Object targetAddr) {
+ public Map<Operation<?>, OutboundInvocationChain> getSourceCallbackInvocationChains(URI targetAddr) {
return callbackSourceChainMaps.get(targetAddr);
}
- public void addSourceCallbackInvocationChains(Object targetAddr,
+ public void addSourceCallbackInvocationChains(URI targetAddr,
Map<Operation<?>, OutboundInvocationChain> chains) {
callbackSourceChainMaps.put(targetAddr, chains);
}
- public void addSourceCallbackInvocationChain(Object targetAddr,
+ public void addSourceCallbackInvocationChain(URI targetAddr,
Operation operation,
OutboundInvocationChain chain) {
Map<Operation<?>, OutboundInvocationChain> chains = callbackSourceChainMaps.get(targetAddr);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java Wed Feb 7 08:19:34 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.wire;
import java.util.LinkedList;
+import java.net.URI;
import org.osoa.sca.ServiceRuntimeException;
@@ -116,27 +117,27 @@
return null;
}
- public Object getFromAddress() {
+ public URI getFromAddress() {
return null;
}
- public void setFromAddress(Object fromAddress) {
+ public void setFromAddress(URI fromAddress) {
throw new UnsupportedOperationException();
}
- public Object popFromAddress() {
+ public URI popFromAddress() {
return null;
}
- public void pushFromAddress(Object fromAddress) {
+ public void pushFromAddress(URI fromAddress) {
throw new UnsupportedOperationException();
}
- public LinkedList<Object> getCallbackRoutingChain() {
+ public LinkedList<URI> getCallbackRoutingChain() {
return null;
}
- public void setCallbackRoutingChain(LinkedList<Object> fromAddresses) {
+ public void setCallbackRoutingChain(LinkedList<URI> fromAddresses) {
throw new UnsupportedOperationException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org