You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/26 23:13:33 UTC
svn commit: r381185 - in /incubator/tuscany/java/sca/container.java/src:
main/java/org/apache/tuscany/container/java/builder/
test/java/org/apache/tuscany/container/java/builder/
test/java/org/apache/tuscany/container/java/mock/binding/foo/
Author: jsdelfino
Date: Sun Feb 26 14:13:29 2006
New Revision: 381185
URL: http://svn.apache.org/viewcvs?rev=381185&view=rev
Log:
changed HashMaps to the new MethodHashMap to allow methods to be matched based on their signatures instead on strict equality
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java?rev=381185&r1=381184&r2=381185&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java Sun Feb 26 14:13:29 2006
@@ -29,6 +29,7 @@
import org.apache.tuscany.core.injection.SDOObjectFactory;
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.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -206,7 +207,7 @@
for (ConfiguredService configuredService : component.getConfiguredServices()) {
Service service = configuredService.getService();
ServiceContract serviceContract = service.getServiceContract();
- Map<Method, InvocationConfiguration> iConfigMap = new HashMap();
+ Map<Method, InvocationConfiguration> iConfigMap = new MethodHashMap();
ProxyFactory proxyFactory = proxyFactoryFactory.createProxyFactory();
Set<Method> javaMethods = JavaIntrospectionHelper.getAllUniqueMethods(serviceContract.getInterface());
for (Method method : javaMethods) {
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java?rev=381185&r1=381184&r2=381185&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java Sun Feb 26 14:13:29 2006
@@ -16,6 +16,7 @@
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
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.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactory;
@@ -57,7 +58,7 @@
source.addSourceInterceptor(sourceInterceptor);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -74,7 +75,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
Modified: incubator/tuscany/java/sca/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/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java?rev=381185&r1=381184&r2=381185&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java Sun Feb 26 14:13:29 2006
@@ -15,7 +15,6 @@
import java.lang.reflect.Method;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -27,6 +26,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.MethodHashMap;
import org.apache.tuscany.core.invocation.ProxyConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -118,7 +118,7 @@
ConfiguredService configuredService = es.getConfiguredService();
Service service = configuredService.getService();
ServiceContract serviceContract = service.getServiceContract();
- Map<Method, InvocationConfiguration> iConfigMap = new HashMap();
+ Map<Method, InvocationConfiguration> iConfigMap = new MethodHashMap();
ProxyFactory proxyFactory = proxyFactoryFactory.createProxyFactory();
Set<Method> javaMethods = JavaIntrospectionHelper.getAllUniqueMethods(serviceContract.getInterface());
for (Method method : javaMethods) {