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/22 03:50:55 UTC
svn commit: r510358 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/builder/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/ ke...
Author: jmarino
Date: Wed Feb 21 18:50:53 2007
New Revision: 510358
URL: http://svn.apache.org/viewvc?view=rev&rev=510358
Log:
rename WireService ProxyService as it only deals with proxies and not wires
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/ProxyServiceExtension.java (contents, props changed)
- copied, changed from r509887, 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/JDKProxyService.java (contents, props changed)
- copied, changed from r509887, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java (contents, props changed)
- copied, changed from r509887, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java
Removed:
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/JDKWireService.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java
Modified:
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/implementation/PojoAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.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/processor/ContextProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/CallbackWireObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireObjectFactory.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/JavaReferenceWireTestCase.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/WireToScopedJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactoryTestCase.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/wire/ContractCompatibilityTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
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/extension/AtomicComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl
incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl
incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl
incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
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=510358&r1=510357&r2=510358
==============================================================================
--- 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 21 18:50:53 2007
@@ -157,16 +157,7 @@
if (bindingBuilder == null) {
throw new NoRegisteredBuilderException("No builder registered for type", bindingClass.getName());
}
- ServiceBinding binding =
- bindingBuilder.build(parent, serviceDefinition, definition, deploymentContext);
-// if (wireService != null) {
-// if (targetUri == null) {
-// throw new MissingWireTargetException("Service target uri not specified");
-// }
-// //String path = uri.getPath();
-// ServiceContract<?> contract = serviceDefinition.getServiceContract();
-// wireService.createWires(binding, contract, targetUri.toString());
-// }
+ ServiceBinding binding = bindingBuilder.build(parent, serviceDefinition, definition, deploymentContext);
service.addServiceBinding(binding);
}
return service;
@@ -193,13 +184,6 @@
// noinspection SuspiciousMethodCalls
BindingBuilder bindingBuilder = bindingBuilders.get(bindingClass);
ReferenceBinding binding = bindingBuilder.build(parent, referenceDefinition, bindingDefinition, context);
- // create wires for the component
-// if (wireService != null) {
-// URI targetUri = bindingDefinition.getTargetUri();
-// // it is possible for a binding to not have a URI
-// wireService.createWires(binding, contract, targetUri);
-//
-// }
reference.addReferenceBinding(binding);
}
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=510358&r1=510357&r2=510358
==============================================================================
--- 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 21 18:50:53 2007
@@ -83,7 +83,7 @@
public PojoAtomicComponent(PojoConfiguration configuration) {
super(configuration.getName(),
- configuration.getWireService(),
+ configuration.getProxyService(),
configuration.getWorkContext(),
configuration.getScheduler(),
configuration.getMonitor(),
@@ -238,12 +238,12 @@
Member member = entry.getValue();
if (member instanceof Field) {
Field field = (Field) member;
- ObjectFactory<?> factory = new CallbackWireObjectFactory(field.getType(), wireService, wires);
+ ObjectFactory<?> factory = new CallbackWireObjectFactory(field.getType(), proxyService, wires);
injectors.add(new FieldInjector<Object>(field, factory));
} else if (member instanceof Method) {
Method method = (Method) member;
Class<?> type = method.getParameterTypes()[0];
- ObjectFactory<?> factory = new CallbackWireObjectFactory(type, wireService, wires);
+ ObjectFactory<?> factory = new CallbackWireObjectFactory(type, proxyService, wires);
injectors.add(new MethodInjector<Object>(method, factory));
} else {
throw new InvalidAccessorException("Member must be a field or method", member.getName());
@@ -393,7 +393,7 @@
}
public <B, R extends CallableReference<B>> R cast(B target) {
- return (R) wireService.cast(target);
+ return (R) proxyService.cast(target);
}
protected abstract <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java Wed Feb 21 18:50:53 2007
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.ExecutionMonitor;
import org.apache.tuscany.spi.services.work.WorkScheduler;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.Injector;
@@ -55,7 +55,7 @@
private Map<String, Member> propertySites = new HashMap<String, Member>();
private Map<String, Member> resourceSites = new HashMap<String, Member>();
private Map<String, Member> callbackSites = new HashMap<String, Member>();
- private WireService wireService;
+ private ProxyService proxyService;
private WorkContext workContext;
private WorkScheduler scheduler;
private ExecutionMonitor monitor;
@@ -191,12 +191,12 @@
propertySites.put(name, member);
}
- public WireService getWireService() {
- return wireService;
+ public ProxyService getProxyService() {
+ return proxyService;
}
- public void setWireService(WireService wireService) {
- this.wireService = wireService;
+ public void setProxyService(ProxyService proxyService) {
+ this.proxyService = proxyService;
}
public WorkContext getWorkContext() {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java Wed Feb 21 18:50:53 2007
@@ -61,6 +61,6 @@
}
protected <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire) {
- return new WireObjectFactory<B>(interfaze, wire, wireService);
+ return new WireObjectFactory<B>(interfaze, wire, proxyService);
}
}
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=510358&r1=510357&r2=510358
==============================================================================
--- 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 21 18:50:53 2007
@@ -89,7 +89,7 @@
configuration.setDestroyInvoker(new MethodEventInvoker(destroyMethod));
}
- configuration.setWireService(wireService);
+ configuration.setProxyService(proxyService);
configuration.setWorkContext(workContext);
configuration.setScheduler(workScheduler);
configuration.setImplementationClass(definition.getImplementation().getImplementationClass());
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java Wed Feb 21 18:50:53 2007
@@ -36,7 +36,6 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.implementation.java.ProcessingException;
import org.apache.tuscany.spi.implementation.java.Resource;
-import org.apache.tuscany.spi.wire.WireService;
import org.apache.tuscany.core.injection.RequestContextObjectFactory;
import org.apache.tuscany.core.util.JavaIntrospectionHelper;
@@ -48,13 +47,7 @@
* @version $Rev$ $Date$
*/
public class ContextProcessor extends ImplementationProcessorExtension {
- //private WireService wireService;
private WorkContext workContext;
-
- @Autowire
- public void setWireService(WireService wireService) {
- //this.wireService = wireService;
- }
@Autowire
public void setWorkContext(WorkContext workContext) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/CallbackWireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/CallbackWireObjectFactory.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/CallbackWireObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/CallbackWireObjectFactory.java Wed Feb 21 18:50:53 2007
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
/**
* Returns proxy instance for a wire callback
@@ -31,18 +31,18 @@
* @version $Rev$ $Date$
*/
public class CallbackWireObjectFactory implements ObjectFactory {
- private WireService wireService;
+ private ProxyService proxyService;
private Class<?> interfaze;
private List<Wire> wires;
- public CallbackWireObjectFactory(Class<?> interfaze, WireService wireService, List<Wire> wires) {
+ public CallbackWireObjectFactory(Class<?> interfaze, ProxyService proxyService, List<Wire> wires) {
this.interfaze = interfaze;
- this.wireService = wireService;
+ this.proxyService = proxyService;
this.wires = wires;
}
public Object getInstance() throws ObjectCreationException {
- return wireService.createCallbackProxy(interfaze, wires);
+ return proxyService.createCallbackProxy(interfaze, wires);
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/ProxyServiceExtension.java (from r509887, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/ProxyServiceExtension.java?view=diff&rev=510358&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java&r1=509887&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/ProxyServiceExtension.java&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/ProxyServiceExtension.java Wed Feb 21 18:50:53 2007
@@ -21,21 +21,18 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
/**
* Base class for wire service extensions
*
* @version $Rev$ $Date$
*/
-public abstract class WireServiceExtension implements WireService {
- protected PolicyBuilderRegistry policyRegistry;
+public abstract class ProxyServiceExtension implements ProxyService {
protected WorkContext context;
- protected WireServiceExtension(WorkContext context, PolicyBuilderRegistry policyRegistry) {
- this.policyRegistry = policyRegistry;
+ protected ProxyServiceExtension(WorkContext context) {
this.context = context;
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/ProxyServiceExtension.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/ProxyServiceExtension.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireObjectFactory.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireObjectFactory.java Wed Feb 21 18:50:53 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.wire.ChainHolder;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
/**
* Uses a wire to return an object instance
@@ -37,7 +37,7 @@
public class WireObjectFactory<T> implements ObjectFactory<T> {
private Class<T> interfaze;
private Wire wire;
- private WireService wireService;
+ private ProxyService proxyService;
// the cache of proxy interface method to operation mappings
private Map<Method, ChainHolder> mappings;
private boolean optimizable;
@@ -47,14 +47,14 @@
*
* @param interfaze the interface to inject on the client
* @param wire the backing wire
- * @param wireService the wire service to create the proxy
+ * @param proxyService the wire service to create the proxy
* @throws NoMethodForOperationException
*/
- public WireObjectFactory(Class<T> interfaze, Wire wire, WireService wireService)
+ public WireObjectFactory(Class<T> interfaze, Wire wire, ProxyService proxyService)
throws NoMethodForOperationException {
this.interfaze = interfaze;
this.wire = wire;
- this.wireService = wireService;
+ this.proxyService = proxyService;
this.mappings = WireUtils.createInterfaceToWireMapping(interfaze, wire);
if (wire.isOptimizable()
&& wire.getSourceContract().getInterfaceClass() != null
@@ -76,7 +76,7 @@
for (Map.Entry<Method, ChainHolder> entry : mappings.entrySet()) {
newChains.put(entry.getKey(), entry.getValue().clone());
}
- return interfaze.cast(wireService.createProxy(interfaze, wire, newChains));
+ return interfaze.cast(proxyService.createProxy(interfaze, wire, newChains));
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java (from r509887, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java?view=diff&rev=510358&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java&r1=509887&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java Wed Feb 21 18:50:53 2007
@@ -18,24 +18,23 @@
*/
package org.apache.tuscany.core.wire.jdk;
+import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
import java.util.List;
import java.util.Map;
+import org.osoa.sca.CallableReference;
import org.osoa.sca.annotations.Constructor;
import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.CallableReference;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
import org.apache.tuscany.spi.wire.ChainHolder;
import org.apache.tuscany.spi.wire.ProxyCreationException;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.core.wire.WireServiceExtension;
+import org.apache.tuscany.core.wire.ProxyServiceExtension;
/**
* the default implementation of a wire service that uses JDK dynamic proxies
@@ -43,15 +42,15 @@
* @version $$Rev$$ $$Date$$
*/
@EagerInit
-public class JDKWireService extends WireServiceExtension {
+public class JDKProxyService extends ProxyServiceExtension {
- public JDKWireService() {
- super(null, null);
+ public JDKProxyService() {
+ super(null);
}
@Constructor
- public JDKWireService(@Autowire WorkContext context, @Autowire PolicyBuilderRegistry policyRegistry) {
- super(context, policyRegistry);
+ public JDKProxyService(@Autowire WorkContext context) {
+ super(context);
}
public <T> T createProxy(Class<T> interfaze, Wire wire) throws ProxyCreationException {
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Wed Feb 21 18:50:53 2007
@@ -40,14 +40,14 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.composite.CompositeComponentImpl;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Target;
-import org.apache.tuscany.core.wire.jdk.JDKWireService;
+import org.apache.tuscany.core.wire.jdk.JDKProxyService;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
@@ -56,7 +56,7 @@
*/
public class JavaComponentBuilderReferenceTestCase extends TestCase {
private DeploymentContext deploymentContext;
- private WireService wireService;
+ private ProxyService proxyService;
private Constructor<SourceImpl> constructor;
private CompositeComponent parent;
private Wire wire;
@@ -80,7 +80,7 @@
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(sourceImpl);
definition.setUri(URI.create("component"));
JavaComponentBuilder builder = new JavaComponentBuilder();
- builder.setWireService(wireService);
+ builder.setProxyService(proxyService);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
component.setScopeContainer(scopeContainer);
component.attachWire(wire);
@@ -94,7 +94,7 @@
protected void setUp() throws Exception {
super.setUp();
- wireService = new JDKWireService();
+ proxyService = new JDKProxyService();
parent = new CompositeComponentImpl(URI.create("parent"), null);
constructor = SourceImpl.class.getConstructor((Class[]) null);
createDeploymentContext();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Wed Feb 21 18:50:53 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.PojoConfiguration;
@@ -61,7 +61,7 @@
EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
EasyMock.replay(wire);
- WireService service = EasyMock.createMock(WireService.class);
+ ProxyService service = EasyMock.createMock(ProxyService.class);
EasyMock.expect(service.createProxy(EasyMock.eq(Target.class), EasyMock.eq(wire), EasyMock.isA(Map.class)))
.andAnswer(new IAnswer<Target>() {
public Target answer() throws Throwable {
@@ -72,7 +72,7 @@
}).atLeastOnce();
EasyMock.replay(service);
- configuration.setWireService(service);
+ configuration.setProxyService(service);
configuration.setName(new URI("source"));
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setScopeContainer(scope);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Wed Feb 21 18:50:53 2007
@@ -52,7 +52,7 @@
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.implementation.java.JavaComponentBuilder;
import org.apache.tuscany.core.implementation.java.JavaImplementation;
-import org.apache.tuscany.core.wire.jdk.JDKWireService;
+import org.apache.tuscany.core.wire.jdk.JDKProxyService;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.getCurrentArguments;
@@ -103,34 +103,7 @@
* Verifies exception is thrown when callback is not implemented
*/
public void testCallbackNotRegistered() throws Exception {
-// JFM temporarily commenting out as implementation needs to be spec compliant
-// ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
-// JavaAtomicComponent fooComponent =
-// (JavaAtomicComponent) builder.build(null, targetDefinition, context);
-// fooComponent.setScopeContainer(container);
-// wireService.createWires(fooComponent, targetDefinition);
-// container.register(fooComponent);
-// componentManager.register(fooComponent);
-//
-// CompositeComponent parent = createMock(CompositeComponent.class);
-// replay(parent);
-//
-// ComponentDefinition<JavaImplementation> sourceDefinition = createPlainSource(URI.create("fooPlainClient"));
-// JavaAtomicComponent clientComponent =
-// (JavaAtomicComponent) builder.build(parent, sourceDefinition, context);
-// clientComponent.setScopeContainer(container);
-// wireService.createWires(clientComponent, sourceDefinition);
-// container.register(clientComponent);
-// componentManager.register(clientComponent);
-//
-// connector.connect(clientComponent);
-// FooPlainClient client = (FooPlainClient) clientComponent.getTargetInstance();
-// try {
-// client.invoke();
-// fail();
-// } catch (NoRegisteredCallbackException e) {
-// // expected
-// }
+ // JFM temporarily commenting out as implementation needs to be spec compliant
}
/**
@@ -369,7 +342,7 @@
builder = new JavaComponentBuilder();
workContext = new WorkContextImpl();
builder.setWorkContext(workContext);
- builder.setWireService(new JDKWireService(workContext, null));
+ builder.setProxyService(new JDKProxyService(workContext));
builder.setWorkScheduler(scheduler);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java Wed Feb 21 18:50:53 2007
@@ -34,7 +34,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
@@ -56,7 +56,7 @@
import org.apache.tuscany.core.mock.component.TargetImpl;
import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.WireImpl;
-import org.apache.tuscany.core.wire.jdk.JDKWireService;
+import org.apache.tuscany.core.wire.jdk.JDKProxyService;
/**
* Validates wiring from a wire to Java atomic component by scope
@@ -65,13 +65,13 @@
*/
public class WireToScopedJavaTestCase extends TestCase {
private WorkContext workContext = new WorkContextImpl();
- private WireService wireService = new JDKWireService(new WorkContextImpl(), null);
+ private ProxyService proxyService = new JDKProxyService(new WorkContextImpl());
public void testToStatelessScope() throws Exception {
StatelessScopeContainer scope = new StatelessScopeContainer(workContext, null);
scope.start();
final Wire wire = getWire(scope);
- Target service = wireService.createProxy(Target.class, wire);
+ Target service = proxyService.createProxy(Target.class, wire);
assertNotNull(service);
service.setString("foo");
assertEquals(null, service.getString());
@@ -85,7 +85,7 @@
scope.onEvent(new RequestStart(this));
final Wire wire = getWire(scope);
- Target service = wireService.createProxy(Target.class, wire);
+ Target service = proxyService.createProxy(Target.class, wire);
assertNotNull(service);
service.setString("foo");
@@ -94,8 +94,8 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
scope.onEvent(new RequestStart(this));
- Target service2 = wireService.createProxy(Target.class, wire);
- Target target2 = wireService.createProxy(Target.class, wire);
+ Target service2 = proxyService.createProxy(Target.class, wire);
+ Target target2 = proxyService.createProxy(Target.class, wire);
assertEquals(null, service2.getString());
service2.setString("bar");
assertEquals("bar", service2.getString());
@@ -119,8 +119,8 @@
scope.onEvent(new HttpSessionStart(this, session1));
final Wire wire = getWire(scope);
- Target service = wireService.createProxy(Target.class, wire);
- Target target = wireService.createProxy(Target.class, wire);
+ Target service = proxyService.createProxy(Target.class, wire);
+ Target target = proxyService.createProxy(Target.class, wire);
assertNotNull(service);
service.setString("foo");
assertEquals("foo", service.getString());
@@ -133,10 +133,10 @@
workContext.setIdentifier(Scope.SESSION, session2);
scope.onEvent(new HttpSessionStart(this, session2));
- Target service2 = wireService.createProxy(Target.class, wire);
+ Target service2 = proxyService.createProxy(Target.class, wire);
assertNotNull(service2);
assertNull(service2.getString());
- Target target2 = wireService.createProxy(Target.class, wire);
+ Target target2 = proxyService.createProxy(Target.class, wire);
service2.setString("bar");
assertEquals("bar", service2.getString());
assertEquals("bar", target2.getString());
@@ -157,8 +157,8 @@
scope.start();
scope.onEvent(new ComponentStart(this, null));
final Wire wire = getWire(scope);
- Target service = wireService.createProxy(Target.class, wire);
- Target target = wireService.createProxy(Target.class, wire);
+ Target service = proxyService.createProxy(Target.class, wire);
+ Target target = proxyService.createProxy(Target.class, wire);
assertNotNull(service);
service.setString("foo");
assertEquals("foo", service.getString());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java Wed Feb 21 18:50:53 2007
@@ -21,8 +21,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.annotations.Context;
@@ -33,7 +31,9 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.wire.WireService;
+
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
@@ -148,7 +148,6 @@
protected void setUp() throws Exception {
super.setUp();
processor = new ContextProcessor();
- processor.setWireService(EasyMock.createNiceMock(WireService.class));
processor.setWorkContext(EasyMock.createNiceMock(WorkContext.class));
composite = EasyMock.createNiceMock(CompositeComponent.class);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactoryTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactoryTestCase.java Wed Feb 21 18:50:53 2007
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -35,7 +35,7 @@
@SuppressWarnings({"unchecked"})
public void testCreateInstance() throws Exception {
- WireService service = createMock(WireService.class);
+ ProxyService service = createMock(ProxyService.class);
Foo foo = new Foo() {
};
EasyMock.expect(service.createCallbackProxy(EasyMock.eq(Foo.class), EasyMock.isA(List.class))).andReturn(foo);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Wed Feb 21 18:50:53 2007
@@ -35,7 +35,7 @@
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -45,14 +45,14 @@
import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.InvokerInterceptor;
import org.apache.tuscany.core.wire.WireImpl;
-import org.apache.tuscany.core.wire.jdk.JDKWireService;
+import org.apache.tuscany.core.wire.jdk.JDKProxyService;
/**
* @version $$Rev$$ $$Date$$
*/
public final class MockFactory {
- private static final WireService WIRE_SERVICE = new JDKWireService(new WorkContextImpl(), null);
+ private static final ProxyService PROXY_SERVICE = new JDKProxyService(new WorkContextImpl());
private static final JavaInterfaceProcessorRegistry REGISTRY = new JavaInterfaceProcessorRegistryImpl();
private MockFactory() {
@@ -98,7 +98,7 @@
createJavaComponent(targetName, targetScope, targetClass);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
- configuration.setWireService(WIRE_SERVICE);
+ configuration.setProxyService(PROXY_SERVICE);
for (Map.Entry<String, Member> entry : members.entrySet()) {
configuration.addReferenceSite(entry.getKey(), entry.getValue());
}
@@ -136,7 +136,7 @@
String serviceName = targetService.getName().substring(targetService.getName().lastIndexOf('.') + 1);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
- configuration.setWireService(WIRE_SERVICE);
+ configuration.setProxyService(PROXY_SERVICE);
for (Map.Entry<String, Member> entry : members.entrySet()) {
configuration.addReferenceSite(entry.getKey(), entry.getValue());
}
@@ -183,7 +183,7 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setImplementationClass(clazz);
configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
- configuration.setWireService(WIRE_SERVICE);
+ configuration.setProxyService(PROXY_SERVICE);
configuration.setWorkContext(new WorkContextImpl());
configuration.setName(new URI(name));
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/ContractCompatibilityTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/ContractCompatibilityTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/ContractCompatibilityTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/ContractCompatibilityTestCase.java Wed Feb 21 18:50:53 2007
@@ -35,7 +35,7 @@
import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
import org.apache.tuscany.spi.wire.ProxyCreationException;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import junit.framework.TestCase;
import org.osoa.sca.CallableReference;
@@ -47,12 +47,12 @@
*/
public class ContractCompatibilityTestCase extends TestCase {
- private WireService wireService = new MockWireService();
+ private ProxyService proxyService = new MockProxyService();
public void testNoOperation() throws Exception {
ServiceContract source = new MockContract<Type>("FooContract");
ServiceContract target = new MockContract<Type>("FooContract");
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
}
public void testBasic() throws Exception {
@@ -66,7 +66,7 @@
Map<String, Operation<Type>> targetOperations = new HashMap<String, Operation<Type>>();
targetOperations.put("op1", opSource2);
target.setOperations(targetOperations);
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
}
public void testBasicIncompatibleOperationNames() throws Exception {
@@ -81,7 +81,7 @@
targetOperations.put("op2", opSource2);
target.setOperations(targetOperations);
try {
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
fail();
} catch (IncompatibleServiceContractException e) {
//expected
@@ -109,7 +109,7 @@
Map<String, Operation<Type>> targetOperations = new HashMap<String, Operation<Type>>();
targetOperations.put("op1", opTarget);
target.setOperations(targetOperations);
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
}
@@ -135,7 +135,7 @@
targetOperations.put("op1", opTarget);
target.setOperations(targetOperations);
try {
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
fail();
} catch (IncompatibleServiceContractException e) {
//expected
@@ -184,7 +184,7 @@
Map<String, Operation<Type>> targetOperations = new HashMap<String, Operation<Type>>();
targetOperations.put("op1", opTarget);
target.setOperations(targetOperations);
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
}
/**
@@ -224,7 +224,7 @@
targetOperations.put("op1", opTarget);
target.setOperations(targetOperations);
try {
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
fail();
} catch (IncompatibleServiceContractException e) {
//expected
@@ -252,7 +252,7 @@
Map<String, Operation<Type>> targetOperations = new HashMap<String, Operation<Type>>();
targetOperations.put("op1", opTarget);
target.setOperations(targetOperations);
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
}
public void testSourceFaultTargetNoFaultCompatibility() throws Exception {
@@ -271,7 +271,7 @@
Map<String, Operation<Type>> targetOperations = new HashMap<String, Operation<Type>>();
targetOperations.put("op1", opTarget);
target.setOperations(targetOperations);
- wireService.checkCompatibility(source, target, false, false);
+ proxyService.checkCompatibility(source, target, false, false);
}
/**
@@ -341,9 +341,9 @@
}
}
- private class MockWireService extends WireServiceExtension {
- public MockWireService() {
- super(null, null);
+ private class MockProxyService extends ProxyServiceExtension {
+ public MockProxyService() {
+ super(null);
}
public <T> T createProxy(Class<T> interfaze, Wire wire) throws ProxyCreationException {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java Wed Feb 21 18:50:53 2007
@@ -26,7 +26,7 @@
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
@@ -48,7 +48,7 @@
EasyMock.expect(wire.getInvocationChains()).andReturn(chains);
EasyMock.expect(wire.isOptimizable()).andReturn(false);
EasyMock.replay(wire);
- WireService service = EasyMock.createMock(WireService.class);
+ ProxyService service = EasyMock.createMock(ProxyService.class);
service.createProxy(EasyMock.eq(Foo.class), EasyMock.eq(wire), EasyMock.isA(Map.class));
EasyMock.expectLastCall().andReturn(new Foo() {
public void hello() {
@@ -92,7 +92,7 @@
EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.replay(wire);
- WireService service = EasyMock.createMock(WireService.class);
+ ProxyService service = EasyMock.createMock(ProxyService.class);
service.createProxy(EasyMock.eq(Foo.class), EasyMock.eq(wire), EasyMock.isA(Map.class));
EasyMock.expectLastCall().andReturn(new Foo() {
public void hello() {
@@ -115,7 +115,7 @@
EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.replay(wire);
- WireService service = EasyMock.createMock(WireService.class);
+ ProxyService service = EasyMock.createMock(ProxyService.class);
service.createProxy(EasyMock.eq(Foo.class), EasyMock.eq(wire), EasyMock.isA(Map.class));
EasyMock.expectLastCall().andReturn(new Foo() {
public void hello() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java Wed Feb 21 18:50:53 2007
@@ -31,7 +31,7 @@
* @version $Rev$ $Date$
*/
public class JDKProxyTestCase extends TestCase {
- private JDKWireService wireService;
+ private JDKProxyService proxyService;
public void testCreateProxy() {
URI uri = URI.create("#service");
@@ -40,13 +40,13 @@
ServiceContract contract = new ServiceContract() {
};
wire.setSourceContract(contract);
- TestInterface proxy = wireService.createProxy(TestInterface.class, wire);
+ TestInterface proxy = proxyService.createProxy(TestInterface.class, wire);
assertTrue(Proxy.isProxyClass(proxy.getClass()));
}
protected void setUp() throws Exception {
super.setUp();
- wireService = new JDKWireService();
+ proxyService = new JDKProxyService();
}
public static interface TestInterface {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl Wed Feb 21 18:50:53 2007
@@ -109,8 +109,8 @@
<system:implementation.system class="org.apache.tuscany.core.loader.ServiceLoader"/>
</component>
- <component name="wireService">
- <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireService"/>
+ <component name="proxyService">
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyService"/>
</component>
<!-- Composite implementation type -->
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java Wed Feb 21 18:50:53 2007
@@ -54,7 +54,7 @@
/**
* The name of the component that contains the deployer.
*/
- public static final URI TUSCANY_WIRE_SERVICE = TUSCANY_SYSTEM.resolve("wireService");
+ public static final URI TUSCANY_WIRE_SERVICE = TUSCANY_SYSTEM.resolve("proxyService");
private ComponentNames() {
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Wed Feb 21 18:50:53 2007
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.work.WorkScheduler;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
/**
* An extension point for atomic component type, which new implementation types may extend
@@ -39,7 +39,7 @@
public abstract class AtomicComponentExtension extends AbstractComponentExtension implements AtomicComponent {
protected ScopeContainer scopeContainer;
protected Scope scope;
- protected WireService wireService;
+ protected ProxyService proxyService;
protected WorkContext workContext;
protected WorkScheduler workScheduler;
protected ExecutionMonitor monitor;
@@ -49,17 +49,17 @@
private boolean allowsPassByReference;
protected AtomicComponentExtension(URI name,
- WireService wireService,
+ ProxyService proxyService,
WorkContext workContext,
WorkScheduler workScheduler,
ExecutionMonitor monitor,
int initLevel) {
- this(name, wireService, workContext, workScheduler, monitor, initLevel, -1, -1);
+ this(name, proxyService, workContext, workScheduler, monitor, initLevel, -1, -1);
}
protected AtomicComponentExtension(URI name,
- WireService wireService,
+ ProxyService proxyService,
WorkContext workContext,
WorkScheduler workScheduler,
ExecutionMonitor monitor,
@@ -68,7 +68,7 @@
long maxAge) {
super(name);
assert !(maxIdleTime > 0 && maxAge > 0);
- this.wireService = wireService;
+ this.proxyService = proxyService;
this.workContext = workContext;
this.workScheduler = workScheduler;
this.monitor = monitor;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java Wed Feb 21 18:50:53 2007
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
import org.apache.tuscany.spi.services.work.WorkScheduler;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.api.annotation.Monitor;
@@ -43,7 +43,7 @@
public abstract class ComponentBuilderExtension<I extends Implementation<?>> implements ComponentBuilder<I> {
protected BuilderRegistry builderRegistry;
protected ScopeRegistry scopeRegistry;
- protected WireService wireService;
+ protected ProxyService proxyService;
protected WorkScheduler workScheduler;
protected WorkContext workContext;
protected PolicyBuilderRegistry policyBuilderRegistry;
@@ -60,8 +60,8 @@
}
@Autowire
- public void setWireService(WireService wireService) {
- this.wireService = wireService;
+ public void setProxyService(ProxyService proxyService) {
+ this.proxyService = proxyService;
}
@Autowire
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java (from r509887, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java?view=diff&rev=510358&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java&r1=509887&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java Wed Feb 21 18:50:53 2007
@@ -32,7 +32,7 @@
* @version $$Rev$$ $$Date$$
*/
-public interface WireService {
+public interface ProxyService {
/**
* Creates a Java proxy for the given wire
@@ -96,6 +96,8 @@
* @return true if the service contracts are compatible
* @throws IncompatibleServiceContractException
* If the source service contract is not compatible with the target one
+ * <p>
+ * TODO JFM this method should be moved from this interface to the allocator phase
*/
boolean checkCompatibility(ServiceContract<?> source,
ServiceContract<?> target,
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java Wed Feb 21 18:50:53 2007
@@ -88,7 +88,7 @@
configuration.setDestroyInvoker(new MethodEventInvoker(destroyMethod));
}
- configuration.setWireService(wireService);
+ configuration.setProxyService(proxyService);
configuration.setWorkContext(workContext);
configuration.setScheduler(workScheduler);
configuration.setImplementationClass(implClass);
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl Wed Feb 21 18:50:53 2007
@@ -37,8 +37,8 @@
</component>
<!-- Wire service -->
- <component name="wireService">
- <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireService"/>
+ <component name="proxyService">
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyService"/>
</component>
<!-- Scope infrastructure -->
Modified: incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl (original)
+++ incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl Wed Feb 21 18:50:53 2007
@@ -37,8 +37,8 @@
</component>
<!-- Wire service -->
- <component name="wireService">
- <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireService"/>
+ <component name="proxyService">
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyService"/>
</component>
<!-- Scope infrastructure -->
Modified: incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl (original)
+++ incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl Wed Feb 21 18:50:53 2007
@@ -37,8 +37,8 @@
</component>
<!-- Wire service -->
- <component name="wireService">
- <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireService"/>
+ <component name="proxyService">
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyService"/>
</component>
<!-- Scope infrastructure -->
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java Wed Feb 21 18:50:53 2007
@@ -92,7 +92,7 @@
configuration.setDestroyInvoker(new MethodEventInvoker(destroyMethod));
}
- configuration.setWireService(wireService);
+ configuration.setProxyService(proxyService);
configuration.setWorkContext(workContext);
configuration.setScheduler(workScheduler);
configuration.setImplementationClass(implClass);
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java Wed Feb 21 18:50:53 2007
@@ -61,6 +61,6 @@
referenceTypes.put(name, type);
}
- return new WebappComponent(uri, wireService, workContext, workScheduler, monitor, attributes, referenceTypes);
+ return new WebappComponent(uri, proxyService, workContext, workScheduler, monitor, attributes, referenceTypes);
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java Wed Feb 21 18:50:53 2007
@@ -39,7 +39,7 @@
import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.core.wire.WireObjectFactory;
import org.apache.tuscany.core.component.ComponentContextProvider;
@@ -57,13 +57,13 @@
private final ComponentContext context;
public WebappComponent(URI name,
- WireService wireService,
+ ProxyService proxyService,
WorkContext workContext,
WorkScheduler workScheduler,
ExecutionMonitor monitor,
Map<String, ObjectFactory<?>> attributes,
Map<String, Class<?>> referenceTypes) {
- super(name, wireService, workContext, workScheduler, monitor, 0, 0, 0);
+ super(name, proxyService, workContext, workScheduler, monitor, 0, 0, 0);
this.propertyFactories = attributes;
this.referenceTypes = referenceTypes;
referenceFactories = new ConcurrentHashMap<String, Wire>(referenceTypes.size());
@@ -88,7 +88,7 @@
}
protected <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire) {
- return new WireObjectFactory<B>(interfaze, wire, wireService);
+ return new WireObjectFactory<B>(interfaze, wire, proxyService);
}
public void bind(ServletContext servletContext) {
@@ -152,6 +152,6 @@
}
public <B, R extends CallableReference<B>> R cast(B target) {
- return (R) wireService.cast(target);
+ return (R) proxyService.cast(target);
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl?view=diff&rev=510358&r1=510357&r2=510358
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl Wed Feb 21 18:50:53 2007
@@ -37,8 +37,8 @@
</component>
<!-- Wire service -->
- <component name="wireService">
- <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireService"/>
+ <component name="proxyService">
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyService"/>
</component>
<!-- Scope infrastructure -->
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org
Fwd: svn commit: r510358
Posted by Jim Marino <jm...@myromatours.com>.
FYI,
I've renamed WireService and its descendants to ProxyService as it
deals with creating proxies and not wires with the recent changeover
to WireImpl.
Jim
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org