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/05 07:48:01 UTC
svn commit: r525710 [2/2] - in /incubator/tuscany/java/sca/modules/core-spi:
./ src/ src/main/java/org/apache/tuscany/spi/
src/main/java/org/apache/tuscany/spi/builder/
src/main/java/org/apache/tuscany/spi/builder/interceptor/
src/main/java/org/apache/...
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/Resolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/Resolver.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/Resolver.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/Resolver.java Wed Apr 4 22:47:55 2007
@@ -18,14 +18,13 @@
*/
package org.apache.tuscany.spi.resolver;
-import org.apache.tuscany.spi.model.ModelObject;
/**
* Implementations are responsible for resolving resources referenced by an assembly model object
*
* @version $Rev$ $Date$
*/
-public interface Resolver<T extends ModelObject> {
+public interface Resolver {
/**
* Processes a model object, resolving resources referenced by it
@@ -34,5 +33,5 @@
* @param object the model object to process
* @throws ResolutionException
*/
- void resolve(ResolverRegistry registry, T object) throws ResolutionException;
+ void resolve(ResolverRegistry registry, Object object) throws ResolutionException;
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolverRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolverRegistry.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolverRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolverRegistry.java Wed Apr 4 22:47:55 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.spi.resolver;
-import org.apache.tuscany.spi.model.ModelObject;
/**
* Registry for resolvers that handle resolution of resources referenced by assembly model elements
@@ -34,19 +33,19 @@
* @param modelClass the type model element the resolver handles
* @param resolver the resolver to be registered
*/
- <T extends ModelObject> void register(Class<T> modelClass, Resolver<T> resolver);
+ void register(Class modelClass, Resolver resolver);
/**
* Unregister a resolver for a model type.
*
* @param modelClass the model type whose builder should be unregistered
*/
- <T extends ModelObject> void unregister(Class<T> modelClass);
+ void unregister(Class modelClass);
/**
* Initiates the resolution process
*
* @param object the top-level element to resolve
*/
- <T extends ModelObject> void resolve(T object) throws ResolutionException;
+ void resolve(Object object) throws ResolutionException;
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java Wed Apr 4 22:47:55 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.services.store;
-import org.apache.tuscany.api.TuscanyException;
+import org.apache.tuscany.spi.TuscanyException;
/**
* Represents a generic exception thrown by a <code>Store</code>
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java Wed Apr 4 22:47:55 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.services.store;
-import org.apache.tuscany.api.annotation.LogLevel;
+import org.apache.tuscany.spi.LogLevel;
/**
* A generic monintor interface for services to log events
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/work/WorkSchedulerException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/work/WorkSchedulerException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/work/WorkSchedulerException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/work/WorkSchedulerException.java Wed Apr 4 22:47:55 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.services.work;
-import org.apache.tuscany.api.TuscanyRuntimeException;
+import org.apache.tuscany.spi.TuscanyRuntimeException;
/**
* Exception thrown by the work scheduler in case of unexpected exceptions.
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java Wed Apr 4 22:47:55 2007
@@ -22,9 +22,9 @@
import java.net.URI;
import java.util.LinkedList;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.idl.Interface;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.spi.component.WorkContext;
/**
@@ -72,13 +72,13 @@
msg.setCorrelationId(workContext.getCorrelationId());
msg.setCallbackUris(workContext.getCallbackUris());
Operation operation = chain.getOperation();
- ServiceContract contract = operation.getServiceContract();
+ Interface contract = operation.getInterface();
if (contract.isConversational()) {
- int sequence = chain.getOperation().getConversationSequence();
- if (sequence == Operation.CONVERSATION_END) {
+ Operation.ConversationSequence sequence = chain.getOperation().getConversationSequence();
+ if (sequence == Operation.ConversationSequence.CONVERSATION_END) {
msg.setConversationSequence(TargetInvoker.END);
conversationStarted = false;
- } else if (sequence == Operation.CONVERSATION_CONTINUE) {
+ } else if (sequence == Operation.ConversationSequence.CONVERSATION_CONTINUE) {
if (conversationStarted) {
msg.setConversationSequence(TargetInvoker.CONTINUE);
} else {
@@ -112,13 +112,13 @@
if (callbackWires != null) {
msg.setCallbackWires(callbackWires);
}
- PhysicalOperationDefinition operation = chain.getPhysicalOperation();
+ Operation operation = chain.getOperation();
if (conversational) {
- int sequence = operation.getConversationSequence();
- if (sequence == Operation.CONVERSATION_END) {
+ Operation.ConversationSequence sequence = operation.getConversationSequence();
+ if (sequence == Operation.ConversationSequence.CONVERSATION_END) {
msg.setConversationSequence(TargetInvoker.END);
conversationStarted = false;
- } else if (sequence == Operation.CONVERSATION_CONTINUE) {
+ } else if (sequence == Operation.ConversationSequence.CONVERSATION_CONTINUE) {
if (conversationStarted) {
msg.setConversationSequence(TargetInvoker.CONTINUE);
} else {
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java Wed Apr 4 22:47:55 2007
@@ -19,10 +19,9 @@
package org.apache.tuscany.spi.wire;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.ServiceContract;
-
-import org.apache.tuscany.api.TuscanyException;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.spi.TuscanyException;
/**
* Denotes imcompatible service contracts for a wire
@@ -31,12 +30,12 @@
*/
public class IncompatibleServiceContractException extends TuscanyException {
private static final long serialVersionUID = 5127478601823295587L;
- private final ServiceContract<?> source;
- private final ServiceContract<?> target;
- private final Operation<?> sourceOperation;
- private final Operation<?> targetOperation;
+ private final Contract source;
+ private final Contract target;
+ private final Operation sourceOperation;
+ private final Operation targetOperation;
- public IncompatibleServiceContractException(String message, ServiceContract<?> source, ServiceContract<?> target) {
+ public IncompatibleServiceContractException(String message, Contract source, Contract target) {
super(message, (String) null);
this.source = source;
this.target = target;
@@ -46,9 +45,9 @@
public IncompatibleServiceContractException(String message,
- ServiceContract<?> source,
- ServiceContract<?> target,
- Operation<?> sourceOperation, Operation<?> targetOperation) {
+ Contract source,
+ Contract target,
+ Operation sourceOperation, Operation targetOperation) {
super(message, (String) null);
this.source = source;
this.target = target;
@@ -56,19 +55,19 @@
this.targetOperation = targetOperation;
}
- public ServiceContract<?> getTarget() {
+ public Contract getTarget() {
return target;
}
- public ServiceContract<?> getSource() {
+ public Contract getSource() {
return source;
}
- public Operation<?> getSourceOperation() {
+ public Operation getSourceOperation() {
return sourceOperation;
}
- public Operation<?> getTargetOperation() {
+ public Operation getTargetOperation() {
return targetOperation;
}
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java Wed Apr 4 22:47:55 2007
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.spi.wire;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
+import org.apache.tuscany.idl.Operation;
/**
* A wire consists of 1..n invocation chains associated with the operations of its source service contract.
@@ -45,13 +44,6 @@
* @return the target operation for this invocation chain
*/
Operation getOperation();
-
- /**
- * Returns the target physical operation for this invocation chain.
- *
- * @return the target physical operation for this invocation chain
- */
- PhysicalOperationDefinition getPhysicalOperation();
/**
* Sets the target invoker to pass down the chain
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java Wed Apr 4 22:47:55 2007
@@ -22,10 +22,9 @@
import java.util.List;
import java.util.Map;
+import org.apache.tuscany.assembly.Contract;
import org.osoa.sca.CallableReference;
-import org.apache.tuscany.spi.model.ServiceContract;
-
/**
* Creates proxies that implement Java interfaces and invocation handlers for fronting wires
*
@@ -114,8 +113,8 @@
* <p/>
* TODO JFM this method should be moved from this interface to the allocator phase
*/
- boolean checkCompatibility(ServiceContract<?> source,
- ServiceContract<?> target,
+ boolean checkCompatibility(Contract source,
+ Contract target,
boolean ignoreCallback,
boolean silent) throws IncompatibleServiceContractException;
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java Wed Apr 4 22:47:55 2007
@@ -20,13 +20,13 @@
import java.net.URI;
import java.util.Map;
+
import javax.xml.namespace.QName;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
/**
* The base wire type used to connect references and serviceBindings
@@ -77,7 +77,7 @@
* @return the service contract associated with the wire
* @Deprecated
*/
- ServiceContract getSourceContract();
+ Contract getSourceContract();
/**
* Sets the contract associated with the source side of the wire
@@ -85,7 +85,7 @@
* @param contract the contract associated with the wire
* @Deprecated
*/
- void setSourceContract(ServiceContract contract);
+ void setSourceContract(Contract contract);
/**
* Returns the service contract associated with the the target side of the wire
@@ -93,7 +93,7 @@
* @return the service contract associated with the wire
* @Deprecated
*/
- ServiceContract getTargetContract();
+ Contract getTargetContract();
/**
* Sets the contract associated with the the target side of the wire
@@ -101,7 +101,7 @@
* @param contract the contract associated with the wire
* @Deprecated
*/
- void setTargetContract(ServiceContract contract);
+ void setTargetContract(Contract contract);
/**
* Returns true if the wire is optimizable and its invocation chains may be bypassed
@@ -141,7 +141,7 @@
* @return the invocation chains for service operations associated with the wire
* @Deprecated
*/
- Map<Operation<?>, InvocationChain> getInvocationChains();
+ Map<Operation, InvocationChain> getInvocationChains();
/**
* Adds the invocation chain associated with the given operation
@@ -150,18 +150,7 @@
* @param chain the invocation chain
* @Deprecated
*/
- void addInvocationChain(Operation<?> operation, InvocationChain chain);
-
- /**
- * Adds the invocation chain associated with the given operation
- *
- * @param operation the service operation
- * @param chain the invocation chain
- * @Deprecated
- */
- void addInvocationChain(PhysicalOperationDefinition operation, InvocationChain chain);
-
- Map<PhysicalOperationDefinition, InvocationChain> getPhysicalInvocationChains();
+ void addInvocationChain(Operation operation, InvocationChain chain);
/**
* Returns the invocation chains for callback service operations associated with the wire
@@ -169,7 +158,7 @@
* @return the invocation chains for callback service operations associated with the wire
* @Deprecated
*/
- Map<Operation<?>, InvocationChain> getCallbackInvocationChains();
+ Map<Operation, InvocationChain> getCallbackInvocationChains();
/**
* Adds the callback invocation chain associated with the given operation
@@ -178,11 +167,6 @@
* @param chain the invocation chain
* @Deprecated
*/
- void addCallbackInvocationChain(Operation<?> operation, InvocationChain chain);
-
- Map<PhysicalOperationDefinition, InvocationChain> getCallbackPhysicalInvocationChains();
-
- void addCallbackInvocationChain(PhysicalOperationDefinition operation, InvocationChain chain);
-
+ void addCallbackInvocationChain(Operation operation, InvocationChain chain);
}
Added: incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/ScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/ScopeTestCase.java?view=auto&rev=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/ScopeTestCase.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/ScopeTestCase.java Wed Apr 4 22:47:55 2007
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.spi;
+
+import org.apache.tuscany.spi.Scope;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ScopeTestCase extends TestCase {
+
+ public void testEquals() throws Exception {
+ Scope scope = new Scope("COMPOSITE");
+ assertTrue(scope.equals(Scope.COMPOSITE));
+ }
+
+ public void testEqualsNew() throws Exception {
+ Scope foo = new Scope("foo");
+ Scope foo2 = new Scope("FOO");
+ assertTrue(foo.equals(foo2));
+ }
+
+ public void testNotEquals() throws Exception {
+ Scope foo = new Scope("BAR");
+ Scope foo2 = new Scope("FOO");
+ assertFalse(foo.equals(foo2));
+ }
+
+ public void testNotEqualsDifferent() throws Exception {
+ Scope foo = new Scope("FOO");
+ assertFalse(foo.equals(new Bar("FOO")));
+ }
+
+ public class Bar {
+ private String scope;
+
+ public Bar(String scope) {
+ this.scope = scope;
+ }
+ }
+
+
+}
Propchange: incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/ScopeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/ScopeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java Wed Apr 4 22:47:55 2007
@@ -20,7 +20,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.TuscanyRuntimeException;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AbstractComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AbstractComponentExtensionTestCase.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AbstractComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AbstractComponentExtensionTestCase.java Wed Apr 4 22:47:55 2007
@@ -21,17 +21,16 @@
import java.net.URI;
import java.util.List;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.TestCase;
import org.easymock.EasyMock;
/**
@@ -96,15 +95,11 @@
throw new UnsupportedOperationException();
}
- public TargetInvoker createTargetInvoker(String targetName, Operation operation)
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation, boolean isCallback)
throws TargetInvokerCreationException {
return null;
}
- public TargetInvoker createTargetInvoker(String targetName, PhysicalOperationDefinition operation)
- throws TargetInvokerCreationException {
- return null;
- }
};
}
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java Wed Apr 4 22:47:55 2007
@@ -21,19 +21,18 @@
import java.net.URI;
import java.util.List;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
import org.easymock.EasyMock;
/**
@@ -69,12 +68,7 @@
super(uri, null, null, URI.create("composite"), 0, -1, -1);
}
- public TargetInvoker createTargetInvoker(String targetName, Operation operation)
- throws TargetInvokerCreationException {
- throw new AssertionFailedError();
- }
-
- public TargetInvoker createTargetInvoker(String targetName, PhysicalOperationDefinition operation)
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation, boolean isCallback)
throws TargetInvokerCreationException {
throw new AssertionFailedError();
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java Wed Apr 4 22:47:55 2007
@@ -18,18 +18,18 @@
*/
package org.apache.tuscany.spi.extension;
-import java.lang.reflect.Type;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
-import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.TestCase;
import org.easymock.EasyMock;
/**
@@ -38,11 +38,10 @@
public class CompositeComponentExtensionTestCase extends TestCase {
private Component composite;
-
public void testCreateTargetInvoker() throws Exception {
ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
- EasyMock.expect(binding.createTargetInvoker(EasyMock.eq("service"), EasyMock.isA(Operation.class)))
- .andReturn(null);
+ EasyMock.expect(binding.createTargetInvoker(EasyMock.eq("service"), EasyMock.isA(Operation.class), EasyMock
+ .eq(false))).andReturn(null);
EasyMock.replay(binding);
List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
bindings.add(binding);
@@ -51,8 +50,9 @@
EasyMock.expect(service.getServiceBindings()).andReturn(bindings).atLeastOnce();
EasyMock.replay(service);
composite.register(service);
- Operation<Type> operation = new Operation<Type>("op", null, null, null);
- composite.createTargetInvoker("service", operation);
+ Operation operation = new OperationImpl();
+ operation.setName("op");
+ composite.createTargetInvoker("service", operation, false);
EasyMock.verify(binding);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org