Author: rfeng
Date: Fri Jun 25 19:06:09 2010
New Revision: 958084
URL: http://svn.apache.org/viewvc?rev=958084&view=rev
Log:
Fix compilation errors
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaAsyncImplementationInvoker.java
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/ResponseDispatchImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaAsyncImplementationInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaAsyncImplementationInvoker.java?rev=958084&r1=958083&r2=958084&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaAsyncImplementationInvoker.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaAsyncImplementationInvoker.java
Fri Jun 25 19:06:09 2010
@@ -21,17 +21,13 @@ package org.apache.tuscany.sca.implement
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Type;
import java.util.concurrent.TimeUnit;
-import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.core.factory.InstanceWrapper;
import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
+import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.oasisopen.sca.ResponseDispatch;
@@ -47,7 +43,7 @@ public class JavaAsyncImplementationInvo
public JavaAsyncImplementationInvoker(Operation operation, Method method,
RuntimeComponent component) {
super( operation, method, component);
assert method != null : "Operation method cannot be null";
- assert operation.isAsyncServer() : "Operation must be async";
+ assert ((JavaOperation) operation).isAsyncServer() : "Operation must
be async";
} // end constructor
public Message invoke(Message msg) {
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java?rev=958084&r1=958083&r2=958084&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
Fri Jun 25 19:06:09 2010
@@ -57,6 +57,7 @@ import org.apache.tuscany.sca.implementa
import
org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
import
org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -291,7 +292,7 @@ public class JavaComponentContextProvide
Class<?> implClass = instanceFactoryProvider.getImplementationClass();
Method method = JavaInterfaceUtil.findMethod(implClass, operation);
- if( operation.isAsyncServer() ) {
+ if( ((JavaOperation) operation).isAsyncServer() ) {
return new JavaAsyncImplementationInvoker(operation, method,
component);
} else {
return new JavaImplementationInvoker(operation, method,
component);
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/ResponseDispatchImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/ResponseDispatchImpl.java?rev=958084&r1=958083&r2=958084&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/ResponseDispatchImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/ResponseDispatchImpl.java
Fri Jun 25 19:06:09 2010
@@ -68,7 +68,6 @@ public class ResponseDispatchImpl<T> imp
/**
* Provide Context data for this ResponseDispatch that the service
implementation can use
*/
- @Override
public Map<String, Object> getContext() {
return null;
}
@@ -78,7 +77,6 @@ public class ResponseDispatchImpl<T> imp
* @param e - the Fault to send
* @throws IllegalStateException if either the sendResponse method or
the sendFault method have been called previously
*/
- @Override
public void sendFault(Throwable e) {
if( sendOK() ) {
lock.lock();
@@ -98,7 +96,6 @@ public class ResponseDispatchImpl<T> imp
* @throws IllegalStateException if either the sendResponse method or
the sendFault method have been called previously
* @param res - the response message, which is of type T
*/
- @Override
public void sendResponse(T res) {
if( sendOK() ) {
lock.lock();