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/09 19:47:58 UTC
svn commit: r526852 [1/2] - in /incubator/tuscany/java/sca/modules: ./
implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/
implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/
implementati...
Author: rfeng
Date: Mon Apr 9 10:47:45 2007
New Revision: 526852
URL: http://svn.apache.org/viewvc?view=rev&rev=526852
Log:
[work-in-progress] More code porting for implementation-java-runtime. Now it compiles.
Added:
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java (with props)
Removed:
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/org/
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/integration/
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactory2TestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/implementation/
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/mock/binding/
Modified:
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/ReflectiveInstanceFactoryProviderTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicConstructorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicPojoProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeutisticExtensibleConstructorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaElement.java
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Parameter.java
incubator/tuscany/java/sca/modules/pom.xml
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java Mon Apr 9 10:47:45 2007
@@ -50,6 +50,7 @@
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
import org.apache.tuscany.implementation.java.impl.Parameter;
+import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
@@ -233,7 +234,7 @@
}
}
- Class<?> type = attachWires.get(0).getSourceContract().getInterfaceClass();
+ Class<?> type = ((JavaInterface) attachWires.get(0).getSourceContract().getInterface()).getJavaClass();
if (type == null) {
throw new NoMultiplicityTypeException("Java interface must be specified for multiplicity", referenceName);
}
@@ -243,7 +244,8 @@
public void attachCallbackWire(Wire wire) {
assert wire.getSourceUri().getFragment() != null;
- String callbackName = wire.getSourceContract().getCallbackName();
+ // FIXME: [rfeng] This is a hack to get it compiled
+ String callbackName = wire.getSourceContract().getCallbackInterface().toString();
assert callbackSites.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/core/implementation/PojoComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java Mon Apr 9 10:47:45 2007
@@ -202,8 +202,7 @@
throw new UnsupportedOperationException();
}
- @Deprecated
- public TargetInvoker createTargetInvoker(String targetName, Operation operation)
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation, boolean isCallback)
throws TargetInvokerCreationException {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java Mon Apr 9 10:47:45 2007
@@ -25,6 +25,7 @@
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.spi.ObjectFactory;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -46,7 +47,7 @@
Class<?> implClass;
if (isCallback) {
- implClass = operation.getServiceContract().getCallbackClass();
+ implClass = ((JavaInterface) operation.getInterface()).getJavaClass();
} else {
implClass = implementationClass;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Mon Apr 9 10:47:45 2007
@@ -21,8 +21,12 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
+import java.net.URI;
import org.apache.tuscany.assembly.Component;
+import org.apache.tuscany.assembly.ComponentProperty;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.core.implementation.PojoComponentContextFactory;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.injection.MethodEventInvoker;
@@ -80,19 +84,19 @@
configuration.setGroupId(context.getGroupId());
configuration.setProxyService(proxyService);
configuration.setWorkContext(workContext);
- configuration.setImplementationClass(definition.getImplementation().getImplementationClass());
+ configuration.setImplementationClass(((JavaImplementation) definition.getImplementation()).getJavaClass());
// setup property injection sites
for (JavaElement property : componentType.getPropertyMembers().values()) {
- configuration.addPropertySite(property.getName(), property);
+ configuration.addPropertySite(property.getName(), (Member) property.getAnchor());
}
// setup reference injection sites
for (JavaElement reference : componentType.getReferenceMembers().values()) {
- Member member = reference.getMember();
+ Member member = (Member) reference.getAnchor();
if (member != null) {
// could be null if the reference is mapped to a constructor
- configuration.addReferenceSite(reference.getUri().getFragment(), member);
+ configuration.addReferenceSite(reference.getName(), member);
}
}
@@ -111,7 +115,8 @@
configuration.setInstanceFactory(instanceFactory);
configuration.setConstructor(ctorDef);
- configuration.setName(definition.getUri());
+ // FIXME: [rfeng] Hack
+ configuration.setName(URI.create(definition.getName()));
handleCallbackSites(componentType, configuration);
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
@@ -130,24 +135,24 @@
}
private void handleCallbackSites(
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType,
+ JavaImplementationDefinition componentType,
PojoConfiguration configuration) {
- for (JavaMappedService service : componentType.getServices().values()) {
+ for (Service service : componentType.getServices()) {
// setup callback injection sites
- String name = service.getServiceContract().getCallbackName();
- if (name != null) {
+ JavaElement element = componentType.getCallbackMembers().get(service.getName());
+ if (element != null) {
// Only if there is a callback reference in the service
- configuration.addCallbackSite(name, service.getCallbackMember());
+ configuration.addCallbackSite(service.getName(), (Member) element.getAnchor());
}
}
}
private void handleResources(
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType,
+ JavaImplementationDefinition componentType,
JavaAtomicComponent component) {
for (Resource<?> resource : componentType.getResources().values()) {
String name = resource.getName();
- ObjectFactory<?> objectFactory = resource.getObjectFactory();
+ ObjectFactory<?> objectFactory = null;
if (objectFactory == null) {
Class<?> type = resource.getType();
if (ComponentContext.class.equals(type)) {
@@ -170,12 +175,15 @@
}
private void handleProperties(Component definition, JavaAtomicComponent component) {
- for (PropertyValue<?> property : definition.getPropertyValues().values()) {
+ throw new UnsupportedOperationException("Not implemented");
+ /*
+ for (ComponentProperty property : definition.getProperties()) {
ObjectFactory<?> factory = property.getValueFactory();
if (factory != null) {
component.addPropertyFactory(property.getName(), factory);
}
}
+ */
}
protected Class<JavaImplementation> getImplementationType() {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/ReflectiveInstanceFactoryProviderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/ReflectiveInstanceFactoryProviderTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/ReflectiveInstanceFactoryProviderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/ReflectiveInstanceFactoryProviderTestCase.java Mon Apr 9 10:47:45 2007
@@ -32,18 +32,20 @@
import org.apache.tuscany.core.injection.FieldInjector;
import org.apache.tuscany.core.injection.Injector;
import org.apache.tuscany.core.injection.MethodInjector;
+import org.apache.tuscany.implementation.java.impl.JavaElement;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.TargetInitializationException;
import org.easymock.EasyMock;
+import org.osoa.sca.annotations.Property;
/**
* @version $Rev$ $Date$
*/
public class ReflectiveInstanceFactoryProviderTestCase extends TestCase {
private Constructor<Foo> argConstructor;
- private List<InjectionSource> ctrNames;
- private Map<InjectionSource, Member> sites;
+ private List<JavaElement> ctrNames;
+ private Map<JavaElement, Member> sites;
private ObjectFactory intFactory;
private ObjectFactory stringFactory;
private ReflectiveInstanceFactoryProvider<Foo> provider;
@@ -51,8 +53,8 @@
private Field stringField;
private Method intSetter;
private Method stringSetter;
- private InjectionSource intProperty = new InjectionSource(InjectionSource.ValueSourceType.PROPERTY, "int");
- private InjectionSource stringProperty = new InjectionSource(InjectionSource.ValueSourceType.PROPERTY, "string");
+ private JavaElement intProperty = new JavaElement("int", int.class, Property.class);
+ private JavaElement stringProperty = new JavaElement("string", String.class, Property.class);
public void testNoConstructorArgs() {
ObjectFactory<?>[] args = provider.getConstructorArgs();
@@ -62,11 +64,7 @@
public void testConstructorArgs() {
ctrNames.add(intProperty);
ctrNames.add(stringProperty);
- provider = new ReflectiveInstanceFactoryProvider<Foo>(argConstructor,
- ctrNames,
- sites,
- null,
- null);
+ provider = new ReflectiveInstanceFactoryProvider<Foo>(argConstructor, ctrNames, sites, null, null);
provider.setObjectFactory(intProperty, intFactory);
provider.setObjectFactory(stringProperty, stringFactory);
ObjectFactory<?>[] args = provider.getConstructorArgs();
@@ -132,13 +130,9 @@
stringField = Foo.class.getField("stringField");
intSetter = Foo.class.getMethod("setIntField", int.class);
stringSetter = Foo.class.getMethod("setStringField", String.class);
- ctrNames = new ArrayList<InjectionSource>();
- sites = new HashMap<InjectionSource, Member>();
- provider = new ReflectiveInstanceFactoryProvider<Foo>(noArgConstructor,
- ctrNames,
- sites,
- null,
- null);
+ ctrNames = new ArrayList<JavaElement>();
+ sites = new HashMap<JavaElement, Member>();
+ provider = new ReflectiveInstanceFactoryProvider<Foo>(noArgConstructor, ctrNames, sites, null, null);
intFactory = EasyMock.createMock(ObjectFactory.class);
stringFactory = EasyMock.createMock(ObjectFactory.class);
EasyMock.expect(intFactory.getInstance()).andReturn(34);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java Mon Apr 9 10:47:45 2007
@@ -20,19 +20,18 @@
import java.net.URI;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.injection.EventInvoker;
+import org.apache.tuscany.core.injection.PojoObjectFactory;
+import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
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.apache.tuscany.core.injection.EventInvoker;
-import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.easymock.EasyMock;
/**
@@ -151,12 +150,7 @@
return factory;
}
- public TargetInvoker createTargetInvoker(String targetName, Operation operation)
- throws TargetInvokerCreationException {
- return null;
- }
-
- public TargetInvoker createTargetInvoker(String targetName, PhysicalOperationDefinition operation)
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation, boolean isCallback)
throws TargetInvokerCreationException {
return null;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java Mon Apr 9 10:47:45 2007
@@ -20,78 +20,87 @@
import java.net.URI;
-import org.apache.tuscany.spi.ObjectFactory;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.ComponentProperty;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
+import org.apache.tuscany.implementation.java.impl.JavaElement;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.impl.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.PropertyValue;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.easymock.EasyMock;
/**
- * Verifies that the java component builder handles configured properties correctly
- *
+ * Verifies that the java component builder handles configured properties
+ * correctly
+ *
* @version $Rev$ $Date$
*/
public class JavaBuilderPropertyTestCase extends TestCase {
private DeploymentContext deploymentContext;
private Component parent;
private ScopeRegistry registry;
+ private AssemblyFactory factory = new DefaultAssemblyFactory();
@SuppressWarnings("unchecked")
public void testPropertyHandling() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setScopeRegistry(registry);
- PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>> type =
- new PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>>();
- JavaMappedProperty<String> property = new JavaMappedProperty<String>();
+ JavaImplementationDefinition type = new JavaImplementationDefinition();
+ Property property = factory.createProperty();
property.setName("test");
- property.setDefaultValueFactory(new SingletonObjectFactory<String>("foo"));
- property.setMember(JavaBuilderPropertyTestCase.Foo.class.getMethod("setTest", String.class));
- type.add(property);
- type.setConstructorDefinition(new ConstructorDefinition<Foo>(Foo.class.getConstructor((Class[]) null)));
- type.setImplementationScope(Scope.STATELESS);
- JavaImplementation impl = new JavaImplementation(Foo.class, type);
- ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
- definition.setUri(URI.create("component"));
- PropertyValue propertyValue = new PropertyValue(property.getName(), property.getDefaultValueFactory());
- definition.getPropertyValues().put(property.getName(), propertyValue);
+ // property.setDefaultValueFactory(new
+ // SingletonObjectFactory<String>("foo"));
+ JavaElement element = new JavaElement(JavaBuilderPropertyTestCase.Foo.class.getMethod("setTest", String.class),
+ 0);
+ type.getPropertyMembers().put("test", element);
+ type.getProperties().add(property);
+ type.setConstructorDefinition(new ConstructorDefinition<Foo>(Foo.class.getConstructor((Class[])null)));
+ type.setScope(Scope.STATELESS);
+ type.setJavaClass(Foo.class);
+ org.apache.tuscany.assembly.Component definition = factory.createComponent();
+ definition.setImplementation(type);
+ definition.setName("component");
+ ComponentProperty propertyValue = factory.createComponentProperty();
+ propertyValue.setName(property.getName());
+ definition.getProperties().add(propertyValue);
AtomicComponent component = builder.build(definition, deploymentContext);
- JavaBuilderPropertyTestCase.Foo foo = (JavaBuilderPropertyTestCase.Foo) component.createInstance();
+ JavaBuilderPropertyTestCase.Foo foo = (JavaBuilderPropertyTestCase.Foo)component.createInstance();
assertEquals("foo", foo.getTest());
}
public void testIntPropertyHandling() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setScopeRegistry(registry);
- PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>> type =
- new PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>>();
- JavaMappedProperty<Integer> property = new JavaMappedProperty<Integer>();
+ JavaImplementationDefinition type = new JavaImplementationDefinition();
+ Property property = factory.createProperty();
property.setName("test");
- property.setDefaultValueFactory(new SingletonObjectFactory<Integer>(1));
- property.setMember(JavaBuilderPropertyTestCase.FooInt.class.getMethod("setTest", Integer.TYPE));
- type.add(property);
- type.setConstructorDefinition(new ConstructorDefinition<FooInt>(FooInt.class.getConstructor((Class[]) null)));
- type.setImplementationScope(Scope.STATELESS);
- JavaImplementation impl = new JavaImplementation(Foo.class, type);
- ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
- definition.setUri(URI.create("component"));
- ObjectFactory<Integer> defaultValueFactory = property.getDefaultValueFactory();
- PropertyValue<Integer> propertyValue = new PropertyValue<Integer>(property.getName(), defaultValueFactory);
- definition.getPropertyValues().put(property.getName(), propertyValue);
+ // property.setDefaultValueFactory(new
+ // SingletonObjectFactory<Integer>(1));
+ JavaElement element = new JavaElement(JavaBuilderPropertyTestCase.Foo.class.getMethod("setTest", String.class),
+ 0);
+ type.getPropertyMembers().put("test", element);
+ type.getProperties().add(property);
+ type.setConstructorDefinition(new ConstructorDefinition<FooInt>(FooInt.class.getConstructor((Class[])null)));
+ type.setScope(Scope.STATELESS);
+ type.setJavaClass(Foo.class);
+ org.apache.tuscany.assembly.Component definition = factory.createComponent();
+ definition.setImplementation(type);
+ definition.setName("component");
+ // ObjectFactory<Integer> defaultValueFactory =
+ // property.getDefaultValueFactory();
+ ComponentProperty propertyValue = factory.createComponentProperty();
+ propertyValue.setName(property.getName());
+ definition.getProperties().add(propertyValue);
AtomicComponent component = builder.build(definition, deploymentContext);
- FooInt foo = (FooInt) component.createInstance();
+ FooInt foo = (FooInt)component.createInstance();
assertEquals(1, foo.getTest());
}
@@ -104,7 +113,8 @@
ScopeContainer mockContainer = EasyMock.createNiceMock(ScopeContainer.class);
EasyMock.replay(mockContainer);
registry = EasyMock.createMock(ScopeRegistry.class);
- EasyMock.expect(registry.getScopeContainer(EasyMock.isA(Scope.class))).andReturn(mockContainer);
+ EasyMock.expect(registry.getScopeContainer(EasyMock.isA(org.apache.tuscany.spi.Scope.class)))
+ .andReturn(mockContainer);
EasyMock.replay(registry);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java Mon Apr 9 10:47:45 2007
@@ -21,20 +21,20 @@
import java.lang.reflect.Field;
import java.net.URI;
-import org.osoa.sca.annotations.ConversationID;
+import junit.framework.TestCase;
+import org.apache.tuscany.assembly.Component;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
import org.easymock.EasyMock;
+import org.osoa.sca.annotations.ConversationID;
/**
* @version $Rev: 473859 $ $Date: 2006-11-11 22:31:55 -0500 (Sat, 11 Nov 2006) $
@@ -57,17 +57,18 @@
builder.setWorkContext(workContext);
ConstructorDefinition<Foo> ctorDef = new ConstructorDefinition<Foo>(Foo.class.getConstructor());
- PojoComponentType type = new PojoComponentType();
+ JavaImplementationDefinition type = new JavaImplementationDefinition();
Field field = Foo.class.getDeclaredField("conversationID");
type.setConversationIDMember(field);
- type.setImplementationScope(Scope.STATELESS);
+ type.setScope(org.apache.tuscany.implementation.java.impl.Scope.STATELESS);
type.setConstructorDefinition(ctorDef);
+ type.setJavaClass(Foo.class);
- JavaImplementation impl = new JavaImplementation(Foo.class, type);
URI uri = URI.create("foo");
- ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(uri, impl);
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, ctx);
- Foo foo = (Foo) component.createInstance();
+ Component definition = new DefaultAssemblyFactory().createComponent();
+ definition.setImplementation(type);
+ JavaAtomicComponent component = (JavaAtomicComponent)builder.build(definition, ctx);
+ Foo foo = (Foo)component.createInstance();
assertEquals("convID", foo.conversationID);
}
@@ -81,5 +82,3 @@
}
}
-
-
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java Mon Apr 9 10:47:45 2007
@@ -23,68 +23,62 @@
import junit.framework.TestCase;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.ComponentReference;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
+import org.apache.tuscany.implementation.java.impl.JavaElement;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.impl.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceContract;
import org.easymock.EasyMock;
/**
* Verifies component type metadata is properly applied to the component
- *
- * @version $$Rev$$ $$Date$$
+ *
+ * @version $$Rev$$ $$Date: 2007-03-29 20:36:39 -0700 (Thu, 29 Mar
+ * 2007) $$
*/
public class JavaComponentBuilderMetadataTestCase extends TestCase {
private DeploymentContext deploymentContext;
private Constructor<SourceImpl> constructor;
private Component parent;
- private PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type;
- private ComponentDefinition<JavaImplementation> definition;
+ private JavaImplementationDefinition type;
+ private org.apache.tuscany.assembly.Component definition;
private ScopeContainer scopeContainer;
-
- public void testInitLevel() throws Exception {
- type.setInitLevel(1);
- JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
- assertEquals(1, component.getInitLevel());
- }
+ private AssemblyFactory factory = new DefaultAssemblyFactory();
public void testMaxAge() throws Exception {
type.setMaxAge(100);
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent)builder.build(definition, deploymentContext);
assertEquals(100, component.getMaxAge());
}
public void testMaxIdleTime() throws Exception {
type.setMaxIdleTime(100);
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent)builder.build(definition, deploymentContext);
assertEquals(100, component.getMaxIdleTime());
}
public void testNoMaxAgeNoMaxIdleTime() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent)builder.build(definition, deploymentContext);
assertEquals(-1, component.getMaxAge());
assertEquals(-1, component.getMaxIdleTime());
}
public void testScope() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent)builder.build(definition, deploymentContext);
component.setScopeContainer(scopeContainer);
assertEquals(Scope.COMPOSITE, component.getScope());
}
@@ -94,19 +88,18 @@
parent = EasyMock.createMock(Component.class);
EasyMock.expect(parent.getUri()).andReturn(URI.create("parent")).anyTimes();
EasyMock.replay(parent);
- constructor = SourceImpl.class.getConstructor((Class[]) null);
+ constructor = SourceImpl.class.getConstructor((Class[])null);
createDeploymentContext();
createComponentDefinitionAndType();
}
-
private void createDeploymentContext() {
scopeContainer = EasyMock.createMock(ScopeContainer.class);
scopeContainer.start();
scopeContainer.stop();
scopeContainer.register(EasyMock.isA(AtomicComponent.class), EasyMock.isA(URI.class));
EasyMock.expectLastCall().atLeastOnce();
- EasyMock.expect(scopeContainer.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
+ EasyMock.expect(scopeContainer.getScope()).andReturn(org.apache.tuscany.spi.Scope.COMPOSITE).atLeastOnce();
EasyMock.replay(scopeContainer);
deploymentContext = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(deploymentContext.getGroupId()).andStubReturn(URI.create("composite"));
@@ -114,21 +107,21 @@
}
private void createComponentDefinitionAndType() throws Exception {
- type = new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- type.setImplementationScope(Scope.COMPOSITE);
- JavaMappedReference reference = new JavaMappedReference();
- reference.setUri(URI.create("#target"));
- reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));
- type.add(reference);
- ServiceContract<?> contract = new JavaServiceContract(Source.class);
- JavaMappedService serviceDefinition = new JavaMappedService();
- serviceDefinition.setUri(URI.create("component#Source"));
- serviceDefinition.setServiceContract(contract);
- type.add(serviceDefinition);
+ type = new JavaImplementationDefinition();
+ type.setScope(Scope.COMPOSITE);
+ ComponentReference reference = factory.createComponentReference();
+ reference.setName("target");
+ type.getReferenceMembers().put("target",
+ new JavaElement(SourceImpl.class.getMethod("setTarget", Target.class), 0));
+ type.getReferences().add(reference);
+
+ ComponentService serviceDefinition = ModelHelper.createService(Source.class);
+ serviceDefinition.setName("Source");
+ type.getServices().add(serviceDefinition);
type.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(constructor));
- JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, type);
- definition = new ComponentDefinition<JavaImplementation>(sourceImpl);
- definition.setUri(URI.create("component"));
+ type.setJavaClass(SourceImpl.class);
+ definition.setImplementation(type);
+ definition.setName("component");
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java Mon Apr 9 10:47:45 2007
@@ -20,18 +20,19 @@
import java.net.URI;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.Component;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.impl.Resource;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.host.ResourceHost;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.Resource;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-
-import junit.framework.TestCase;
import org.easymock.EasyMock;
/**
@@ -55,14 +56,16 @@
builder.setHost(host);
builder.setScopeRegistry(registry);
ConstructorDefinition<Foo> ctorDef = new ConstructorDefinition<Foo>(Foo.class.getConstructor());
- PojoComponentType type = new PojoComponentType();
+ JavaImplementationDefinition type = new JavaImplementationDefinition();
Resource resource = new Resource("resource", String.class, Foo.class.getDeclaredField("resource"));
type.add(resource);
- type.setImplementationScope(Scope.STATELESS);
+ type.setScope(org.apache.tuscany.implementation.java.impl.Scope.STATELESS);
type.setConstructorDefinition(ctorDef);
- JavaImplementation impl = new JavaImplementation(Foo.class, type);
+ type.setJavaClass(Foo.class);
URI uri = URI.create("foo");
- ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(uri, impl);
+ Component definition = new DefaultAssemblyFactory().createComponent();
+ definition.setImplementation(type);
+ definition.setName("foo");
Wire resourceWire = EasyMock.createMock(Wire.class);
EasyMock.expect(resourceWire.getTargetInstance()).andReturn("result");
EasyMock.replay(resourceWire);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java Mon Apr 9 10:47:45 2007
@@ -21,15 +21,15 @@
import java.lang.reflect.Method;
import junit.framework.TestCase;
-import org.easymock.IMocksControl;
-import org.easymock.classextension.EasyMock;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.Message;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
public class JavaInvokerInterceptorBasicTestCase<CONTEXT> extends TestCase {
private TestBean bean;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Mon Apr 9 10:47:45 2007
@@ -23,19 +23,19 @@
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.implementation.PojoConfiguration;
+import org.apache.tuscany.core.injection.PojoObjectFactory;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.TargetException;
-import org.apache.tuscany.spi.component.InstanceWrapper;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InvocationChain;
-import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.spi.wire.ProxyService;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.implementation.PojoConfiguration;
-import org.apache.tuscany.core.injection.PojoObjectFactory;
+import org.apache.tuscany.spi.wire.Wire;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
@@ -57,7 +57,7 @@
configuration.setInstanceFactory(new PojoObjectFactory<SourceImpl>(ctr));
Wire wire = EasyMock.createMock(Wire.class);
wire.getInvocationChains();
- EasyMock.expectLastCall().andReturn(new HashMap<Operation<?>, InvocationChain>()).atLeastOnce();
+ EasyMock.expectLastCall().andReturn(new HashMap<Operation, InvocationChain>()).atLeastOnce();
URI uri = URI.create("#target");
EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java Mon Apr 9 10:47:45 2007
@@ -18,18 +18,19 @@
*/
package org.apache.tuscany.core.implementation.java;
+import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import junit.framework.TestCase;
+
+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.WorkContext;
-import org.apache.tuscany.spi.model.Scope;
-import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.TestCase;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
public class JavaTargetInvokerBasicInvocationTestCase extends TestCase {
private Method echoMethod;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java Mon Apr 9 10:47:45 2007
@@ -20,16 +20,16 @@
import java.lang.reflect.Method;
-import org.apache.tuscany.spi.model.Scope;
+import junit.framework.TestCase;
+
+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.WorkContext;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.InstanceWrapper;
-import org.apache.tuscany.spi.component.WorkContext;
-
-import junit.framework.TestCase;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java Mon Apr 9 10:47:45 2007
@@ -20,13 +20,13 @@
import java.lang.reflect.Method;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.component.ScopeContainer;
+import junit.framework.TestCase;
+
+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.WorkContext;
-
-import junit.framework.TestCase;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
public class JavaTargetInvokerStatelessDestroyTestCase extends TestCase {
private JavaAtomicComponent component;
Added: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java?view=auto&rev=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java (added)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java Mon Apr 9 10:47:45 2007
@@ -0,0 +1,96 @@
+/*
+ * 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.core.implementation.java;
+
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.assembly.Reference;
+import org.apache.tuscany.assembly.Service;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.interfacedef.Interface;
+import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterface;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ModelHelper {
+ private final static AssemblyFactory factory = new DefaultAssemblyFactory();
+ private final static JavaFactory javaFactory = new DefaultJavaFactory();
+
+ public static Property getProperty(JavaImplementationDefinition type, String name) {
+ for (Property prop : type.getProperties()) {
+ if (prop.getName().equals(name)) {
+ return prop;
+ }
+ }
+ return null;
+ }
+
+ public static Reference getReference(JavaImplementationDefinition type, String name) {
+ for (Reference ref : type.getReferences()) {
+ if (ref.getName().equals(name)) {
+ return ref;
+ }
+ }
+ return null;
+ }
+
+ public static Service getService(JavaImplementationDefinition type, String name) {
+ for (Service svc : type.getServices()) {
+ if (svc.getName().equals(name)) {
+ return svc;
+ }
+ }
+ return null;
+ }
+
+ public static boolean matches(Contract contract, Class<?> type) {
+ Interface interface1 = contract.getInterface();
+ if (interface1 instanceof JavaInterface) {
+ return type == ((JavaInterface)interface1).getJavaClass();
+ } else {
+ return false;
+ }
+ }
+
+ public static ComponentService createService(Class<?> type) {
+ org.apache.tuscany.assembly.ComponentService ref = factory.createComponentService();
+ ref.setName(type.getSimpleName());
+ JavaInterface i = javaFactory.createJavaInterface();
+ i.setJavaClass(type);
+ ref.setInterface(i);
+ return ref;
+ }
+
+ public static Reference createReference(String name, Class<?> type) {
+ org.apache.tuscany.assembly.Reference ref = factory.createReference();
+ ref.setName(name);
+ JavaInterface i = javaFactory.createJavaInterface();
+ i.setJavaClass(type);
+ ref.setInterface(i);
+ return ref;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java Mon Apr 9 10:47:45 2007
@@ -21,13 +21,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.host.ResourceHost;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
-import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
@@ -35,6 +28,10 @@
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.injection.ResourceObjectFactory;
+import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.host.ResourceHost;
+import org.apache.tuscany.spi.wire.Wire;
import org.easymock.EasyMock;
/**
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java Mon Apr 9 10:47:45 2007
@@ -18,15 +18,15 @@
*/
package org.apache.tuscany.core.integration.conversation;
-import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.services.store.StoreMonitor;
-
import junit.framework.TestCase;
+
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.scope.ConversationalScopeContainer;
import org.apache.tuscany.core.services.store.memory.MemoryStore;
-import org.easymock.classextension.EasyMock;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
+import org.easymock.EasyMock;
/**
* Provides helper methods for setting up a partial runtime for conversational test cases.
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Mon Apr 9 10:47:45 2007
@@ -34,7 +34,7 @@
import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Mon Apr 9 10:47:45 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Mon Apr 9 10:47:45 2007
@@ -33,7 +33,7 @@
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Mon Apr 9 10:47:45 2007
@@ -26,6 +26,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
@@ -107,7 +109,7 @@
sourceComponent.setScopeContainer(sourceScope);
Wire wire = createWire(targetName, sourceReferenceClass, sourceHeadInterceptor);
for (InvocationChain chain : wire.getInvocationChains().values()) {
- chain.setTargetInvoker(targetComponent.createTargetInvoker(targetName, chain.getOperation()));
+ chain.setTargetInvoker(targetComponent.createTargetInvoker(targetName, chain.getOperation(), false));
}
sourceComponent.attachWire(wire);
targetScope.register(targetComponent, configuration.getGroupId());
@@ -148,7 +150,7 @@
Wire wire = createWire(targetName, sourceReferenceClass, null);
wire.setTargetUri(URI.create(targetName + "#" + serviceName));
for (InvocationChain chain : wire.getInvocationChains().values()) {
- chain.setTargetInvoker(targetComponent.createTargetInvoker("target", chain.getOperation()));
+ chain.setTargetInvoker(targetComponent.createTargetInvoker("target", chain.getOperation(), false));
}
List<Wire> wires = new ArrayList<Wire>();
wires.add(wire);
@@ -170,7 +172,8 @@
public static <T> Wire createWire(String serviceName, Class<T> interfaze, Interceptor interceptor)
throws InvalidInterfaceException {
Wire wire = new WireImpl();
- ServiceContract<?> contract = REGISTRY.introspect(interfaze);
+ Contract contract = new DefaultAssemblyFactory().createComponentService();
+ REGISTRY.introspect(contract, interfaze);
wire.setSourceContract(contract);
wire.setSourceUri(URI.create("#" + serviceName));
createChains(interfaze, interceptor, wire);
@@ -195,8 +198,9 @@
private static void createChains(Class<?> interfaze, Interceptor interceptor, Wire wire)
throws InvalidInterfaceException {
- ServiceContract<?> contract = REGISTRY.introspect(interfaze);
- for (Operation method : contract.getOperations().values()) {
+ Contract contract = new DefaultAssemblyFactory().createComponentService();
+ REGISTRY.introspect(contract, interfaze);
+ for (Operation method : contract.getInterface().getOperations()) {
InvocationChain chain = new InvocationChainImpl(method);
if (interceptor != null) {
chain.addInterceptor(interceptor);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java Mon Apr 9 10:47:45 2007
@@ -23,12 +23,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.wire.Wire;
-
import junit.framework.TestCase;
+
import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.implementation.java.ModelHelper;
import org.apache.tuscany.core.wire.WireImpl;
+import org.apache.tuscany.spi.wire.Wire;
/**
* @version $Rev$ $Date$
@@ -41,21 +41,21 @@
wire.setSourceUri(uri);
List<Wire> wires = new ArrayList<Wire>();
wires.add(wire);
- wire.setSourceContract(new JavaServiceContract(Foo.class));
+ wire.setSourceContract(ModelHelper.createReference("foo", Foo.class));
JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wires, new WorkContextImpl());
- Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
+ Foo foo = (Foo)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {Foo.class}, handler);
assertNotNull(foo.toString());
}
public void testHashCode() {
Wire wire = new WireImpl();
- wire.setSourceContract(new JavaServiceContract(Foo.class));
+ wire.setSourceContract(ModelHelper.createReference("foo", Foo.class));
URI uri = URI.create("#wire");
wire.setSourceUri(uri);
List<Wire> wires = new ArrayList<Wire>();
wires.add(wire);
JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wires, new WorkContextImpl());
- Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
+ Foo foo = (Foo)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {Foo.class}, handler);
assertNotNull(foo.hashCode());
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java Mon Apr 9 10:47:45 2007
@@ -21,18 +21,19 @@
import java.lang.reflect.Method;
import java.net.URI;
-import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.model.Operation;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.core.wire.InvocationChainImpl;
+import org.apache.tuscany.core.wire.WireImpl;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.interfacedef.java.introspection.JavaInterfaceProcessorRegistry;
+import org.apache.tuscany.interfacedef.java.introspection.impl.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.MessageImpl;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
-import org.apache.tuscany.core.wire.InvocationChainImpl;
-import org.apache.tuscany.core.wire.WireImpl;
import org.easymock.EasyMock;
/**
@@ -43,12 +44,15 @@
private Method clientHello;
/**
- * Verifies a handler configured to use a different interface than the wire target can dispatch
+ * Verifies a handler configured to use a different interface than the wire
+ * target can dispatch
*/
public void testDifferentInterface() throws Throwable {
Wire wire = new WireImpl();
- JavaServiceContract<Target> contract = registry.introspect(Target.class);
- for (Operation<?> operation : contract.getOperations().values()) {
+
+ Contract contract = new DefaultAssemblyFactory().createComponentReference();
+ registry.introspect(contract, Target.class);
+ for (Operation operation : contract.getInterface().getOperations()) {
InvocationChain chain = new InvocationChainImpl(operation);
wire.addInvocationChain(operation, chain);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java Mon Apr 9 10:47:45 2007
@@ -28,24 +28,24 @@
import java.util.List;
import java.util.Map;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.implementation.PojoWorkContextTunnel;
+import org.apache.tuscany.core.implementation.java.ModelHelper;
+import org.apache.tuscany.core.wire.InvocationChainImpl;
+import org.apache.tuscany.core.wire.InvokerInterceptor;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.interfacedef.impl.OperationImpl;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.model.Operation;
-import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
-import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.wire.InvocationChainImpl;
-import org.apache.tuscany.core.wire.InvokerInterceptor;
-import org.apache.tuscany.core.implementation.PojoWorkContextTunnel;
-
import org.easymock.EasyMock;
/**
@@ -82,20 +82,14 @@
protected void setUp() throws Exception {
super.setUp();
SCAObject container = EasyMock.createMock(SCAObject.class);
- ServiceContract<Foo> contract = new ServiceContract<Foo>() {
- };
- contract.setInterfaceClass(Foo.class);
- contract.setConversational(false);
+ Contract contract = ModelHelper.createReference("foo", Foo.class);
EasyMock.expect(container.getUri()).andReturn(URI.create("bar")).atLeastOnce();
wire = EasyMock.createMock(Wire.class);
- Map<Operation<?>, InvocationChain> map = new HashMap<Operation<?>, InvocationChain>();
- Operation<Object> operation = new Operation<Object>("invoke", null, null, null, false, null, NO_CONVERSATION);
- ServiceContract<Object> opContract = new ServiceContract<Object>() {
- };
- contract.setInterfaceClass(Foo.class);
- contract.setConversational(false);
- operation.setServiceContract(opContract);
+ Map<Operation, InvocationChain> map = new HashMap<Operation, InvocationChain>();
+ Operation operation = new OperationImpl("invoke");
+ Contract opContract = ModelHelper.createReference("foo", Foo.class);
+ operation.setInterface(opContract.getInterface());
map.put(operation, createChain(operation));
EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
URI uri = URI.create("#foo");
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java Mon Apr 9 10:47:45 2007
@@ -21,31 +21,31 @@
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Proxy;
-import java.lang.reflect.Type;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.core.component.SimpleWorkContext;
+import org.apache.tuscany.core.implementation.PojoWorkContextTunnel;
+import org.apache.tuscany.core.implementation.java.ModelHelper;
+import org.apache.tuscany.core.wire.InvocationChainImpl;
+import org.apache.tuscany.core.wire.WireImpl;
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
+import org.apache.tuscany.interfacedef.impl.OperationImpl;
+import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.component.SimpleWorkContext;
-import org.apache.tuscany.core.wire.InvocationChainImpl;
-import org.apache.tuscany.core.wire.WireImpl;
-import org.apache.tuscany.core.implementation.PojoWorkContextTunnel;
-
/**
* @version $Rev$ $Date$
*/
@@ -53,8 +53,7 @@
public void testToString() {
Wire wire = new WireImpl();
- ServiceContract contract = new JavaServiceContract(Foo.class);
- contract.setConversational(false);
+ Contract contract = ModelHelper.createReference("foo", Foo.class);
wire.setSourceContract(contract);
wire.setSourceUri(URI.create("foo#bar"));
JDKInvocationHandler handler = new JDKInvocationHandler(Foo.class, wire, null);
@@ -64,8 +63,7 @@
public void testHashCode() {
Wire wire = new WireImpl();
- ServiceContract contract = new JavaServiceContract(Foo.class);
- contract.setConversational(false);
+ Contract contract = ModelHelper.createReference("foo", Foo.class);
wire.setSourceContract(contract);
wire.setSourceUri(URI.create("foo#bar"));
JDKInvocationHandler handler = new JDKInvocationHandler(Foo.class, wire, null);
@@ -75,15 +73,16 @@
public void testConversational() throws Throwable {
Wire wire = new WireImpl();
- DataType<Type> type1 = new DataType<Type>(String.class, String.class);
- List<DataType<Type>> types = new ArrayList<DataType<Type>>();
+ DataType<Class> type1 = new DataTypeImpl<Class>(String.class, String.class);
+ List<DataType> types = new ArrayList<DataType>();
types.add(type1);
- DataType<List<DataType<Type>>> inputType1 = new DataType<List<DataType<Type>>>(Object[].class, types);
- DataType<Type> outputType1 = new DataType<Type>(String.class, String.class);
- Operation<Type> op1 = new Operation<Type>("test", inputType1, outputType1, null);
- ServiceContract<Type> contract = new JavaServiceContract(Foo.class);
- contract.setConversational(true);
- op1.setServiceContract(contract);
+ DataType<List<DataType>> inputType1 = new DataTypeImpl<List<DataType>>(Object[].class, types);
+ DataType<Class> outputType1 = new DataTypeImpl<Class>(String.class, String.class);
+ Operation op1 = new OperationImpl("test");
+ op1.setInputType(inputType1);
+ op1.setOutputType(outputType1);
+ Contract contract = ModelHelper.createReference("foo", Foo.class);
+ op1.setInterface(contract.getInterface());
WorkContext wc = new SimpleWorkContext();
PojoWorkContextTunnel.setThreadWorkContext(wc);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java Mon Apr 9 10:47:45 2007
@@ -21,11 +21,12 @@
import java.lang.reflect.Proxy;
import java.net.URI;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.Wire;
-
import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.core.wire.WireImpl;
+import org.apache.tuscany.spi.wire.Wire;
/**
* @version $Rev$ $Date$
@@ -37,8 +38,7 @@
URI uri = URI.create("#service");
Wire wire = new WireImpl();
wire.setSourceUri(uri);
- ServiceContract contract = new ServiceContract() {
- };
+ Contract contract = new DefaultAssemblyFactory().createComponentReference();
wire.setSourceContract(contract);
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