You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/04/23 17:27:48 UTC
svn commit: r396284 [4/4] - in /incubator/tuscany/java/sca:
bindings/binding.axis2/
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/config/
bindings/bi...
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java?rev=396284&r1=396283&r2=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java Sun Apr 23 08:27:42 2006
@@ -4,7 +4,7 @@
import org.apache.tuscany.core.wire.WireConfiguration;
import org.apache.tuscany.core.wire.ProxyCreationException;
import org.apache.tuscany.core.wire.WireFactory;
-import org.apache.tuscany.core.wire.ProxyInitializationException;
+import org.apache.tuscany.core.wire.WireFactoryInitException;
/**
* Returns an actual implementation instance as opposed to a proxy. Used in cases where proxying may be optimized away.
@@ -25,7 +25,7 @@
this.parentContext = parentContext;
}
- public void initialize(Class businessInterface, WireConfiguration config) throws ProxyInitializationException {
+ public void initialize(Class businessInterface, WireConfiguration config) throws WireFactoryInitException {
this.businessInterface = businessInterface;
}
@@ -33,7 +33,7 @@
return parentContext.getContext(targetName);
}
- public void initialize() throws ProxyInitializationException {
+ public void initialize() throws WireFactoryInitException {
}
public void setBusinessInterface(Class interfaze) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java?rev=396284&r1=396283&r2=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java Sun Apr 23 08:27:42 2006
@@ -14,7 +14,7 @@
package org.apache.tuscany.core.wire.jdk;
import org.apache.tuscany.core.wire.MethodHashMap;
-import org.apache.tuscany.core.wire.ProxyInitializationException;
+import org.apache.tuscany.core.wire.WireFactoryInitException;
import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
import org.apache.tuscany.core.wire.SourceWireFactory;
import org.apache.tuscany.core.wire.WireSourceConfiguration;
@@ -44,7 +44,7 @@
private WireSourceConfiguration configuration;
- public void initialize() throws ProxyInitializationException {
+ public void initialize() throws WireFactoryInitException {
if (state != UNINITIALIZED) {
throw new IllegalStateException("Proxy factory in wrong state [" + state + "]");
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java?rev=396284&r1=396283&r2=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java Sun Apr 23 08:27:42 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.wire.jdk;
import org.apache.tuscany.core.wire.MethodHashMap;
-import org.apache.tuscany.core.wire.ProxyInitializationException;
+import org.apache.tuscany.core.wire.WireFactoryInitException;
import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
import org.apache.tuscany.core.wire.TargetWireFactory;
import org.apache.tuscany.core.wire.WireTargetConfiguration;
@@ -31,7 +31,7 @@
private WireTargetConfiguration configuration;
- public void initialize() throws ProxyInitializationException {
+ public void initialize() throws WireFactoryInitException {
if (state != UNINITIALIZED) {
throw new IllegalStateException("Proxy factory in wrong state [" + state + "]");
}
Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java (from r396081, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryFactory.java&r1=396081&r2=396284&rev=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java Sun Apr 23 08:27:42 2006
@@ -13,28 +13,30 @@
*/
package org.apache.tuscany.core.wire.jdk;
-import org.apache.tuscany.core.wire.ProxyFactoryFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.osoa.sca.annotations.Scope;
+import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.core.wire.WireFactoryFactory;
import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
/**
- * Creates JDK Dynamic Proxy-based proxy factories
- *
+ * A system service that creates JDK dynamic proxy-based {@link org.apache.tuscany.core.wire.WireFactory}s
+ *
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class JDKProxyFactoryFactory implements ProxyFactoryFactory {
+@Service(interfaces = {WireFactoryFactory.class})
+public class JDKWireFactoryFactory implements WireFactoryFactory {
- public JDKProxyFactoryFactory() {
+ public JDKWireFactoryFactory() {
}
@Init(eager = true)
- public void init(){
+ public void init() {
}
public TargetWireFactory createTargetWireFactory() {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java?rev=396284&r1=396283&r2=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java Sun Apr 23 08:27:42 2006
@@ -18,7 +18,7 @@
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.core.wire.MethodHashMap;
-import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireFactoryFactory;
import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
import org.apache.tuscany.core.wire.SourceWireFactory;
import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
@@ -27,8 +27,10 @@
import org.apache.tuscany.core.wire.WireTargetConfiguration;
import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
import org.apache.tuscany.core.builder.system.PolicyBuilderRegistry;
+import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.ConfiguredReference;
+import org.apache.tuscany.model.assembly.EntryPoint;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
@@ -41,23 +43,26 @@
import java.util.ArrayList;
/**
- * The default implementation of the <code>WireFactoryService</code> in the runtime
+ * The default implementation of a <code>WireFactoryFactory</code>
*
* @version $$Rev$$ $$Date$$
*/
@Scope("MODULE")
-@Service(interfaces = {WireFactoryService.class})
-public class DefaultWireFactoryService implements WireFactoryService {
+@Service(interfaces = {org.apache.tuscany.core.wire.service.WireFactoryService.class})
+public class DefaultWireFactoryService implements org.apache.tuscany.core.wire.service.WireFactoryService {
private MessageFactory messageFactory;
+ private WireFactoryFactory wireFactoryFactory;
+ private PolicyBuilderRegistry policyRegistry;
+
public DefaultWireFactoryService() {
}
- public DefaultWireFactoryService(MessageFactory messageFactory, ProxyFactoryFactory proxyFactory, PolicyBuilderRegistry registry) {
+ public DefaultWireFactoryService(MessageFactory messageFactory, WireFactoryFactory wireFactoryFactory, PolicyBuilderRegistry registry) {
this.messageFactory = messageFactory;
- this.proxyFactory = proxyFactory;
+ this.wireFactoryFactory = wireFactoryFactory;
this.policyRegistry = registry;
}
@@ -66,15 +71,11 @@
this.messageFactory = messageFactory;
}
- private ProxyFactoryFactory proxyFactory;
-
@Autowire
- public void setProxyFactory(ProxyFactoryFactory proxyFactory) {
- this.proxyFactory = proxyFactory;
+ public void setWireFactoryService(WireFactoryFactory wireFactoryFactory) {
+ this.wireFactoryFactory = wireFactoryFactory;
}
- private PolicyBuilderRegistry policyRegistry;
-
@Autowire
public void setPolicyRegistry(PolicyBuilderRegistry policyRegistry) {
this.policyRegistry = policyRegistry;
@@ -84,16 +85,26 @@
public void init() {
}
- public List<SourceWireFactory> createSourceFactory(ConfiguredReference configuredReference){ //String referenceName, QualifiedName targetName, Class interfaze) {
+ public List<SourceWireFactory> createSourceFactory(ConfiguredReference configuredReference) throws BuilderConfigException{
String referenceName = configuredReference.getPort().getName();
- Class interfaze = configuredReference.getPort().getServiceContract().getInterface();
+ Class interfaze;
+ // FIXME hack for NPE when entry points with no set service contract on their configuredReference
+ if (configuredReference.getPort().getServiceContract() != null){
+ interfaze = configuredReference.getPort().getServiceContract().getInterface();
+ }else if(configuredReference.getPart() instanceof EntryPoint){
+ interfaze = ((EntryPoint)configuredReference.getPart()).getConfiguredService().getPort().getServiceContract().getInterface();
+ }else{
+ BuilderConfigException bce = new BuilderConfigException("No interface found on configured reference");
+ bce.setIdentifier(configuredReference.getName());
+ throw bce;
+ }
List<SourceWireFactory> wireFactories = new ArrayList<SourceWireFactory>();
List<WireSourceConfiguration> wireConfigurations = new ArrayList<WireSourceConfiguration>();
for (ConfiguredService configuredService : configuredReference.getTargetConfiguredServices()) {
String targetCompName = configuredService.getPart().getName();
String targetSerivceName = configuredService.getPort().getName();
QualifiedName targetName = new QualifiedName(targetCompName + QualifiedName.NAME_SEPARATOR + targetSerivceName);
- SourceWireFactory wireFactory = proxyFactory.createSourceWireFactory();
+ SourceWireFactory wireFactory = wireFactoryFactory.createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> iConfigMap = new HashMap<Method, SourceInvocationConfiguration>();
Set<Method> javaMethods = JavaIntrospectionHelper.getAllUniqueMethods(interfaze);
for (Method method : javaMethods) {
@@ -109,35 +120,12 @@
}
if (policyRegistry != null) {
// invoke policy builders
- policyRegistry.build(configuredReference, wireConfigurations);
+ policyRegistry.buildSource(configuredReference, wireConfigurations);
}
return wireFactories;
}
- //FIXME remove
- public SourceWireFactory createSourceFactory(QualifiedName targetName,ConfiguredService configuredService) {
- org.apache.tuscany.model.assembly.Service service = configuredService.getPort();
- Class interfaze = service.getServiceContract().getInterface();
- SourceWireFactory wireFactory = proxyFactory.createSourceWireFactory();
- Map<Method, SourceInvocationConfiguration> iConfigMap = new HashMap<Method, SourceInvocationConfiguration>();
- Set<Method> javaMethods = JavaIntrospectionHelper.getAllUniqueMethods(interfaze);
- for (Method method : javaMethods) {
- SourceInvocationConfiguration iConfig = new SourceInvocationConfiguration(method);
- iConfigMap.put(method, iConfig);
- }
- WireSourceConfiguration wireConfiguration = new WireSourceConfiguration(targetName, iConfigMap, interfaze.getClassLoader(),
- messageFactory);
- wireFactory.setBusinessInterface(interfaze);
- wireFactory.setConfiguration(wireConfiguration);
- //TODO policy builders are not invoked since this method should be removed if possible
-// if (policyRegistry != null) {
-// // invoke policy builders
-// policyRegistry.build(configuredService, wireConfiguration);
-// }
- return wireFactory;
- }
-
public TargetWireFactory createTargetFactory(ConfiguredService configuredService) {
org.apache.tuscany.model.assembly.Service service = configuredService.getPort();
Class interfaze = service.getServiceContract().getInterface();
@@ -145,7 +133,7 @@
+ service.getName());
Map<Method, TargetInvocationConfiguration> iConfigMap = new MethodHashMap<TargetInvocationConfiguration>();
- TargetWireFactory wireFactory = proxyFactory.createTargetWireFactory();
+ TargetWireFactory wireFactory = wireFactoryFactory.createTargetWireFactory();
Set<Method> javaMethods = JavaIntrospectionHelper.getAllUniqueMethods(interfaze);
for (Method method : javaMethods) {
TargetInvocationConfiguration iConfig = new TargetInvocationConfiguration(method);
@@ -156,7 +144,7 @@
wireFactory.setConfiguration(wireConfiguration);
if (policyRegistry != null) {
// invoke policy builders
- policyRegistry.build(configuredService, wireConfiguration);
+ policyRegistry.buildTarget(configuredService, wireConfiguration);
}
// add tail interceptor
for (TargetInvocationConfiguration iConfig : wireFactory.getConfiguration().getInvocationConfigurations().values()) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java?rev=396284&r1=396283&r2=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java Sun Apr 23 08:27:42 2006
@@ -13,31 +13,39 @@
*/
package org.apache.tuscany.core.wire.service;
+import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.wire.SourceWireFactory;
import org.apache.tuscany.core.wire.TargetWireFactory;
-import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.model.assembly.ConfiguredReference;
import org.apache.tuscany.model.assembly.ConfiguredService;
import java.util.List;
/**
- * Implementations are responsible for providing a system service that creates {@link org.apache.tuscany.core.wire.SourceWireFactory}s
- * and {@link org.apache.tuscany.core.wire.TargetWireFactory}s
+ * Implementations provide a system service that creates {@link org.apache.tuscany.core.wire.SourceWireFactory}s
+ * and {@link org.apache.tuscany.core.wire.TargetWireFactory}s. This service is used by {@link
+ * org.apache.tuscany.core.builder.ContextFactoryBuilder}s to provide {@link org.apache.tuscany.core.builder.ContextFactory}s with
+ * {@link org.apache.tuscany.core.wire.WireFactory}s for their references and target services. This service is typically autowired
+ * to.
*
* @version $$Rev$$ $$Date$$
*/
public interface WireFactoryService {
- public List<SourceWireFactory> createSourceFactory(ConfiguredReference configuredReference);
-
- public SourceWireFactory createSourceFactory(QualifiedName qName, ConfiguredService configuredService);
+ /**
+ * Creates the source-side wire factory for a reference
+ *
+ * @param configuredReference the configured reference to create the wire factory for
+ * @throws BuilderConfigException
+ */
+ public List<SourceWireFactory> createSourceFactory(ConfiguredReference configuredReference) throws BuilderConfigException;
/**
* Creates a target-side wire factory for a service implementing a given interface
*
* @param configuredService the configured service to create the wire factory for
+ * @throws BuilderConfigException
*/
- public TargetWireFactory createTargetFactory(ConfiguredService configuredService);
+ public TargetWireFactory createTargetFactory(ConfiguredService configuredService) throws BuilderConfigException;
}
Modified: incubator/tuscany/java/sca/core/src/main/resources/system.module
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/resources/system.module?rev=396284&r1=396283&r2=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/resources/system.module (original)
+++ incubator/tuscany/java/sca/core/src/main/resources/system.module Sun Apr 23 08:27:42 2006
@@ -59,8 +59,8 @@
<system:implementation.system class="org.apache.tuscany.core.message.impl.MessageFactoryImpl"/>
</component>
- <component name="org.apache.tuscany.core.wire.ProxyFactoryFactory">
- <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyFactoryFactory"/>
+ <component name="org.apache.tuscany.core.wire.WireFactoryFactory">
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireFactoryFactory"/>
</component>
</module>
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=396284&r1=396283&r2=396284&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 Sun Apr 23 08:27:42 2006
@@ -9,7 +9,7 @@
import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireFactoryFactory;
import org.apache.tuscany.core.wire.TargetWireFactory;
import org.apache.tuscany.core.wire.mock.SimpleTarget;
import org.apache.tuscany.core.wire.mock.MockHandler;
@@ -17,7 +17,7 @@
import org.apache.tuscany.core.wire.mock.MockStaticInvoker;
import org.apache.tuscany.core.wire.mock.SimpleTargetImpl;
import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
-import org.apache.tuscany.core.wire.jdk.JDKProxyFactoryFactory;
+import org.apache.tuscany.core.wire.jdk.JDKWireFactoryFactory;
import org.apache.tuscany.core.message.Message;
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
@@ -29,7 +29,7 @@
private Method hello;
- private ProxyFactoryFactory factory = new JDKProxyFactoryFactory();
+ private WireFactoryFactory wireFactoryFactory = new JDKWireFactoryFactory();
public DefaultWireBuilderTestCase() {
super();
@@ -54,7 +54,7 @@
source.addResponseHandler(sourceResponseHandler);
source.addInterceptor(sourceInterceptor);
- SourceWireFactory sourceFactory = factory.createSourceWireFactory();
+ SourceWireFactory sourceFactory = wireFactoryFactory.createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -71,7 +71,7 @@
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
@@ -83,7 +83,7 @@
DefaultWireBuilder builder = new DefaultWireBuilder();
// no need for scopes since we use a static invoker
builder.connect(sourceFactory, targetFactory, null, true, null);
- // source.build();
+ // source.buildSource();
target.build();
// set a static invoker
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
@@ -109,7 +109,7 @@
MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
source.addInterceptor(sourceInterceptor);
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -126,7 +126,7 @@
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
@@ -138,7 +138,7 @@
DefaultWireBuilder builder = new DefaultWireBuilder();
// no need for scopes since we use a static invoker
builder.connect(sourceFactory, targetFactory, null, true, null);
- // source.build();
+ // source.buildSource();
target.build();
// set a static invoker
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
@@ -164,7 +164,7 @@
source.addRequestHandler(sourceRequestHandler);
source.addInterceptor(sourceInterceptor);
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -179,7 +179,7 @@
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
@@ -191,7 +191,7 @@
DefaultWireBuilder builder = new DefaultWireBuilder();
// no need for scopes since we use a static invoker
builder.connect(sourceFactory, targetFactory, null, true, null);
- // source.build();
+ // source.buildSource();
target.build();
// set a static invoker
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
@@ -215,7 +215,7 @@
MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
source.addInterceptor(sourceInterceptor);
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -228,7 +228,7 @@
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
@@ -240,7 +240,7 @@
DefaultWireBuilder builder = new DefaultWireBuilder();
// no need for scopes since we use a static invoker
builder.connect(sourceFactory, targetFactory, null, true, null);
- // source.build();
+ // source.buildSource();
target.build();
// set a static invoker
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
@@ -266,7 +266,7 @@
source.addResponseHandler(sourceResponseHandler);
source.addInterceptor(sourceInterceptor);
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -279,7 +279,7 @@
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
@@ -291,7 +291,7 @@
DefaultWireBuilder builder = new DefaultWireBuilder();
// no need for scopes since we use a static invoker
builder.connect(sourceFactory, targetFactory, null, true, null);
- // source.build();
+ // source.buildSource();
target.build();
// set a static invoker
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
@@ -313,7 +313,7 @@
SourceInvocationConfiguration source = new SourceInvocationConfiguration(hello);
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -330,7 +330,7 @@
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
@@ -342,7 +342,7 @@
DefaultWireBuilder builder = new DefaultWireBuilder();
// no need for scopes since we use a static invoker
builder.connect(sourceFactory, targetFactory, null, true, null);
- // source.build();
+ // source.buildSource();
target.build();
// set a static invoker
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
@@ -363,7 +363,7 @@
SourceInvocationConfiguration source = new SourceInvocationConfiguration(hello);
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -376,7 +376,7 @@
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
@@ -411,7 +411,7 @@
SourceInvocationConfiguration source = new SourceInvocationConfiguration(hello);
source.setTargetInterceptor(new InvokerInterceptor());
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -422,7 +422,7 @@
TargetInvocationConfiguration target = new TargetInvocationConfiguration(hello);
target.addInterceptor(new InvokerInterceptor());
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
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=396284&r1=396283&r2=396284&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 Sun Apr 23 08:27:42 2006
@@ -10,8 +10,8 @@
import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
import org.apache.tuscany.core.wire.SourceWireFactory;
import org.apache.tuscany.core.wire.TargetWireFactory;
-import org.apache.tuscany.core.wire.ProxyFactoryFactory;
-import org.apache.tuscany.core.wire.jdk.JDKProxyFactoryFactory;
+import org.apache.tuscany.core.wire.WireFactoryFactory;
+import org.apache.tuscany.core.wire.jdk.JDKWireFactoryFactory;
import org.apache.tuscany.core.wire.mock.SimpleTarget;
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
@@ -23,7 +23,7 @@
private Method hello;
- private ProxyFactoryFactory factory = new JDKProxyFactoryFactory();
+ private WireFactoryFactory wireFactoryFactory = new JDKWireFactoryFactory();
public NegativeDefaultWireBuilderTestCase() {
super();
@@ -42,7 +42,7 @@
SourceInvocationConfiguration source = new SourceInvocationConfiguration(hello);
- SourceWireFactory sourceFactory = new JDKProxyFactoryFactory().createSourceWireFactory();
+ SourceWireFactory sourceFactory = new JDKWireFactoryFactory().createSourceWireFactory();
Map<Method, SourceInvocationConfiguration> sourceInvocationConfigs = new MethodHashMap<SourceInvocationConfiguration>();
sourceInvocationConfigs.put(hello, source);
WireSourceConfiguration sourceConfig = new WireSourceConfiguration("foo",new QualifiedName("target/SimpleTarget"),
@@ -52,7 +52,7 @@
TargetInvocationConfiguration target = new TargetInvocationConfiguration(hello);
- TargetWireFactory targetFactory = factory.createTargetWireFactory();
+ TargetWireFactory targetFactory = wireFactoryFactory.createTargetWireFactory();
Map<Method, TargetInvocationConfiguration> targetInvocationConfigs = new MethodHashMap<TargetInvocationConfiguration>();
targetInvocationConfigs.put(hello, target);
WireTargetConfiguration targetConfig = new WireTargetConfiguration(new QualifiedName("target/SimpleTarget"),
Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java (from r396081, 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/JDKWireFactoryFactoryTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java&r1=396081&r2=396284&rev=396284&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/JDKWireFactoryFactoryTestCase.java Sun Apr 23 08:27:42 2006
@@ -31,11 +31,11 @@
import java.lang.reflect.Method;
import java.util.Map;
-public class JDKProxyFactoryTestCase extends TestCase {
+public class JDKWireFactoryFactoryTestCase extends TestCase {
private Method hello;
- public JDKProxyFactoryTestCase(String arg0) {
+ public JDKWireFactoryFactoryTestCase(String arg0) {
super(arg0);
}
Modified: incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java?rev=396284&r1=396283&r2=396284&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java Sun Apr 23 08:27:42 2006
@@ -69,7 +69,7 @@
host.setAppBase(appBase.getAbsolutePath());
engine.addChild(host);
- // build a empty request/response
+ // buildSource a empty request/response
Connector connector = new Connector("HTTP/1.1");
request = new MockRequest();
request.setConnector(connector);