Author: jmarino
Date: Wed Apr 19 01:07:36 2006
New Revision: 395162
URL: http://svn.apache.org/viewcvs?rev=395162&view=rev
Log:
Added constructor for WireSourceConfiguration; misc JavaDoc additions
Modified:
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/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
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/jdk/JDKInvocationHandler.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java
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=395162&r1=395161&r2=395162&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
Wed Apr 19 01:07:36 2006
@@ -124,7 +124,7 @@
iConfigMap.put(method, iConfig);
}
QualifiedName qName = new
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ '/' + service.getName());
- WireSourceConfiguration wireConfiguration = new
WireSourceConfiguration("ep",qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireSourceConfiguration wireConfiguration = new
WireSourceConfiguration(qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setConfiguration(wireConfiguration);
config.addSourceProxyFactory(service.getName(), proxyFactory);
Modified:
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java?rev=395162&r1=395161&r2=395162&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
Wed Apr 19 01:07:36 2006
@@ -120,7 +120,7 @@
}
QualifiedName qName = new
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ '/' + service.getName());
- WireSourceConfiguration wireConfiguration = new
WireSourceConfiguration("ep",qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireSourceConfiguration wireConfiguration = new
WireSourceConfiguration(qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setConfiguration(wireConfiguration);
config.addSourceProxyFactory(service.getName(), proxyFactory);
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=395162&r1=395161&r2=395162&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
Wed Apr 19 01:07:36 2006
@@ -122,7 +122,7 @@
iConfigMap.put(method, iConfig);
}
QualifiedName qName = new
QualifiedName(ep.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ '/' + service.getName());
- WireSourceConfiguration wireConfiguration = new
WireSourceConfiguration("foo",qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
+ WireSourceConfiguration wireConfiguration = new
WireSourceConfiguration(qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setConfiguration(wireConfiguration);
contextFactory.addSourceProxyFactory(service.getName(),
proxyFactory);
@@ -131,10 +131,6 @@
// invoke the reference builder to handle additional policy
metadata
policyBuilder.build(configuredService);
}
- // add tail interceptor
- //for (SourceInvocationConfiguration iConfig :
iConfigMap.values()) {
- // iConfig.addInterceptor(new InvokerInterceptor());
- //}
ep.setContextFactory(contextFactory);
} else if (object instanceof ExternalService) {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java?rev=395162&r1=395161&r2=395162&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
Wed Apr 19 01:07:36 2006
@@ -19,7 +19,7 @@
import java.lang.reflect.InvocationTargetException;
/**
- * Implementations are responsible for resolving a target and performing the
actual wire on it, for example, a
+ * Implementations are responsible for resolving a target and performing the
actual invocation on it, for example, a
* service component implementation instance or an external service client.
*
* @version $Rev$ $Date$
@@ -39,6 +39,9 @@
* Determines whether the proxy can be cached on the client/source side
*/
public boolean isCacheable();
-
+
+ /**
+ * Implementations must support deep cloning
+ */
public Object clone() throws CloneNotSupportedException;
}
Modified:
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=395162&r1=395161&r2=395162&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
Wed Apr 19 01:07:36 2006
@@ -40,11 +40,23 @@
public WireSourceConfiguration(String referenceName, QualifiedName
targetName,
Map<Method, SourceInvocationConfiguration>
invocationConfigs, ClassLoader proxyClassLoader, MessageFactory messageFactory)
{
super(targetName, proxyClassLoader, messageFactory);
- assert (referenceName != null) : "No wire reference name specified";
this.referenceName = referenceName;
this.configurations = invocationConfigs;
}
+ /**
+ * Creates the source side of a wire where the reference is "anonymous",
i.e. on an entry point
+ *
+ * @param targetName the qualified name of the target service
specified by the wire
+ * @param invocationConfigs a collection of service
operation-to-invocation chain mappings
+ * @param proxyClassLoader the classloader to use when creating a proxy
+ * @param messageFactory the factory used to create wire messages
+ */
+ public WireSourceConfiguration(QualifiedName targetName,
+ Map<Method, SourceInvocationConfiguration>
invocationConfigs, ClassLoader proxyClassLoader, MessageFactory messageFactory)
{
+ this(null, targetName, invocationConfigs, proxyClassLoader,
messageFactory);
+ }
+
/**
* Returns the name of the source reference
@@ -53,4 +65,4 @@
return referenceName;
}
- }
+}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java?rev=395162&r1=395161&r2=395162&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
Wed Apr 19 01:07:36 2006
@@ -54,7 +54,6 @@
for (Map.Entry<Method, ? extends InvocationConfiguration> entry :
configuration.entrySet()) {
this.configuration.put(entry.getKey(), new
ConfigHolder(entry.getValue()));
}
- // this.configuration = configuration;
this.messageFactory = messageFactory;
}
@@ -107,7 +106,7 @@
}
} else {
Message msg = messageFactory.createMessage();
- msg.setTargetInvoker(invoker);// config.getTargetInvoker());
+ msg.setTargetInvoker(invoker);
msg.setBody(args);
// dispatch the wire down the chain and get the response
Message resp = headInterceptor.invoke(msg);
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=395162&r1=395161&r2=395162&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
Wed Apr 19 01:07:36 2006
@@ -36,7 +36,7 @@
private static final int INITIALIZED = 1;
- private int state = JDKSourceWireFactory.UNINITIALIZED;
+ private int state = UNINITIALIZED;
private Class[] businessInterfaceArray;
@@ -45,7 +45,7 @@
private WireSourceConfiguration configuration;
public void initialize() throws ProxyInitializationException {
- if (state != JDKSourceWireFactory.UNINITIALIZED) {
+ if (state != UNINITIALIZED) {
throw new IllegalStateException("Proxy factory in wrong state [" +
state + "]");
}
Map<Method, SourceInvocationConfiguration> invocationConfigs =
configuration.getInvocationConfigurations();
@@ -54,11 +54,11 @@
Method method = entry.getKey();
methodToInvocationConfig.put(method, entry.getValue());
}
- state = JDKSourceWireFactory.INITIALIZED;
+ state = INITIALIZED;
}
public Object createProxy() {
- if (state != JDKSourceWireFactory.INITIALIZED) {
+ if (state != INITIALIZED) {
throw new IllegalStateException("Proxy factory not INITIALIZED ["
+ state + "]");
}
InvocationHandler handler = new
JDKInvocationHandler(configuration.getMessageFactory(),
methodToInvocationConfig);
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=395162&r1=395161&r2=395162&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
Wed Apr 19 01:07:36 2006
@@ -23,7 +23,7 @@
private static final int INITIALIZED = 1;
- private int state = JDKTargetWireFactory.UNINITIALIZED;
+ private int state = UNINITIALIZED;
private Class[] businessInterfaceArray;
@@ -32,7 +32,7 @@
private WireTargetConfiguration configuration;
public void initialize() throws ProxyInitializationException {
- if (state != JDKTargetWireFactory.UNINITIALIZED) {
+ if (state != UNINITIALIZED) {
throw new IllegalStateException("Proxy factory in wrong state [" +
state + "]");
}
Map<Method, TargetInvocationConfiguration> invocationConfigs =
configuration.getInvocationConfigurations();
@@ -41,11 +41,11 @@
Method method = entry.getKey();
methodToInvocationConfig.put(method, entry.getValue());
}
- state = JDKTargetWireFactory.INITIALIZED;
+ state = INITIALIZED;
}
public Object createProxy() {
- if (state != JDKTargetWireFactory.INITIALIZED) {
+ if (state != INITIALIZED) {
throw new IllegalStateException("Proxy factory not INITIALIZED ["
+ state + "]");
}
InvocationHandler handler = new
JDKInvocationHandler(configuration.getMessageFactory(),
methodToInvocationConfig);
