You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/05/05 22:54:28 UTC
svn commit: r535562 - in /incubator/tuscany/java/sca:
modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/
modules/core-spi/src/main/java/org/apache/tuscany/core/
modules/core/src/main/java/org/apache/tuscany/core/runtime/
modules/core/src...
Author: rfeng
Date: Sat May 5 13:54:26 2007
New Revision: 535562
URL: http://svn.apache.org/viewvc?view=rev&rev=535562
Log:
Change the extension interfaces to consistently use the runtime-extended of the models
Modified:
incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ImplementationProvider.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingActivator.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingActivator.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingProvider.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/CompositeScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/StatelessScopeContainer.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaImplementationProvider.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProvider.java
incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProvider.java
incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProvider.java
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java Sat May 5 13:54:26 2007
@@ -30,11 +30,10 @@
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.core.ReferenceBindingActivator;
import org.apache.tuscany.core.ReferenceBindingProvider;
+import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentReference;
import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.core.RuntimeWire;
import org.apache.tuscany.core.ServiceBindingActivator;
@@ -77,21 +76,21 @@
this.rmiHost = rmiHost;
}
- public InterfaceContract getBindingInterfaceContract(ComponentService service) {
+ public InterfaceContract getBindingInterfaceContract(RuntimeComponentService service) {
return service.getInterfaceContract();
}
- public void start(Component component, ComponentReference reference) {
+ public void start(RuntimeComponent component, RuntimeComponentReference reference) {
// TODO Auto-generated method stub
}
- public void stop(Component component, ComponentReference reference) {
+ public void stop(RuntimeComponent component, RuntimeComponentReference reference) {
// TODO Auto-generated method stub
}
- public void start(Component component, ComponentService service) {
+ public void start(RuntimeComponent component, RuntimeComponentService service) {
URI uri = URI.create(component.getURI() + "/" + getName());
setURI(uri.toString());
RuntimeComponentService componentService = (RuntimeComponentService) service;
@@ -111,7 +110,7 @@
}
}
- public void stop(Component component, ComponentService service) {
+ public void stop(RuntimeComponent component, RuntimeComponentService service) {
try {
rmiHost.unregisterService(getRmiServiceName(),
getPort(getRmiPort()));
@@ -121,7 +120,7 @@
}
- public Interceptor createInterceptor(Component component, ComponentReference reference, Operation operation, boolean isCallback) {
+ public Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentReference reference, Operation operation, boolean isCallback) {
try {
Method remoteMethod =
JavaInterfaceUtil.findMethod(((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass(),
@@ -136,7 +135,7 @@
}
}
- public InterfaceContract getBindingInterfaceContract(ComponentReference reference) {
+ public InterfaceContract getBindingInterfaceContract(RuntimeComponentReference reference) {
return reference.getInterfaceContract();
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ImplementationProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ImplementationProvider.java Sat May 5 13:54:26 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.core;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.invocation.Interceptor;
@@ -42,7 +41,7 @@
* @return An interceptor that handles the invocation logic, null should be
* returned if no interceptor is required
*/
- Interceptor createInterceptor(RuntimeComponent component, ComponentService service, Operation operation);
+ Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentService service, Operation operation);
/**
* Create an interceptor to call back to the given component
@@ -59,7 +58,7 @@
* @return The effective interface contract, if null is returned, the interface contract
* for the component service will be used
*/
- InterfaceContract getImplementationInterfaceContract(ComponentService service);
+ InterfaceContract getImplementationInterfaceContract(RuntimeComponentService service);
/**
* Configure the component by adding additional metadata for the component
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingActivator.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingActivator.java Sat May 5 13:54:26 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentReference;
/**
* A binding can optionally implement this interface to control how the
@@ -36,7 +34,7 @@
* @param component The component that owns the reference
* @param reference The reference that owns the binding
*/
- void start(Component component, ComponentReference reference);
+ void start(RuntimeComponent component, RuntimeComponentReference reference);
/**
* This method will be invoked when the reference binding is deactivated for
@@ -45,5 +43,5 @@
* @param component The component that owns the reference
* @param reference The reference that owns the binding
*/
- void stop(Component component, ComponentReference reference);
+ void stop(RuntimeComponent component, RuntimeComponentReference reference);
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ReferenceBindingProvider.java Sat May 5 13:54:26 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentReference;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.invocation.Interceptor;
@@ -40,7 +38,7 @@
* @return An interceptor that handles the invocation logic, null should be
* returned if no interceptor is required
*/
- Interceptor createInterceptor(Component component, ComponentReference reference, Operation operation, boolean isCallback);
+ Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentReference reference, Operation operation, boolean isCallback);
/**
* Get the effective interface contract imposed by the binding. For example,
@@ -51,7 +49,7 @@
* @return The effective interface contract, if null is returned, the interface contract
* for the component reference will be used
*/
- InterfaceContract getBindingInterfaceContract(ComponentReference reference);
+ InterfaceContract getBindingInterfaceContract(RuntimeComponentReference reference);
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingActivator.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingActivator.java Sat May 5 13:54:26 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentService;
/**
* A binding can optionally implement this interface to control how the service
@@ -36,7 +34,7 @@
* @param component The SCA component
* @param service The service that owns the binding
*/
- void start(Component component, ComponentService service);
+ void start(RuntimeComponent component, RuntimeComponentService service);
/**
* This method will be invoked when a service binding is deactivated or the
@@ -45,5 +43,5 @@
* @param component The SCA component
* @param service The service that owns the binding
*/
- void stop(Component component, ComponentService service);
+ void stop(RuntimeComponent component, RuntimeComponentService service);
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ServiceBindingProvider.java Sat May 5 13:54:26 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.core;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.interfacedef.InterfaceContract;
/**
@@ -37,5 +36,5 @@
* @return The effective interface contract, if null is returned, the interface contract
* for the component service will be used
*/
- InterfaceContract getBindingInterfaceContract(ComponentService service);
+ InterfaceContract getBindingInterfaceContract(RuntimeComponentService service);
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java Sat May 5 13:54:26 2007
@@ -96,7 +96,7 @@
for (Binding binding : service.getBindings()) {
if (binding instanceof ServiceBindingActivator) {
ServiceBindingActivator bindingActivator = (ServiceBindingActivator)binding;
- bindingActivator.start(component, service);
+ bindingActivator.start((RuntimeComponent)component, (RuntimeComponentService)service);
}
}
}
@@ -104,7 +104,7 @@
for (Binding binding : reference.getBindings()) {
if (binding instanceof ReferenceBindingActivator) {
ReferenceBindingActivator bindingActivator = (ReferenceBindingActivator)binding;
- bindingActivator.start(component, reference);
+ bindingActivator.start((RuntimeComponent)component, (RuntimeComponentReference)reference);
}
}
}
@@ -146,7 +146,7 @@
for (Binding binding : service.getBindings()) {
if (binding instanceof ServiceBindingActivator) {
ServiceBindingActivator bindingActivator = (ServiceBindingActivator)binding;
- bindingActivator.stop(component, service);
+ bindingActivator.stop((RuntimeComponent)component, (RuntimeComponentService)service);
}
}
}
@@ -154,7 +154,7 @@
for (Binding binding : reference.getBindings()) {
if (binding instanceof ReferenceBindingActivator) {
ReferenceBindingActivator bindingActivator = (ReferenceBindingActivator)binding;
- bindingActivator.stop(component, reference);
+ bindingActivator.stop((RuntimeComponent)component, (RuntimeComponentReference)reference);
}
}
}
@@ -208,7 +208,8 @@
InterfaceContract sourceContract = reference.getInterfaceContract();
if (binding instanceof ReferenceBindingProvider) {
ReferenceBindingProvider provider = (ReferenceBindingProvider)binding;
- InterfaceContract bindingContract = provider.getBindingInterfaceContract(reference);
+ InterfaceContract bindingContract = provider
+ .getBindingInterfaceContract((RuntimeComponentReference)reference);
if (bindingContract != null) {
sourceContract = bindingContract;
}
@@ -297,7 +298,7 @@
wire.getInvocationChains().add(chain);
}
if (bindingContract.getCallbackInterface() != null) {
- if(reference.getName().startsWith("$self$.")) {
+ if (reference.getName().startsWith("$self$.")) {
// No callback is needed
continue;
}
@@ -336,7 +337,7 @@
if (binding instanceof ServiceBindingProvider) {
ServiceBindingProvider provider = (ServiceBindingProvider)binding;
- InterfaceContract bindingContract = provider.getBindingInterfaceContract(service);
+ InterfaceContract bindingContract = provider.getBindingInterfaceContract((RuntimeComponentService)service);
if (bindingContract != null) {
sourceContract = bindingContract;
}
@@ -379,18 +380,23 @@
addImplementationInterceptor(component, service, chain, operation, false);
wire.getInvocationChains().add(chain);
}
-// if (sourceContract.getCallbackInterface() != null) {
-// for (Operation operation : sourceContract.getCallbackInterface().getOperations()) {
-// Operation targetOperation = interfaceContractMapper.map(targetContract.getCallbackInterface(),
-// operation);
-// InvocationChain chain = new InvocationChainImpl(operation, targetOperation);
-// if (operation.isNonBlocking()) {
-// chain.addInterceptor(new NonBlockingInterceptor(workScheduler, workContext));
-// }
-// addImplementationInterceptor(component, service, chain, operation, true);
-// wire.getCallbackInvocationChains().add(chain);
-// }
-// }
+ // if (sourceContract.getCallbackInterface() != null) {
+ // for (Operation operation :
+ // sourceContract.getCallbackInterface().getOperations()) {
+ // Operation targetOperation =
+ // interfaceContractMapper.map(targetContract.getCallbackInterface(),
+ // operation);
+ // InvocationChain chain = new InvocationChainImpl(operation,
+ // targetOperation);
+ // if (operation.isNonBlocking()) {
+ // chain.addInterceptor(new NonBlockingInterceptor(workScheduler,
+ // workContext));
+ // }
+ // addImplementationInterceptor(component, service, chain, operation,
+ // true);
+ // wire.getCallbackInvocationChains().add(chain);
+ // }
+ // }
runtimeService.addRuntimeWire(wire);
wireProcessorExtensionPoint.process(wire);
@@ -414,7 +420,9 @@
ImplementationProvider provider = (ImplementationProvider)component.getImplementation();
Interceptor interceptor = null;
if (!isCallback) {
- interceptor = provider.createInterceptor((RuntimeComponent)component, service, operation);
+ interceptor = provider.createInterceptor((RuntimeComponent)component,
+ (RuntimeComponentService)service,
+ operation);
} else {
interceptor = provider.createCallbackInterceptor((RuntimeComponent)component, operation);
}
@@ -440,7 +448,10 @@
boolean isCallback) {
if (binding instanceof ReferenceBindingProvider) {
ReferenceBindingProvider provider = (ReferenceBindingProvider)binding;
- Interceptor interceptor = provider.createInterceptor(component, reference, operation, isCallback);
+ Interceptor interceptor = provider.createInterceptor((RuntimeComponent)component,
+ (RuntimeComponentReference)reference,
+ operation,
+ isCallback);
if (interceptor != null) {
chain.addInterceptor(interceptor);
}
@@ -535,9 +546,9 @@
}
private void buildComposite(Composite composite,
- AssemblyFactory assemblyFactory,
- InterfaceContractMapper interfaceContractMapper) throws CompositeBuilderException {
-
+ AssemblyFactory assemblyFactory,
+ InterfaceContractMapper interfaceContractMapper) throws CompositeBuilderException {
+
CompositeBuilderMonitor monitor = new CompositeBuilderMonitor() {
public void problem(Problem problem) {
@@ -549,9 +560,7 @@
}
};
- DefaultCompositeBuilder builder =
- new DefaultCompositeBuilder(assemblyFactory, interfaceContractMapper, monitor);
-
+ DefaultCompositeBuilder builder = new DefaultCompositeBuilder(assemblyFactory, interfaceContractMapper, monitor);
builder.build(composite);
@@ -567,8 +576,7 @@
* @param composite
* @throws IncompatibleInterfaceContractException
*/
- public void activate(Composite composite)
- throws IncompatibleInterfaceContractException, CompositeBuilderException {
+ public void activate(Composite composite) throws IncompatibleInterfaceContractException, CompositeBuilderException {
buildComposite(composite, assemblyFactory, interfaceContractMapper);
configure(composite);
createRuntimeWires(composite);
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java Sat May 5 13:54:26 2007
@@ -23,12 +23,12 @@
import java.util.List;
import org.apache.tuscany.assembly.Binding;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentReference;
import org.apache.tuscany.assembly.Reference;
import org.apache.tuscany.assembly.SCABinding;
import org.apache.tuscany.assembly.impl.SCABindingImpl;
import org.apache.tuscany.core.ReferenceBindingProvider;
+import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentReference;
import org.apache.tuscany.core.RuntimeWire;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
@@ -48,7 +48,7 @@
return null;
}
- public InterfaceContract getBindingInterfaceContract(ComponentReference reference) {
+ public InterfaceContract getBindingInterfaceContract(RuntimeComponentReference reference) {
return reference.getInterfaceContract();
}
@@ -56,7 +56,7 @@
return wires;
}
- public Interceptor createInterceptor(Component component, ComponentReference reference, Operation operation, boolean isCallback) {
+ public Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentReference reference, Operation operation, boolean isCallback) {
return null;
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java Sat May 5 13:54:26 2007
@@ -80,7 +80,7 @@
* @throws TargetResolutionException if there was a problem creating the
* instance
*/
- protected InstanceWrapper createInstance(RuntimeComponent component) throws TargetResolutionException {
+ protected InstanceWrapper createInstanceWrapper(RuntimeComponent component) throws TargetResolutionException {
Implementation impl = component.getImplementation();
if (impl instanceof ScopedImplementationProvider) {
return ((ScopedImplementationProvider)impl).createInstanceWrapper(component);
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/CompositeScopeContainer.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/CompositeScopeContainer.java Sat May 5 13:54:26 2007
@@ -85,7 +85,7 @@
InstanceWrapper wrapper = (InstanceWrapper) instanceWrappers.get(component);
if (wrapper == EMPTY) {
// FIXME is there a potential race condition here that may result in two instances being created
- wrapper = createInstance(component);
+ wrapper = createInstanceWrapper(component);
instanceWrappers.put(component, wrapper);
wrapper.start();
// FIXME: [rfeng]
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java Sat May 5 13:54:26 2007
@@ -34,8 +34,9 @@
import org.apache.tuscany.spi.event.Event;
/**
- * A scope context which manages atomic component instances keyed on HTTP session
- *
+ * A scope context which manages atomic component instances keyed on HTTP
+ * session
+ *
* @version $Rev$ $Date$
*/
public class HttpSessionScopeContainer extends AbstractScopeContainer {
@@ -53,7 +54,7 @@
public void onEvent(Event event) {
checkInit();
if (event instanceof HttpSessionEnd) {
- Object key = ((HttpSessionEnd) event).getId();
+ Object key = ((HttpSessionEnd)event).getId();
shutdownInstances(key);
workContext.clearIdentifier(key);
}
@@ -76,13 +77,14 @@
public void register(RuntimeComponent component, Object groupId) {
contexts.put(component, new ConcurrentHashMap<Object, InstanceWrapper>());
-// component.addListener(this);
+ // component.addListener(this);
}
public void unregister(RuntimeComponent component) {
- // FIXME should all the instances associated with this component be destroyed already
+ // FIXME should all the instances associated with this component be
+ // destroyed already
contexts.remove(component);
-// component.removeListener(this);
+ // component.removeListener(this);
super.unregister(component);
}
@@ -90,18 +92,13 @@
throws TargetResolutionException {
Object key = workContext.getIdentifier(Scope.SESSION);
assert key != null : "HTTP session key not bound in work context";
- return getInstance(component, key, create);
- }
-
- private InstanceWrapper getInstance(RuntimeComponent component, Object key, boolean create)
- throws TargetResolutionException {
Map<Object, InstanceWrapper> wrappers = contexts.get(component);
InstanceWrapper ctx = wrappers.get(key);
if (ctx == null && !create) {
return null;
}
if (ctx == null) {
- ctx = super.createInstance(component);
+ ctx = super.createInstanceWrapper(component);
ctx.start();
wrappers.put(key, ctx);
List<InstanceWrapper> destroyQueue = destroyQueues.get(key);
@@ -114,7 +111,6 @@
}
}
return ctx;
-
}
private void shutdownInstances(Object key) {
@@ -129,7 +125,7 @@
try {
iter.previous().stop();
} catch (TargetDestructionException e) {
-// monitor.destructionError(e);
+ // monitor.destructionError(e);
}
}
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java Sat May 5 13:54:26 2007
@@ -90,7 +90,7 @@
return null;
}
if (ctx == null) {
- ctx = super.createInstance(component);
+ ctx = super.createInstanceWrapper(component);
ctx.start();
instanceContextMap.put(Thread.currentThread(), ctx);
List<InstanceWrapper> destroyQueue = destroyQueues.get(Thread.currentThread());
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/StatelessScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/StatelessScopeContainer.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/StatelessScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/StatelessScopeContainer.java Sat May 5 13:54:26 2007
@@ -37,7 +37,7 @@
public InstanceWrapper getWrapper(RuntimeComponent component, KEY contextId)
throws TargetResolutionException {
- InstanceWrapper ctx = createInstance(component);
+ InstanceWrapper ctx = createInstanceWrapper(component);
ctx.start();
return ctx;
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java Sat May 5 13:54:26 2007
@@ -22,7 +22,6 @@
import java.util.List;
import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.assembly.ConstrainingType;
import org.apache.tuscany.assembly.Implementation;
import org.apache.tuscany.assembly.Property;
@@ -31,6 +30,7 @@
import org.apache.tuscany.core.ImplementationActivator;
import org.apache.tuscany.core.ImplementationProvider;
import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.Operation;
@@ -155,7 +155,7 @@
// CRUD implementations are always resolved
}
- public Interceptor createInterceptor(RuntimeComponent component, ComponentService service, Operation operation) {
+ public Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentService service, Operation operation) {
CRUDImplementation impl = (CRUDImplementation)component.getImplementation();
CRUDTargetInvoker invoker = new CRUDTargetInvoker(operation, new ResourceManager(impl.getDirectory()));
return invoker;
@@ -167,7 +167,7 @@
return invoker;
}
- public InterfaceContract getImplementationInterfaceContract(ComponentService service) {
+ public InterfaceContract getImplementationInterfaceContract(RuntimeComponentService service) {
return service.getInterfaceContract();
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaImplementationProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaImplementationProvider.java Sat May 5 13:54:26 2007
@@ -25,6 +25,7 @@
import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.core.ImplementationActivator;
import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.core.ScopedImplementationProvider;
import org.apache.tuscany.core.scope.CompositeScopeContainer;
import org.apache.tuscany.databinding.DataBindingExtensionPoint;
@@ -154,7 +155,7 @@
return atomicComponent.createInstance();
}
- public Interceptor createInterceptor(RuntimeComponent component, ComponentService service, Operation operation) {
+ public Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentService service, Operation operation) {
JavaComponentInfo atomicComponent = (JavaComponentInfo)component.getImplementationConfiguration();
try {
return new TargetInvokerInterceptor(atomicComponent.createTargetInvoker(operation));
@@ -172,7 +173,7 @@
}
}
- public InterfaceContract getImplementationInterfaceContract(ComponentService service) {
+ public InterfaceContract getImplementationInterfaceContract(RuntimeComponentService service) {
return service.getInterfaceContract();
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java Sat May 5 13:54:26 2007
@@ -23,7 +23,6 @@
import java.util.List;
import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.assembly.ConstrainingType;
import org.apache.tuscany.assembly.Implementation;
import org.apache.tuscany.assembly.Property;
@@ -33,6 +32,7 @@
import org.apache.tuscany.core.ImplementationProvider;
import org.apache.tuscany.core.RuntimeComponent;
import org.apache.tuscany.core.RuntimeComponentReference;
+import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.core.RuntimeWire;
import org.apache.tuscany.core.invocation.JDKProxyService;
import org.apache.tuscany.interfacedef.Interface;
@@ -114,7 +114,7 @@
// TODO what is this for?
}
- public InterfaceContract getImplementationInterfaceContract(ComponentService service) {
+ public InterfaceContract getImplementationInterfaceContract(RuntimeComponentService service) {
// TODO what is this for?
return null;
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java Sat May 5 13:54:26 2007
@@ -25,10 +25,10 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.assembly.Property;
import org.apache.tuscany.assembly.Reference;
import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.implementation.spi.AbstractImplementation;
import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
import org.apache.tuscany.interfacedef.Operation;
@@ -73,7 +73,7 @@
this.scriptSrc = scriptSrc;
}
- public Interceptor createInterceptor(RuntimeComponent component, ComponentService service, Operation operation) {
+ public Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentService service, Operation operation) {
return new ScriptInvoker(this, operation.getName());
}
Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProvider.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProvider.java Sat May 5 13:54:26 2007
@@ -21,11 +21,10 @@
import java.net.URI;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.core.ReferenceBindingActivator;
import org.apache.tuscany.core.ReferenceBindingProvider;
+import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentReference;
import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.core.RuntimeWire;
import org.apache.tuscany.core.ServiceBindingActivator;
@@ -43,8 +42,8 @@
public class EchoBindingProvider extends EchoBindingImpl implements ReferenceBindingActivator,
ReferenceBindingProvider, ServiceBindingActivator, ServiceBindingProvider {
- public Interceptor createInterceptor(Component component,
- ComponentReference reference,
+ public Interceptor createInterceptor(RuntimeComponent component,
+ RuntimeComponentReference reference,
Operation operation,
boolean isCallback) {
if (isCallback) {
@@ -54,21 +53,21 @@
}
}
- public InterfaceContract getBindingInterfaceContract(ComponentReference reference) {
+ public InterfaceContract getBindingInterfaceContract(RuntimeComponentReference reference) {
return reference.getInterfaceContract();
}
- public void start(Component component, ComponentReference reference) {
+ public void start(RuntimeComponent component, RuntimeComponentReference reference) {
}
- public void stop(Component component, ComponentReference reference) {
+ public void stop(RuntimeComponent component, RuntimeComponentReference reference) {
}
- public InterfaceContract getBindingInterfaceContract(ComponentService service) {
+ public InterfaceContract getBindingInterfaceContract(RuntimeComponentService service) {
return service.getInterfaceContract();
}
- public void start(Component component, ComponentService service) {
+ public void start(RuntimeComponent component, RuntimeComponentService service) {
URI uri = URI.create(component.getURI() + "/" + getName());
setURI(uri.toString());
RuntimeComponentService componentService = (RuntimeComponentService) service;
@@ -78,7 +77,7 @@
EchoServer.getServer().register(new EchoService(chain.getHeadInterceptor()), uri);
}
- public void stop(Component component, ComponentService service) {
+ public void stop(RuntimeComponent component, RuntimeComponentService service) {
// Register with the hosting server
EchoServer.getServer().unregister(URI.create(getURI()));
}
Modified: incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProvider.java (original)
+++ incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProvider.java Sat May 5 13:54:26 2007
@@ -21,11 +21,10 @@
import java.net.URI;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.core.ReferenceBindingActivator;
import org.apache.tuscany.core.ReferenceBindingProvider;
+import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentReference;
import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.core.RuntimeWire;
import org.apache.tuscany.core.ServiceBindingActivator;
@@ -43,8 +42,8 @@
public class EchoBindingProvider extends EchoBindingImpl implements ReferenceBindingActivator,
ReferenceBindingProvider, ServiceBindingActivator, ServiceBindingProvider {
- public Interceptor createInterceptor(Component component,
- ComponentReference reference,
+ public Interceptor createInterceptor(RuntimeComponent component,
+ RuntimeComponentReference reference,
Operation operation,
boolean isCallback) {
if (isCallback) {
@@ -54,21 +53,21 @@
}
}
- public InterfaceContract getBindingInterfaceContract(ComponentReference reference) {
+ public InterfaceContract getBindingInterfaceContract(RuntimeComponentReference reference) {
return reference.getInterfaceContract();
}
- public void start(Component component, ComponentReference reference) {
+ public void start(RuntimeComponent component, RuntimeComponentReference reference) {
}
- public void stop(Component component, ComponentReference reference) {
+ public void stop(RuntimeComponent component, RuntimeComponentReference reference) {
}
- public InterfaceContract getBindingInterfaceContract(ComponentService service) {
+ public InterfaceContract getBindingInterfaceContract(RuntimeComponentService service) {
return service.getInterfaceContract();
}
- public void start(Component component, ComponentService service) {
+ public void start(RuntimeComponent component, RuntimeComponentService service) {
URI uri = URI.create(component.getURI() + "/" + getName());
setURI(uri.toString());
RuntimeComponentService componentService = (RuntimeComponentService) service;
@@ -78,7 +77,7 @@
EchoServer.getServer().register(new EchoService(chain.getHeadInterceptor()), uri);
}
- public void stop(Component component, ComponentService service) {
+ public void stop(RuntimeComponent component, RuntimeComponentService service) {
// Register with the hosting server
EchoServer.getServer().unregister(URI.create(getURI()));
}
Modified: incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProvider.java?view=diff&rev=535562&r1=535561&r2=535562
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProvider.java Sat May 5 13:54:26 2007
@@ -19,10 +19,10 @@
package crud;
import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.core.ImplementationActivator;
import org.apache.tuscany.core.ImplementationProvider;
import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
@@ -53,7 +53,7 @@
super(assemblyFactory, javaFactory, introspector);
}
- public Interceptor createInterceptor(RuntimeComponent component, ComponentService service, Operation operation) {
+ public Interceptor createInterceptor(RuntimeComponent component, RuntimeComponentService service, Operation operation) {
CRUDInvoker invoker = new CRUDInvoker(operation, new ResourceManager(getDirectory()));
return invoker;
}
@@ -64,7 +64,7 @@
return invoker;
}
- public InterfaceContract getImplementationInterfaceContract(ComponentService service) {
+ public InterfaceContract getImplementationInterfaceContract(RuntimeComponentService service) {
return service.getInterfaceContract();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org