Author: jmarino
Date: Fri May 5 00:02:57 2006
New Revision: 399996
URL: http://svn.apache.org/viewcvs?rev=399996&view=rev
Log:
spi refactorings
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageImpl.java
(contents, props changed)
- copied, changed from r399988,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OneWayInterceptor.java
(contents, props changed)
- copied, changed from r399988,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/OneWayInterceptor.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/NullWireFactory.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/OneWayInterceptor.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
Copied:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageImpl.java
(from r399988,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java)
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java&r1=399988&r2=399996&rev=399996&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageImpl.java
Fri May 5 00:02:57 2006
@@ -14,7 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tuscany.spi.wire;
+package org.apache.tuscany.core.wire;
+
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageChannel;
+import org.apache.tuscany.spi.wire.TargetInvoker;
/**
* The default implementation of a message flowed through a wire during an
invocation
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OneWayInterceptor.java
(from r399988,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/OneWayInterceptor.java)
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OneWayInterceptor.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OneWayInterceptor.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/OneWayInterceptor.java&r1=399988&r2=399996&rev=399996&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/OneWayInterceptor.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OneWayInterceptor.java
Fri May 5 00:02:57 2006
@@ -14,7 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tuscany.spi.wire;
+package org.apache.tuscany.core.wire;
+
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.MessageChannel;
+import org.apache.tuscany.spi.wire.Message;
/**
* An interceptor that sends the wire Message down its request channel and
does not expect a response.
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OneWayInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OneWayInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java?rev=399996&r1=399995&r2=399996&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
Fri May 5 00:02:57 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.spi.wire.InvocationConfiguration;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.core.wire.MessageImpl;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
Modified:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java?rev=399996&r1=399995&r2=399996&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
Fri May 5 00:02:57 2006
@@ -27,8 +27,9 @@
* runtime by a set of [EMAIL PROTECTED]
org.apache.tuscany.spi.builder.WireBuilder}s with the source-side holding
* references to the target.
* <p/>
- * <code>InvocationChain</code>s are managed by [EMAIL PROTECTED]
WireConfiguration}s, which are used by [EMAIL PROTECTED]
- * org.apache.tuscany.core.wire.WireFactory}s to buildSource wires and proxies.
+ * <code>InvocationChain</code>s are managed by [EMAIL PROTECTED]
WireSourceConfiguration}s and [EMAIL PROTECTED]
+ * WireTargetConfiguration}s, which are used by [EMAIL PROTECTED]
org.apache.tuscany.spi.wire.WireFactory}s to
+ * buildSource wires and proxies.
* <p/>
* Invocation configurations must contain at least one interceptor and may
have 0 to N handlers. Handlers
* process a wire request or response in a one-way fashion. A typical wire
sequence where interceptors and
Modified:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java?rev=399996&r1=399995&r2=399996&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
Fri May 5 00:02:57 2006
@@ -13,19 +13,23 @@
*/
package org.apache.tuscany.spi.wire;
-import org.apache.tuscany.spi.QualifiedName;
-
import java.lang.reflect.Method;
import java.util.Map;
+import org.apache.tuscany.spi.QualifiedName;
+
/**
* Contains configuration for the source side of a wire
*
* @version $Rev: 394379 $ $Date: 2006-04-15 15:01:36 -0700 (Sat, 15 Apr 2006)
$
*/
-public class WireSourceConfiguration extends
WireConfiguration<SourceInvocationConfiguration> {
+public class WireSourceConfiguration {
private String referenceName;
+ protected Map<Method, SourceInvocationConfiguration> configurations;
+ protected ClassLoader proxyClassLoader;
+ protected QualifiedName targetName;
+
/**
* Creates the source side of a wire
@@ -37,7 +41,12 @@
*/
public WireSourceConfiguration(String referenceName, QualifiedName
targetName,
Map<Method, SourceInvocationConfiguration>
invocationConfigs, ClassLoader proxyClassLoader) {
- super(targetName, proxyClassLoader);
+ this.targetName = targetName;
+ if (proxyClassLoader == null) {
+ this.proxyClassLoader =
Thread.currentThread().getContextClassLoader();
+ } else {
+ this.proxyClassLoader = proxyClassLoader;
+ }
this.referenceName = referenceName;
this.configurations = invocationConfigs;
}
@@ -52,6 +61,28 @@
public WireSourceConfiguration(QualifiedName targetName,
Map<Method, SourceInvocationConfiguration>
invocationConfigs, ClassLoader proxyClassLoader) {
this(null, targetName, invocationConfigs, proxyClassLoader);
+ }
+
+ /**
+ * Returns the qualified name of the target service specified by the wire
+ */
+ public QualifiedName getTargetName() {
+ return targetName;
+ }
+
+ /**
+ * Returns the classloader used for creating proxies
+ */
+ public ClassLoader getProxyClassLoader() {
+ return proxyClassLoader;
+ }
+
+ /**
+ * Returns the invocation configuration for each operation on a service
specified by a reference or a
+ * target service.
+ */
+ public Map<Method, SourceInvocationConfiguration>
getInvocationConfigurations() {
+ return configurations;
}
Modified:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java?rev=399996&r1=399995&r2=399996&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
Fri May 5 00:02:57 2006
@@ -10,7 +10,14 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class WireTargetConfiguration extends
WireConfiguration<TargetInvocationConfiguration> {
+public class WireTargetConfiguration {
+
+ protected Map<Method, TargetInvocationConfiguration> configurations;
+
+ protected ClassLoader proxyClassLoader;
+
+ protected QualifiedName targetName;
+
/**
* Creates the source side of a wire
@@ -21,10 +28,40 @@
*/
public WireTargetConfiguration(QualifiedName targetName, Map<Method,
TargetInvocationConfiguration> invocationConfigs,
ClassLoader proxyClassLoader) {
- super(targetName, proxyClassLoader);
+ this.targetName = targetName;
+ if (proxyClassLoader == null) {
+ this.proxyClassLoader =
Thread.currentThread().getContextClassLoader();
+ } else {
+ this.proxyClassLoader = proxyClassLoader;
+ }
assert (invocationConfigs != null) : "No wire configuration map
specified";
configurations = invocationConfigs;
}
+
+ /**
+ * Returns the qualified name of the target service specified by the wire
+ */
+ public QualifiedName getTargetName() {
+ return targetName;
+ }
+
+ /**
+ * Returns the classloader used for creating proxies
+ */
+ public ClassLoader getProxyClassLoader() {
+ return proxyClassLoader;
+ }
+
+ /**
+ * Returns the invocation configuration for each operation on a service
specified by a reference or a
+ * target service.
+ */
+ public Map<Method, TargetInvocationConfiguration>
getInvocationConfigurations() {
+ return configurations;
+ }
+
+
+
}
