Author: jmarino
Date: Sat Apr 15 14:04:36 2006
New Revision: 394367
URL: http://svn.apache.org/viewcvs?rev=394367&view=rev
Log:
rename ProxyConfiguration to WireConfiguration in prep for refactor
Added:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/WireConfiguration.java
(contents, props changed)
- copied, changed from r394366,
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/NullProxyFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/spi/ProxyFactory.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
Sat Apr 15 14:04:36 2006
@@ -37,7 +37,7 @@
import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
@@ -139,7 +139,7 @@
iConfigMap.put(method, iConfig);
}
QualifiedName qName = new QualifiedName(externalService.getName() +
"/" + service.getName());
- ProxyConfiguration pConfiguration = new ProxyConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireConfiguration pConfiguration = new WireConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
config.addTargetProxyFactory(service.getName(), proxyFactory);
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
Sat Apr 15 14:04:36 2006
@@ -29,7 +29,7 @@
import org.apache.tuscany.core.invocation.Interceptor;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.InvocationRuntimeException;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.TargetInvoker;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
@@ -128,7 +128,7 @@
iConfigMap.put(method, iConfig);
}
QualifiedName qName = new
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ "/" + service.getName());
- ProxyConfiguration pConfiguration = new ProxyConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireConfiguration pConfiguration = new WireConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
config.addSourceProxyFactory(service.getName(), proxyFactory);
Modified:
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
Sat Apr 15 14:04:36 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
@@ -127,7 +127,7 @@
}
QualifiedName qName = new
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ "/" + service.getName());
- ProxyConfiguration pConfiguration = new ProxyConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireConfiguration pConfiguration = new WireConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
config.addSourceProxyFactory(service.getName(), proxyFactory);
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
Sat Apr 15 14:04:36 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
@@ -75,6 +75,15 @@
/* the top-level builder responsible for evaluating policies */
private HierarchicalBuilder policyBuilder = new HierarchicalBuilder();
+
+ public JavaContextFactoryBuilder(ProxyFactoryFactory proxyFactoryFactory,
MessageFactory messageFactory) {
+ this.proxyFactoryFactory = proxyFactoryFactory;
+ this.messageFactory = messageFactory;
+ }
+
+ public JavaContextFactoryBuilder() {
+ }
+
@Init(eager = true)
public void init() {
runtimeContext.addBuilder(this);
@@ -115,22 +124,6 @@
policyBuilder.addBuilder(builder);
}
- // ----------------------------------
- // Constructors
- // ----------------------------------
-
- public JavaContextFactoryBuilder() {
- }
-
- public JavaContextFactoryBuilder(ProxyFactoryFactory proxyFactoryFactory,
MessageFactory messageFactory) {
- this.proxyFactoryFactory = proxyFactoryFactory;
- this.messageFactory = messageFactory;
- }
-
- // ----------------------------------
- // Methods
- // ----------------------------------
-
public void build(AssemblyObject modelObject) throws BuilderException {
if (!(modelObject instanceof AtomicComponent)) {
return;
@@ -232,7 +225,7 @@
}
QualifiedName qName = new
QualifiedName(component.getName() + QualifiedName.NAME_SEPARATOR
+ service.getName());
- ProxyConfiguration pConfiguration = new
ProxyConfiguration(qName, iConfigMap, serviceContract.getInterface()
+ WireConfiguration pConfiguration = new
WireConfiguration(qName, iConfigMap, serviceContract.getInterface()
.getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
@@ -274,10 +267,6 @@
}
}
- // ----------------------------------
- // Private methods
- // ----------------------------------
-
/**
* Creates an <code>Injector</code> for component properties
*/
@@ -339,7 +328,7 @@
iConfigMap.put(method, iConfig);
}
- ProxyConfiguration pConfiguration = new
ProxyConfiguration(refName, qName, iConfigMap, interfaze.getClassLoader(),
+ WireConfiguration pConfiguration = new WireConfiguration(refName,
qName, iConfigMap, interfaze.getClassLoader(),
messageFactory);
proxyFactory.setBusinessInterface(interfaze);
proxyFactory.setProxyConfiguration(pConfiguration);
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
Sat Apr 15 14:04:36 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.core.context.ScopeContext;
import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.core.context.event.ModuleStart;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactoryFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
@@ -63,7 +63,7 @@
ContextFactory<Context> source = (ContextFactory<Context>)
component.getContextFactory();
Assert.assertNotNull(source);
for (ProxyFactory pFactory : source.getSourceProxyFactories()) {
- ProxyConfiguration pConfig = pFactory.getProxyConfiguration();
+ WireConfiguration pConfig = pFactory.getProxyConfiguration();
Component target =
compMap.get(pConfig.getTargetName().getPartName());
if (target != null) {
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
Sat Apr 15 14:04:36 2006
@@ -17,7 +17,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -58,7 +58,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -75,7 +75,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
Sat Apr 15 14:04:36 2006
@@ -27,7 +27,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.injection.ObjectCreationException;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
@@ -124,7 +124,7 @@
iConfigMap.put(method, iConfig);
}
QualifiedName qName = new
QualifiedName(ep.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ "/" + service.getName());
- ProxyConfiguration pConfiguration = new ProxyConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireConfiguration pConfiguration = new WireConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
contextFactory.addSourceProxyFactory(service.getName(),
proxyFactory);
@@ -159,7 +159,7 @@
iConfigMap.put(method, iConfig);
}
QualifiedName qName = new QualifiedName(es.getName() + "/" +
service.getName());
- ProxyConfiguration pConfiguration = new ProxyConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireConfiguration pConfiguration = new WireConfiguration(qName,
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
contextFactory.addTargetProxyFactory(service.getName(),
proxyFactory);
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
Sat Apr 15 14:04:36 2006
@@ -30,7 +30,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
@@ -176,7 +176,7 @@
}
QualifiedName qName = new QualifiedName(component.getName() +
QualifiedName.NAME_SEPARATOR
+ service.getName());
- ProxyConfiguration pConfiguration = new ProxyConfiguration(qName,
iConfigMap, contract.getInterface()
+ WireConfiguration pConfiguration = new WireConfiguration(qName,
iConfigMap, contract.getInterface()
.getClassLoader(), msgFactory);
proxyFactory.setBusinessInterface(contract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
@@ -208,7 +208,7 @@
String targetSerivceName =
reference.getTargetConfiguredServices().get(0).getPort().getName();
QualifiedName qName = new QualifiedName(targetCompName
+ '/' + targetSerivceName);
- ProxyConfiguration pConfiguration = new
ProxyConfiguration(reference.getPort().getName(), qName,
+ WireConfiguration pConfiguration = new
WireConfiguration(reference.getPort().getName(), qName,
iConfigMap, interfaze.getInterface().getClassLoader(),
msgFactory);
proxyFactory.setBusinessInterface(interfaze.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
Sat Apr 15 14:04:36 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.core.context.event.SessionEvent;
import org.apache.tuscany.core.context.scope.DefaultScopeStrategy;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyInitializationException;
import org.apache.tuscany.core.system.annotation.Autowire;
@@ -265,7 +265,7 @@
e.addContextName(getName());
throw e;
}
- configuration = (ContextFactory) component.getContextFactory();
+ configuration = (ContextFactory<Context>)
component.getContextFactory();
if (configuration == null) {
ConfigurationException e = new
MissingContextFactoryException("Context factory not set");
e.addContextName(component.getName());
@@ -276,7 +276,7 @@
registerAutowire(component);
}
for (EntryPoint ep : newModule.getEntryPoints()) {
- configuration = (ContextFactory) ep.getContextFactory();
+ configuration = (ContextFactory<Context>)
ep.getContextFactory();
if (configuration == null) {
ConfigurationException e = new
MissingContextFactoryException("Context factory not set");
e.setIdentifier(ep.getName());
@@ -287,7 +287,7 @@
registerAutowire(ep);
}
for (ExternalService service : newModule.getExternalServices()) {
- configuration = (ContextFactory) service.getContextFactory();
+ configuration = (ContextFactory<Context>)
service.getContextFactory();
if (configuration == null) {
ConfigurationException e = new
MissingContextFactoryException("Context factory not set");
e.setIdentifier(service.getName());
@@ -525,8 +525,8 @@
Scope sourceScope = source.getScope();
if (source.getSourceProxyFactories() != null) {
for (ProxyFactory<?> sourceFactory :
source.getSourceProxyFactories()) {
- ProxyConfiguration proxyConfiguration =
sourceFactory.getProxyConfiguration();
- QualifiedName targetName = proxyConfiguration.getTargetName();
+ WireConfiguration wireConfiguration =
sourceFactory.getProxyConfiguration();
+ QualifiedName targetName = wireConfiguration.getTargetName();
ContextFactory<?> target =
configurations.get(targetName.getPartName());
if (target == null) {
ContextInitException e = new ContextInitException("Target
not found");
@@ -536,11 +536,11 @@
throw e;
}
// get the proxy chain for the target
- ProxyFactory targetFactory =
target.getTargetProxyFactory(proxyConfiguration.getTargetName()
+ ProxyFactory targetFactory =
target.getTargetProxyFactory(wireConfiguration.getTargetName()
.getPortName());
if (targetFactory == null) {
ContextInitException e = new ContextInitException("No
proxy factory found for service");
-
e.setIdentifier(proxyConfiguration.getTargetName().getPortName());
+
e.setIdentifier(wireConfiguration.getTargetName().getPortName());
e.addContextName(target.getName());
e.addContextName(source.getName());
e.addContextName(name);
Copied:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/WireConfiguration.java
(from r394366,
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java)
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/WireConfiguration.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/WireConfiguration.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java&r1=394366&r2=394367&rev=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/WireConfiguration.java
Sat Apr 15 14:04:36 2006
@@ -23,14 +23,14 @@
import java.util.Map;
/**
- * Represents configuration information for creating a service proxy. When a
client component implementation is injected
+ * Represents configuration information for creating a wire. When a client
component implementation is injected
* with a service proxy representing a wire, source- and target-side proxy
configurations are "bridged" together. This
* concatenated configuration may then be used to generate a proxy implemented
a particular business interface required
* by the client.
*
* @version $Rev$ $Date$
*/
-public class ProxyConfiguration {
+public class WireConfiguration {
private Map<Method, InvocationConfiguration> configurations;
@@ -42,12 +42,8 @@
private String referenceName;
- // ----------------------------------
- // Constructors
- // ----------------------------------
-
- public ProxyConfiguration(QualifiedName serviceName, Map<Method,
InvocationConfiguration> invocationConfigs,
- ClassLoader proxyClassLoader, MessageFactory messageFactory) {
+ public WireConfiguration(QualifiedName serviceName, Map<Method,
InvocationConfiguration> invocationConfigs,
+ ClassLoader proxyClassLoader, MessageFactory
messageFactory) {
this(null, serviceName, invocationConfigs, proxyClassLoader,
messageFactory);
}
@@ -59,8 +55,8 @@
* @param proxyClassLoader the classloader to use when creating a proxy
* @param messageFactory the factory used to create invocation messages
*/
- public ProxyConfiguration(String referenceName, QualifiedName serviceName,
- Map<Method, InvocationConfiguration> invocationConfigs,
ClassLoader proxyClassLoader, MessageFactory messageFactory) {
+ public WireConfiguration(String referenceName, QualifiedName serviceName,
+ Map<Method, InvocationConfiguration>
invocationConfigs, ClassLoader proxyClassLoader, MessageFactory messageFactory)
{
assert (invocationConfigs != null) : "No invocation configuration map
specified";
this.referenceName = referenceName;
this.serviceName = serviceName;
@@ -72,10 +68,6 @@
this.proxyClassLoader = proxyClassLoader;
}
}
-
- // ----------------------------------
- // Methods
- // ----------------------------------
/**
* Returns the qualified service name the configuration is associated with
Propchange:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/WireConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/WireConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/NullProxyFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/NullProxyFactory.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/NullProxyFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/NullProxyFactory.java
Sat Apr 15 14:04:36 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.invocation.impl;
import org.apache.tuscany.core.context.CompositeContext;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.spi.ProxyCreationException;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyInitializationException;
@@ -23,7 +23,7 @@
this.parentContext = parentContext;
}
- public void initialize(Class businessInterface, ProxyConfiguration config)
throws ProxyInitializationException {
+ public void initialize(Class businessInterface, WireConfiguration config)
throws ProxyInitializationException {
}
public Object createProxy() throws ProxyCreationException {
@@ -33,11 +33,11 @@
public void initialize() throws ProxyInitializationException {
}
- public ProxyConfiguration getProxyConfiguration() {
+ public WireConfiguration getProxyConfiguration() {
return null;
}
- public void setProxyConfiguration(ProxyConfiguration config) {
+ public void setProxyConfiguration(WireConfiguration config) {
}
public void setBusinessInterface(Class interfaze) {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactory.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactory.java
Sat Apr 15 14:04:36 2006
@@ -18,7 +18,7 @@
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyInitializationException;
@@ -44,7 +44,7 @@
private Map<Method, InvocationConfiguration> methodToInvocationConfig;
- private ProxyConfiguration configuration;
+ private WireConfiguration configuration;
public void initialize() throws ProxyInitializationException {
if (state != UNINITIALIZED) {
@@ -67,11 +67,11 @@
return Proxy.newProxyInstance(configuration.getProxyClassLoader(),
businessInterfaceArray, handler);
}
- public ProxyConfiguration getProxyConfiguration() {
+ public WireConfiguration getProxyConfiguration() {
return configuration;
}
- public void setProxyConfiguration(ProxyConfiguration config) {
+ public void setProxyConfiguration(WireConfiguration config) {
configuration = config;
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/spi/ProxyFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/spi/ProxyFactory.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/spi/ProxyFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/spi/ProxyFactory.java
Sat Apr 15 14:04:36 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.core.invocation.spi;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
/**
* Implementations are responsible for creating service proxies using a
particular proxy strategy. Service proxies may
@@ -49,12 +49,12 @@
/**
* Returns the configuration information used to create a proxy
*/
- public ProxyConfiguration getProxyConfiguration();
+ public WireConfiguration getProxyConfiguration();
/**
* Sets the configuration information used to create a proxy
*/
- public void setProxyConfiguration(ProxyConfiguration config);
+ public void setProxyConfiguration(WireConfiguration config);
/**
* Sets the primary interface type generated proxies should implement
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
Sat Apr 15 14:04:36 2006
@@ -5,7 +5,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.mock.SimpleTarget;
import org.apache.tuscany.core.invocation.mock.MockHandler;
import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor;
@@ -51,7 +51,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -68,7 +68,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -106,7 +106,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -123,7 +123,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -161,7 +161,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -176,7 +176,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -212,7 +212,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -225,7 +225,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -263,7 +263,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -276,7 +276,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -310,7 +310,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -327,7 +327,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -360,7 +360,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -373,7 +373,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -408,7 +408,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -419,7 +419,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
Sat Apr 15 14:04:36 2006
@@ -5,7 +5,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactory;
import org.apache.tuscany.core.invocation.mock.SimpleTarget;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -40,7 +40,7 @@
ProxyFactory sourceFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> sourceInvocationConfigs = new
MethodHashMap();
sourceInvocationConfigs.put(hello, source);
- ProxyConfiguration sourceConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration sourceConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -50,7 +50,7 @@
ProxyFactory targetFactory = new JDKProxyFactory();
Map<Method, InvocationConfiguration> targetInvocationConfigs = new
MethodHashMap();
targetInvocationConfigs.put(hello, target);
- ProxyConfiguration targetConfig = new ProxyConfiguration(new
QualifiedName("target/SimpleTarget"),
+ WireConfiguration targetConfig = new WireConfiguration(new
QualifiedName("target/SimpleTarget"),
targetInvocationConfigs,
Thread.currentThread().getContextClassLoader(), msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
targetFactory.setBusinessInterface(SimpleTarget.class);
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java?rev=394367&r1=394366&r2=394367&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java
Sat Apr 15 14:04:36 2006
@@ -18,7 +18,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
-import org.apache.tuscany.core.invocation.ProxyConfiguration;
+import org.apache.tuscany.core.invocation.WireConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.mock.MockStaticInvoker;
import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor;
@@ -50,7 +50,7 @@
source.build();
Map<Method, InvocationConfiguration> configs = new MethodHashMap();
configs.put(hello, source);
- ProxyConfiguration config = new ProxyConfiguration(new
QualifiedName("foo"), configs, Thread.currentThread()
+ WireConfiguration config = new WireConfiguration(new
QualifiedName("foo"), configs, Thread.currentThread()
.getContextClassLoader(), new MessageFactoryImpl());
JDKProxyFactory factory = new JDKProxyFactory();
factory.setProxyConfiguration(config);
