Author: jmarino
Date: Sat Apr 15 21:27:44 2006
New Revision: 394431

URL: http://svn.apache.org/viewcvs?rev=394431&view=rev
Log:
initial refactoring for cleaner separation of wire configuration into source 
and target sides

Added:
    
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
    
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.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/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/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
    
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
    
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
    
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactory.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/wire/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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -41,6 +41,7 @@
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.system.annotation.Autowire;
@@ -138,10 +139,10 @@
             InvocationConfiguration iConfig = new 
InvocationConfiguration(method);
             iConfigMap.put(method, iConfig);
         }
-        QualifiedName qName = new QualifiedName(externalService.getName() + 
"/" + service.getName());
-        WireConfiguration pConfiguration = new WireConfiguration(qName, 
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+        QualifiedName qName = new QualifiedName(externalService.getName() + 
QualifiedName.NAME_SEPARATOR + service.getName());
+        WireConfiguration wireConfiguration = new 
WireTargetConfiguration(qName, iConfigMap, 
serviceContract.getInterface().getClassLoader(), messageFactory);
         proxyFactory.setBusinessInterface(serviceContract.getInterface());
-        proxyFactory.setProxyConfiguration(pConfiguration);
+        proxyFactory.setProxyConfiguration(wireConfiguration);
         config.addTargetProxyFactory(service.getName(), proxyFactory);
         configuredService.setProxyFactory(proxyFactory);
         if (policyBuilder != null) {

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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -33,6 +33,7 @@
 import org.apache.tuscany.core.wire.TargetInvoker;
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.message.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.runtime.RuntimeContext;
@@ -128,9 +129,9 @@
             iConfigMap.put(method, iConfig);
         }
         QualifiedName qName = new 
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
 + "/" + service.getName());
-        WireConfiguration pConfiguration = new WireConfiguration(qName, 
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+        WireConfiguration wireConfiguration = new 
WireTargetConfiguration(qName, iConfigMap, 
serviceContract.getInterface().getClassLoader(), messageFactory);
         proxyFactory.setBusinessInterface(serviceContract.getInterface());
-        proxyFactory.setProxyConfiguration(pConfiguration);
+        proxyFactory.setProxyConfiguration(wireConfiguration);
         config.addSourceProxyFactory(service.getName(), proxyFactory);
         configuredService.setProxyFactory(proxyFactory);
         if (policyBuilder != null) {

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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -25,6 +25,7 @@
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.system.annotation.Autowire;
@@ -127,9 +128,9 @@
         }
         QualifiedName qName = new 
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
                 + "/" + service.getName());
-        WireConfiguration pConfiguration = new WireConfiguration(qName, 
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+        WireConfiguration wireConfiguration = new 
WireTargetConfiguration(qName, iConfigMap, 
serviceContract.getInterface().getClassLoader(), messageFactory);
         proxyFactory.setBusinessInterface(serviceContract.getInterface());
-        proxyFactory.setProxyConfiguration(pConfiguration);
+        proxyFactory.setProxyConfiguration(wireConfiguration);
         config.addSourceProxyFactory(service.getName(), proxyFactory);
         configuredService.setProxyFactory(proxyFactory);
         if (policyBuilder != null) {

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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -35,6 +35,8 @@
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.system.annotation.Autowire;
@@ -225,10 +227,10 @@
                     }
                     QualifiedName qName = new 
QualifiedName(component.getName() + QualifiedName.NAME_SEPARATOR
                             + service.getName());
-                    WireConfiguration pConfiguration = new 
WireConfiguration(qName, iConfigMap, serviceContract.getInterface()
+                    WireConfiguration wireConfiguration = new 
WireTargetConfiguration(qName, iConfigMap, serviceContract.getInterface()
                             .getClassLoader(), messageFactory);
                     
proxyFactory.setBusinessInterface(serviceContract.getInterface());
-                    proxyFactory.setProxyConfiguration(pConfiguration);
+                    proxyFactory.setProxyConfiguration(wireConfiguration);
                     contextFactory.addTargetProxyFactory(service.getName(), 
proxyFactory);
                     configuredService.setProxyFactory(proxyFactory);
                     if (policyBuilder != null) {
@@ -328,7 +330,7 @@
                 iConfigMap.put(method, iConfig);
             }
 
-            WireConfiguration pConfiguration = new WireConfiguration(refName, 
qName, iConfigMap, interfaze.getClassLoader(),
+            WireConfiguration pConfiguration = new 
WireSourceConfiguration(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/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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -21,6 +21,8 @@
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.jdk.JDKProxyFactory;
 import org.apache.tuscany.core.wire.ProxyFactory;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.message.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
@@ -58,7 +60,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -75,7 +77,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -31,6 +31,8 @@
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.system.annotation.Autowire;
@@ -124,9 +126,9 @@
                 iConfigMap.put(method, iConfig);
             }
             QualifiedName qName = new 
QualifiedName(ep.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
 + "/" + service.getName());
-            WireConfiguration pConfiguration = new WireConfiguration(qName, 
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+            WireConfiguration wireConfiguration = new 
WireSourceConfiguration("foo",qName, iConfigMap, 
serviceContract.getInterface().getClassLoader(), messageFactory);
             proxyFactory.setBusinessInterface(serviceContract.getInterface());
-            proxyFactory.setProxyConfiguration(pConfiguration);
+            proxyFactory.setProxyConfiguration(wireConfiguration);
             contextFactory.addSourceProxyFactory(service.getName(), 
proxyFactory);
             configuredService.setProxyFactory(proxyFactory);
             if (policyBuilder != null) {
@@ -158,10 +160,10 @@
                 InvocationConfiguration iConfig = new 
InvocationConfiguration(method);
                 iConfigMap.put(method, iConfig);
             }
-            QualifiedName qName = new QualifiedName(es.getName() + "/" + 
service.getName());
-            WireConfiguration pConfiguration = new WireConfiguration(qName, 
iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
+            QualifiedName qName = new QualifiedName(es.getName() + 
QualifiedName.NAME_SEPARATOR+ service.getName());
+            WireConfiguration wireConfiguration = new 
WireTargetConfiguration(qName, iConfigMap, 
serviceContract.getInterface().getClassLoader(), messageFactory);
             proxyFactory.setBusinessInterface(serviceContract.getInterface());
-            proxyFactory.setProxyConfiguration(pConfiguration);
+            proxyFactory.setProxyConfiguration(wireConfiguration);
             contextFactory.addTargetProxyFactory(service.getName(), 
proxyFactory);
             configuredService.setProxyFactory(proxyFactory);
             if (policyBuilder != null) {

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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -34,6 +34,8 @@
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.system.annotation.Autowire;
@@ -176,10 +178,10 @@
                    }
             QualifiedName qName = new QualifiedName(component.getName() + 
QualifiedName.NAME_SEPARATOR
                     + service.getName());
-            WireConfiguration pConfiguration = new WireConfiguration(qName, 
iConfigMap, contract.getInterface()
+            WireConfiguration wireConfiguration = new 
WireTargetConfiguration(qName, iConfigMap, contract.getInterface()
                     .getClassLoader(), msgFactory);
                    proxyFactory.setBusinessInterface(contract.getInterface());
-                   proxyFactory.setProxyConfiguration(pConfiguration);
+                   proxyFactory.setProxyConfiguration(wireConfiguration);
                    configuredService.setProxyFactory(proxyFactory);
                    if (referenceBuilder != null) {
                        // invoke the reference builder to handle target-side 
metadata
@@ -208,7 +210,7 @@
                        String targetSerivceName = 
reference.getTargetConfiguredServices().get(0).getPort().getName();
 
                        QualifiedName qName = new QualifiedName(targetCompName 
+ '/' + targetSerivceName);
-                WireConfiguration pConfiguration = new 
WireConfiguration(reference.getPort().getName(), qName,
+                WireConfiguration pConfiguration = new 
WireSourceConfiguration(reference.getPort().getName(), qName,
                         iConfigMap, interfaze.getInterface().getClassLoader(), 
msgFactory);
                        
proxyFactory.setBusinessInterface(interfaze.getInterface());
                        proxyFactory.setProxyConfiguration(pConfiguration);

Modified: 
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java?rev=394431&r1=394430&r2=394431&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
 (original)
+++ 
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
 Sat Apr 15 21:27:44 2006
@@ -25,6 +25,7 @@
 import org.apache.tuscany.core.context.impl.AbstractContext;
 import org.apache.tuscany.core.wire.ProxyCreationException;
 import org.apache.tuscany.core.wire.ProxyFactory;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.osoa.sca.ServiceRuntimeException;
 
 import java.util.HashMap;
@@ -113,7 +114,7 @@
         try {
             Map<String, Object> context = new HashMap<String, Object>();
             for (ProxyFactory proxyFactory : sourceProxyFactories) {
-                
context.put(proxyFactory.getProxyConfiguration().getReferenceName(), 
proxyFactory.createProxy());
+                
context.put(((WireSourceConfiguration)proxyFactory.getProxyConfiguration()).getReferenceName(),
 proxyFactory.createProxy());
             }
             return context;
         } catch (ProxyCreationException e) {

Modified: 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=394431&r1=394430&r2=394431&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
 Sat Apr 15 21:27:44 2006
@@ -19,6 +19,7 @@
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.wire.InvocationConfiguration;
 import org.apache.tuscany.core.wire.ProxyFactory;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.impl.MessageChannelImpl;
 
@@ -65,7 +66,8 @@
                 InvocationConfiguration targetInvocationConfig = 
targetInvocationConfigs.get(sourceInvocationConfig.getMethod());
                 if (targetInvocationConfig == null){
                     BuilderConfigException e= new 
BuilderConfigException("Incompatible source and target interface types for 
reference");
-                    
e.setIdentifier(sourceFactory.getProxyConfiguration().getReferenceName());
+                    //FIXME xcv
+                    e.setIdentifier(((WireSourceConfiguration) 
sourceFactory.getProxyConfiguration()).getReferenceName());
                     throw e;
                 }
                 // if handler is configured, add that

Modified: 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java?rev=394431&r1=394430&r2=394431&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
 Sat Apr 15 21:27:44 2006
@@ -23,43 +23,34 @@
 import java.util.Map;
 
 /**
- * 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.
- * 
+ * 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 WireConfiguration {
+public abstract class WireConfiguration {
 
-    private Map<Method, InvocationConfiguration> configurations;
+    protected Map<Method, InvocationConfiguration> configurations;
 
-    private ClassLoader proxyClassLoader;
+    protected ClassLoader proxyClassLoader;
 
-    private MessageFactory messageFactory;
+    protected MessageFactory messageFactory;
 
-    private QualifiedName serviceName;
-
-    private String referenceName;
-
-    public WireConfiguration(QualifiedName serviceName, Map<Method, 
InvocationConfiguration> invocationConfigs,
-                             ClassLoader proxyClassLoader, MessageFactory 
messageFactory) {
-        this(null, serviceName, invocationConfigs, proxyClassLoader, 
messageFactory);
-    }
+    protected QualifiedName targetName;
 
     /**
      * Creates a configuration used to generate proxies representing a service.
-     * 
-     * @param serviceName the qualified name of the service represented by 
this configuration
+     *
+     * @param targetName        the qualified name of the service represented 
by this configuration
      * @param invocationConfigs a collection of operation-to-wire 
configuration mappings for the service
-     * @param proxyClassLoader the classloader to use when creating a proxy
-     * @param messageFactory the factory used to create wire messages
+     * @param proxyClassLoader  the classloader to use when creating a proxy
+     * @param messageFactory    the factory used to create wire messages
      */
-    public WireConfiguration(String referenceName, QualifiedName serviceName,
+    public WireConfiguration(QualifiedName targetName,
                              Map<Method, InvocationConfiguration> 
invocationConfigs, ClassLoader proxyClassLoader, MessageFactory messageFactory) 
{
         assert (invocationConfigs != null) : "No wire configuration map 
specified";
-        this.referenceName = referenceName;
-        this.serviceName = serviceName;
+        this.targetName = targetName;
         configurations = invocationConfigs;
         this.messageFactory = messageFactory;
         if (proxyClassLoader == null) {
@@ -70,22 +61,15 @@
     }
 
     /**
-     * Returns the qualified service name the configuration is associated with
+     * Returns the qualified context/service name the wire targets
      */
     public QualifiedName getTargetName() {
-        return serviceName;
-    }
-
-    /**
-     * Returns the name of the reference if a source-side configuration
-     */
-    public String getReferenceName() {
-        return referenceName;
+        return targetName;
     }
 
     /**
-     * Returns a collection of operation types to [EMAIL PROTECTED] 
InvocationConfiguration} mappings that represent the specific
-     * proxy configuration information for particular operations
+     * Returns a collection of [EMAIL PROTECTED] InvocationConfiguration}s 
keyed by their operation type of the service associated with
+     * either the wire's source reference or target
      */
     public Map<Method, InvocationConfiguration> getInvocationConfigurations() {
         return configurations;
@@ -99,7 +83,7 @@
     }
 
     /**
-     * Returns the factory used to create wire messages
+     * Returns the factory used to create invocation messages
      */
     public MessageFactory getMessageFactory() {
         return messageFactory;

Added: 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java?rev=394431&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
 (added)
+++ 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
 Sat Apr 15 21:27:44 2006
@@ -0,0 +1,43 @@
+package org.apache.tuscany.core.wire;
+
+import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.core.message.MessageFactory;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Represents the source side of a wire. When a client component 
implementation is injected with a service proxy , source- and
+ * target-side proxy configurations are "bridged" together. This concatenated 
configuration may then be used to generate a proxy
+ * implementing the particular business interface required by the client.
+ *
+ * @version $Rev: 394379 $ $Date: 2006-04-15 15:01:36 -0700 (Sat, 15 Apr 2006) 
$
+ */
+public class WireSourceConfiguration extends WireConfiguration {
+
+    protected String referenceName;
+
+    /**
+     * Creates the source side of a wire
+     *
+     * @param referenceName     the name of the reference the wire is 
associated with
+     * @param targetName        the qualified name of the service represented 
by this configuration
+     * @param invocationConfigs a collection of operation-to-wire 
configuration mappings for the service
+     * @param proxyClassLoader  the classloader to use when creating a proxy
+     * @param messageFactory    the factory used to create wire messages
+     */
+    public WireSourceConfiguration(String referenceName, QualifiedName 
targetName,
+                                   Map<Method, InvocationConfiguration> 
invocationConfigs, ClassLoader proxyClassLoader, MessageFactory messageFactory) 
{
+        super(targetName, invocationConfigs, proxyClassLoader, messageFactory);
+        assert (referenceName != null) : "No wire reference name specified";
+        this.referenceName = referenceName;
+    }
+
+
+    /**
+     * Returns the name of the source reference for the wire
+     */
+    public String getReferenceName() {
+        return referenceName;
+    }
+}

Added: 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java?rev=394431&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java
 (added)
+++ 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java
 Sat Apr 15 21:27:44 2006
@@ -0,0 +1,22 @@
+package org.apache.tuscany.core.wire;
+
+import org.apache.tuscany.core.message.MessageFactory;
+import org.apache.tuscany.core.context.QualifiedName;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Represents the target side of a wire, including all invocation chains for 
operations on a service
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public class WireTargetConfiguration extends WireConfiguration {
+
+    public WireTargetConfiguration(QualifiedName targetName, Map<Method, 
InvocationConfiguration> invocationConfigs,
+                                   ClassLoader proxyClassLoader, 
MessageFactory messageFactory) {
+        super(targetName, invocationConfigs, proxyClassLoader, messageFactory);
+    }
+
+
+}

Modified: 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactory.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactory.java?rev=394431&r1=394430&r2=394431&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactory.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactory.java
 Sat Apr 15 21:27:44 2006
@@ -76,9 +76,6 @@
     }
 
     public void setBusinessInterface(Class interfaze) {
-  //      if(!interfaze.isInterface()){
-  //          throw new IllegalArgumentException("Class is not an interface 
["+interfaze+"]");
-  //      }
         businessInterfaceArray = new Class[] { interfaze };
     }
 

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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -7,6 +7,8 @@
 import org.apache.tuscany.core.wire.MethodHashMap;
 import org.apache.tuscany.core.wire.WireConfiguration;
 import org.apache.tuscany.core.wire.ProxyFactory;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.wire.mock.SimpleTarget;
 import org.apache.tuscany.core.wire.mock.MockHandler;
 import org.apache.tuscany.core.wire.mock.MockSyncInterceptor;
@@ -51,7 +53,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -68,7 +70,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(new 
QualifiedName("target/SimpleTarget"),
                 targetInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         targetFactory.setProxyConfiguration(targetConfig);
         targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -106,7 +108,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -123,7 +125,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(new 
QualifiedName("target/SimpleTarget"),
                 targetInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         targetFactory.setProxyConfiguration(targetConfig);
         targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -161,7 +163,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -176,7 +178,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(new 
QualifiedName("target/SimpleTarget"),
                 targetInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         targetFactory.setProxyConfiguration(targetConfig);
         targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -212,7 +214,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -225,7 +227,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(new 
QualifiedName("target/SimpleTarget"),
                 targetInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         targetFactory.setProxyConfiguration(targetConfig);
         targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -263,7 +265,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -276,7 +278,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(new 
QualifiedName("target/SimpleTarget"),
                 targetInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         targetFactory.setProxyConfiguration(targetConfig);
         targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -310,7 +312,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -327,7 +329,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(new 
QualifiedName("target/SimpleTarget"),
                 targetInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         targetFactory.setProxyConfiguration(targetConfig);
         targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -360,7 +362,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -373,7 +375,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(new 
QualifiedName("target/SimpleTarget"),
                 targetInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         targetFactory.setProxyConfiguration(targetConfig);
         targetFactory.setBusinessInterface(SimpleTarget.class);
@@ -408,7 +410,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -419,7 +421,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(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=394431&r1=394430&r2=394431&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 21:27:44 2006
@@ -7,6 +7,8 @@
 import org.apache.tuscany.core.wire.MethodHashMap;
 import org.apache.tuscany.core.wire.WireConfiguration;
 import org.apache.tuscany.core.wire.ProxyFactory;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.wire.jdk.JDKProxyFactory;
 import org.apache.tuscany.core.wire.mock.SimpleTarget;
 import org.apache.tuscany.core.message.MessageFactory;
@@ -40,7 +42,7 @@
         ProxyFactory sourceFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> sourceInvocationConfigs = new 
MethodHashMap();
         sourceInvocationConfigs.put(hello, source);
-        WireConfiguration sourceConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration sourceConfig = new WireSourceConfiguration("foo",new 
QualifiedName("target/SimpleTarget"),
                 sourceInvocationConfigs, 
Thread.currentThread().getContextClassLoader(), msgFactory);
         sourceFactory.setProxyConfiguration(sourceConfig);
         sourceFactory.setBusinessInterface(SimpleTarget.class);
@@ -50,7 +52,7 @@
         ProxyFactory targetFactory = new JDKProxyFactory();
         Map<Method, InvocationConfiguration> targetInvocationConfigs = new 
MethodHashMap();
         targetInvocationConfigs.put(hello, target);
-        WireConfiguration targetConfig = new WireConfiguration(new 
QualifiedName("target/SimpleTarget"),
+        WireConfiguration targetConfig = new WireTargetConfiguration(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/wire/jdk/JDKProxyFactoryTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java?rev=394431&r1=394430&r2=394431&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java
 Sat Apr 15 21:27:44 2006
@@ -19,6 +19,7 @@
 import org.apache.tuscany.core.wire.InvocationConfiguration;
 import org.apache.tuscany.core.wire.MethodHashMap;
 import org.apache.tuscany.core.wire.WireConfiguration;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.mock.MockStaticInvoker;
 import org.apache.tuscany.core.wire.mock.MockSyncInterceptor;
@@ -50,7 +51,7 @@
         source.build();
         Map<Method, InvocationConfiguration> configs = new MethodHashMap();
         configs.put(hello, source);
-        WireConfiguration config = new WireConfiguration(new 
QualifiedName("foo"), configs, Thread.currentThread()
+        WireConfiguration config = new WireSourceConfiguration("foo",new 
QualifiedName("foo"), configs, Thread.currentThread()
                 .getContextClassLoader(), new MessageFactoryImpl());
         JDKProxyFactory factory = new JDKProxyFactory();
         factory.setProxyConfiguration(config);


Reply via email to