You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/12 05:17:27 UTC
svn commit: r527756 - in /incubator/tuscany/java/sca/modules:
core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/
implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/
implementation-java-runtime...
Author: rfeng
Date: Wed Apr 11 20:17:25 2007
New Revision: 527756
URL: http://svn.apache.org/viewvc?view=rev&rev=527756
Log:
Merged changes back as they were lost during r527753
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCaseFIXME.java
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java Wed Apr 11 20:17:25 2007
@@ -61,8 +61,8 @@
Map<Operation, InvocationChain> chains = wire.getInvocationChains();
for (Map.Entry<Operation, InvocationChain> entry : chains.entrySet()) {
String opName = entry.getKey().getName();
- Operation sourceOperation = sourceContract.getOperation(opName);
- Operation targetOperation = targetContract.getOperation(opName);
+ Operation sourceOperation = sourceContract.getInterface().getOperation(opName);
+ Operation targetOperation = targetContract.getInterface().getOperation(opName);
String sourceDataBinding = sourceOperation.getDataBinding();
String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null && targetDataBinding == null) {
@@ -89,7 +89,7 @@
for (Map.Entry<Operation, InvocationChain> entry : callbackChains.entrySet()) {
String opName = entry.getKey().getName();
- Operation sourceOperation = sourceContract.getCallbackOperations().get(opName);
+ Operation sourceOperation = sourceContract.getCallbackInterface().getCallbackOperations().get(opName);
Operation targetOperation = targetContract.getCallbackOperations().get(opName);
String sourceDataBinding = sourceOperation.getDataBinding();
String targetDataBinding = targetOperation.getDataBinding();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java Wed Apr 11 20:17:25 2007
@@ -20,10 +20,10 @@
import java.lang.reflect.Method;
-import org.apache.tuscany.core.util.JavaIDLUtils;
import org.apache.tuscany.core.wire.WireObjectFactory;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.java.JavaInterface;
+import org.apache.tuscany.interfacedef.java.impl.JavaInterfaceUtil;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -50,7 +50,7 @@
implClass = configuration.getImplementationClass();
}
try {
- Method method = JavaIDLUtils.findMethod(implClass, operation);
+ Method method = JavaInterfaceUtil.findMethod(implClass, operation);
return new JavaTargetInvoker(method, this, scopeContainer);
} catch (NoSuchMethodException e) {
throw new TargetMethodNotFoundException(operation);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java Wed Apr 11 20:17:25 2007
@@ -159,7 +159,7 @@
wireList.addAll(attachWires);
JavaElement element = configuration.getDefinition().getReferenceMembers().get(referenceName);
- Class<?> type = ((JavaInterface)attachWires.get(0).getSourceContract().getInterfaceContract().getInterface()).getJavaClass();
+ Class<?> type = ((JavaInterface)attachWires.get(0).getSourceContract().getInterface()).getJavaClass();
if (type == null) {
throw new NoMultiplicityTypeException("Java interface must be specified for multiplicity", referenceName);
}
@@ -176,7 +176,7 @@
public void attachCallbackWire(Wire wire) {
assert wire.getSourceUri().getFragment() != null;
// FIXME: [rfeng] This is a hack to get it compiled
- String callbackName = wire.getSourceContract().getInterfaceContract().getCallbackInterface().toString();
+ String callbackName = wire.getSourceContract().getCallbackInterface().toString();
assert configuration.getDefinition().getCallbackMembers().get(callbackName) != null;
List<Wire> wireList = callBackwires.get(callbackName);
if (wireList == null) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java Wed Apr 11 20:17:25 2007
@@ -34,6 +34,7 @@
import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.core.wire.NoMethodForOperationException;
import org.apache.tuscany.core.wire.WireUtils;
+import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ReactivationException;
@@ -204,10 +205,10 @@
*/
private void init(Class<?> interfaze, Wire wire, Map<Method, ChainHolder> mapping)
throws NoMethodForOperationException {
- Contract contract = wire.getSourceContract();
+ InterfaceContract contract = wire.getSourceContract();
this.referenceName = wire.getSourceUri().getFragment();
- this.conversational = contract.getInterfaceContract().getInterface().isConversational();
- this.callback = contract.getInterfaceContract().getCallbackInterface() != null;
+ this.conversational = contract.getInterface().isConversational();
+ this.callback = contract.getCallbackInterface() != null;
// FIXME JFM this should not be dependent on PojoAtomicComponent
// JFM commenting out as this should not be specific to pojo types
// this.wireContainerIsAtomicComponent = scaObject instanceof PojoAtomicComponent;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator Wed Apr 11 20:17:25 2007
@@ -1,2 +1,2 @@
# Implementation class for the ModuleActivator
-org.apache.tuscany.implementation.java.module.RuntimeJavaModuleActivator
+org.apache.tuscany.implementation.java.module.JavaRuntimeModuleActivator
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java Wed Apr 11 20:17:25 2007
@@ -42,7 +42,7 @@
wire.setSourceUri(uri);
List<Wire> wires = new ArrayList<Wire>();
wires.add(wire);
- wire.setSourceContract(ModelHelper.createReference("foo", Foo.class));
+ wire.setSourceContract(ModelHelper.createReference("foo", Foo.class).getInterfaceContract());
JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wires, new WorkContextImpl());
Foo foo = (Foo)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {Foo.class}, handler);
assertNotNull(foo.toString());
@@ -50,7 +50,7 @@
public void testHashCode() {
Wire wire = new WireImpl();
- wire.setSourceContract(ModelHelper.createReference("foo", Foo.class));
+ wire.setSourceContract(ModelHelper.createReference("foo", Foo.class).getInterfaceContract());
URI uri = URI.create("#wire");
wire.setSourceUri(uri);
List<Wire> wires = new ArrayList<Wire>();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java Wed Apr 11 20:17:25 2007
@@ -53,15 +53,13 @@
public void testDifferentInterface() throws Throwable {
Wire wire = new WireImpl();
- Contract contract = new DefaultAssemblyFactory().createComponentReference();
JavaInterfaceContract interfaceContract = new JavaInterfaceContractImpl();
- contract.setInterfaceContract(interfaceContract);
interfaceContract.setInterface(introspector.introspect(Target.class));
- for (Operation operation : contract.getInterfaceContract().getInterface().getOperations()) {
+ for (Operation operation : interfaceContract.getInterface().getOperations()) {
InvocationChain chain = new InvocationChainImpl(operation);
wire.addInvocationChain(operation, chain);
}
- wire.setSourceContract(contract);
+ wire.setSourceContract(interfaceContract);
wire.setSourceUri(URI.create("foo#bar"));
TargetInvoker targetInvoker = EasyMock.createMock(TargetInvoker.class);
MessageImpl response = new MessageImpl();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java Wed Apr 11 20:17:25 2007
@@ -91,7 +91,7 @@
Contract opContract = ModelHelper.createReference("foo", Foo.class);
operation.setInterface(opContract.getInterfaceContract().getInterface());
map.put(operation, createChain(operation));
- EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
+ EasyMock.expect(wire.getSourceContract()).andReturn(contract.getInterfaceContract()).atLeastOnce();
URI uri = URI.create("#foo");
EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn(map).times(2);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java Wed Apr 11 20:17:25 2007
@@ -54,7 +54,7 @@
public void testToString() {
Wire wire = new WireImpl();
Contract contract = ModelHelper.createReference("foo", Foo.class);
- wire.setSourceContract(contract);
+ wire.setSourceContract(contract.getInterfaceContract());
wire.setSourceUri(URI.create("foo#bar"));
JDKInvocationHandler handler = new JDKInvocationHandler(Foo.class, wire, null);
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
@@ -64,7 +64,7 @@
public void testHashCode() {
Wire wire = new WireImpl();
Contract contract = ModelHelper.createReference("foo", Foo.class);
- wire.setSourceContract(contract);
+ wire.setSourceContract(contract.getInterfaceContract());
wire.setSourceUri(URI.create("foo#bar"));
JDKInvocationHandler handler = new JDKInvocationHandler(Foo.class, wire, null);
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
@@ -94,7 +94,7 @@
wire.addInvocationChain(op1, chain);
URI uri = URI.create("fooRef");
wire.setSourceUri(uri);
- wire.setSourceContract(contract);
+ wire.setSourceContract(contract.getInterfaceContract());
String convID = UUID.randomUUID().toString();
wc.setIdentifier(Scope.CONVERSATION, convID);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCaseFIXME.java?view=diff&rev=527756&r1=527755&r2=527756
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCaseFIXME.java Wed Apr 11 20:17:25 2007
@@ -40,7 +40,7 @@
Wire wire = new WireImpl();
wire.setSourceUri(uri);
Contract contract = new DefaultAssemblyFactory().createComponentReference();
- wire.setSourceContract(contract);
+ wire.setSourceContract(contract.getInterfaceContract());
TestInterface proxy = proxyService.createProxy(TestInterface.class, wire);
assertTrue(Proxy.isProxyClass(proxy.getClass()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org