You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/21 08:35:00 UTC
svn commit: r379386 - in /incubator/tuscany/java/sca/container.java/src:
main/java/org/apache/tuscany/container/java/assembly/
main/java/org/apache/tuscany/container/java/assembly/impl/
main/java/org/apache/tuscany/container/java/assembly/pojo/ main/ja...
Author: jsdelfino
Date: Mon Feb 20 23:34:58 2006
New Revision: 379386
URL: http://svn.apache.org/viewcvs?rev=379386&view=rev
Log:
ported to new POJO model
Removed:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/pojo/
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/sdo/
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/JavaComponentConfigurationHandler.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/sdo/tests/
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaAssemblyFactory.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaImplementation.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaAssemblyFactoryImpl.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationImpl.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/Java5ComponentTypeIntrospector.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaComponentRuntimeConfiguration.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/AbstractJavaComponentInvoker.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAssemblyFactory.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockModuleFactory.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaAssemblyFactory.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaAssemblyFactory.java Mon Feb 20 23:34:58 2006
@@ -20,13 +20,13 @@
/**
- * The <b>Factory</b> for the model.
+ * The Factory for the model.
*/
public interface JavaAssemblyFactory extends AssemblyFactory {
/**
- * Returns a new object of class '<em>Java Implementation</em>'.
+ * Returns a new JavaImplementation.
*/
JavaImplementation createJavaImplementation();
-} //AssemblyFactory
+}
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaImplementation.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaImplementation.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaImplementation.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/JavaImplementation.java Mon Feb 20 23:34:58 2006
@@ -20,18 +20,18 @@
/**
- * A representation of the model object '<em><b>Java Implementation</b></em>'.
+ * Represents a java implementation.
*/
public interface JavaImplementation extends ComponentImplementation {
/**
- * Returns the value of the '<em><b>Class</b></em>' attribute.
+ * Returns the implementation class.
*/
- String getClass_();
+ Class getImplementationClass();
/**
- * Sets the value of the '{@link org.osoa.sca.model.JavaImplementation#getClass_ <em>Class</em>}' attribute.
+ * Sets the implementation class.
*/
- void setClass(String value);
+ void setImplementationClass(Class value);
-} // TJavaImplementation
+}
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaAssemblyFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaAssemblyFactoryImpl.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaAssemblyFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaAssemblyFactoryImpl.java Mon Feb 20 23:34:58 2006
@@ -21,6 +21,7 @@
import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
/**
+ * A factory for the model.
*/
public class JavaAssemblyFactoryImpl extends AssemblyFactoryImpl implements JavaAssemblyFactory {
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationImpl.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationImpl.java Mon Feb 20 23:34:58 2006
@@ -16,9 +16,7 @@
*/
package org.apache.tuscany.container.java.assembly.impl;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
+import java.net.URL;
import org.apache.tuscany.container.java.assembly.JavaAssemblyFactory;
import org.apache.tuscany.container.java.assembly.JavaImplementation;
@@ -27,176 +25,73 @@
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
import org.apache.tuscany.model.assembly.ComponentType;
-import org.apache.tuscany.model.assembly.Reference;
-import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.impl.AssemblyModelVisitorHelperImpl;
-import org.apache.tuscany.model.assembly.impl.ComponentTypeImpl;
-import org.apache.tuscany.model.util.XMLResourceFactoryImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.osoa.sca.model.DocumentRoot;
+import org.apache.tuscany.model.assembly.impl.ComponentImplementationImpl;
/**
- * An implementation of the model object '<em><b>Java Implementation</b></em>'.
+ * An implementation of JavaImplementation.
*/
-public class JavaImplementationImpl extends org.apache.tuscany.container.java.assembly.sdo.impl.JavaImplementationImpl implements JavaImplementation {
+public class JavaImplementationImpl extends ComponentImplementationImpl implements JavaImplementation {
- private ComponentType componentType;
- private Object runtimeConfiguration;
+ private Class implementationClass;
/**
* Constructor
*/
protected JavaImplementationImpl() {
- componentType = new ComponentTypeImpl();
}
/**
- * @see org.apache.tuscany.container.java.assembly.JavaImplementation#getClass_()
+ * @see org.apache.tuscany.container.java.assembly.JavaImplementation#getImplementationClass()
*/
- public String getClass_() {
- return super.getClass_();
+ public Class getImplementationClass() {
+ return implementationClass;
}
/**
- * @see org.apache.tuscany.container.java.assembly.JavaImplementation#setClass(java.lang.String)
+ * @see org.apache.tuscany.container.java.assembly.JavaImplementation#setImplementationClass(java.lang.Class)
*/
- public void setClass(String value) {
- super.setClass(value);
+ public void setImplementationClass(Class value) {
+ checkNotFrozen();
+ implementationClass=value;
}
/**
* @see org.apache.tuscany.model.assembly.AssemblyModelObject#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
*/
public void initialize(AssemblyModelContext modelContext) {
- if (componentType.getServices().isEmpty()) {
- Class implClass;
- try {
- implClass = JavaIntrospectionHelper.loadClass(getClass_());
- } catch (ClassNotFoundException e) {
- // todo anything better to throw?
- throw new IllegalArgumentException("Component implementation class not found: " + getClass_());
- }
- createComponentType(modelContext, implClass);
- }
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
- */
- public boolean accept(AssemblyModelVisitor visitor) {
- return AssemblyModelVisitorHelperImpl.accept(this, visitor);
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.RuntimeManagedModelObject#getRuntimeConfiguration()
- */
- public Object getRuntimeConfiguration() {
- return runtimeConfiguration;
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.RuntimeManagedModelObject#setRuntimeConfiguration(java.lang.Object)
- */
- public void setRuntimeConfiguration(Object configuration) {
- this.runtimeConfiguration = configuration;
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#freeze()
- */
- public void freeze() {
- }
+ if (isInitialized())
+ return;
- /**
- * @see org.apache.tuscany.model.assembly.TImplementation#setComponentType(org.apache.tuscany.model.assembly.ComponentType)
- */
- public void setComponentType(ComponentType componentType) {
- this.componentType = componentType;
+ // Initialize the component type
+ ComponentType componentType=getComponentType();
+ if (componentType==null) {
+ componentType=createComponentType(modelContext, implementationClass);
+ setComponentType(componentType);
+ }
+
+ super.initialize(modelContext);
}
/**
- * @see org.apache.tuscany.model.assembly.TImplementation#getComponentType()
+ * Create the component type
+ * @param modelContext
+ * @param implementationClass
*/
- public ComponentType getComponentType() {
- return componentType;
- }
-
- private void createComponentType(AssemblyModelContext modelContext, Class implClass) {
- String baseName = JavaIntrospectionHelper.getBaseName(implClass);
- InputStream sideFile = implClass.getResourceAsStream(baseName + ".componentType");
- if (sideFile != null) {
- try {
- // todo load the sidefile using EMF - should this be using SDO?
- Resource res = new XMLResourceFactoryImpl().createResource(URI.createURI(implClass.getName()));
- res.load(sideFile, null);
- DocumentRoot root = (DocumentRoot) res.getContents().get(0);
- componentType = (ComponentType) root.getComponentType();
- componentType.initialize(modelContext);
- } catch (IOException e) {
- throw new WrappedException(e);
- } finally {
- try {
- sideFile.close();
- } catch (IOException e) {
- // ignore
- }
- }
+ private ComponentType createComponentType(AssemblyModelContext modelContext, Class implementationClass) {
+ String baseName = JavaIntrospectionHelper.getBaseName(implementationClass);
+ URL componentTypeFile = implementationClass.getResource(baseName + ".componentType");
+ if (componentTypeFile != null) {
+ return modelContext.getAssemblyLoader().getComponentType(componentTypeFile.toString());
} else {
JavaAssemblyFactory factory = new JavaAssemblyFactoryImpl();
ComponentTypeIntrospector introspector = new Java5ComponentTypeIntrospector(factory);
try {
- componentType = introspector.introspect(implClass);
- componentType.initialize(modelContext);
+ return introspector.introspect(implementationClass);
} catch (ConfigurationException e) {
- throw new IllegalArgumentException("Unable to introspect implementation class: " + implClass.getName(), e);
+ throw new IllegalArgumentException("Unable to introspect implementation class: " + implementationClass.getName(), e);
}
}
}
- /**
- * @see org.apache.tuscany.model.assembly.ComponentType#getProperties()
- */
- public List<org.apache.tuscany.model.assembly.Property> getProperties() {
- return componentType.getProperties();
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ComponentType#getProperty(java.lang.String)
- */
- public org.apache.tuscany.model.assembly.Property getProperty(String name) {
- return componentType.getProperty(name);
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ComponentType#getReference(java.lang.String)
- */
- public Reference getReference(String name) {
- return componentType.getReference(name);
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ComponentType#getReferences()
- */
- public List<Reference> getReferences() {
- return componentType.getReferences();
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ComponentType#getService(java.lang.String)
- */
- public Service getService(String name) {
- return componentType.getService(name);
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ComponentType#getServices()
- */
- public List<Service> getServices() {
- return componentType.getServices();
- }
-
-} //JavaImplementationImpl
+ }
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java Mon Feb 20 23:34:58 2006
@@ -39,11 +39,10 @@
import org.apache.tuscany.model.assembly.ConfiguredProperty;
import org.apache.tuscany.model.assembly.ConfiguredReference;
import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.apache.tuscany.model.assembly.Interface;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.Service;
+import org.apache.tuscany.model.assembly.ServiceContract;
import org.apache.tuscany.model.assembly.SimpleComponent;
-import org.apache.tuscany.model.types.OperationType;
import org.osoa.sca.annotations.ComponentName;
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Destroy;
@@ -98,12 +97,12 @@
if (component.getComponentImplementation() instanceof JavaImplementation) {
JavaImplementation javaImpl = (JavaImplementation) component.getComponentImplementation();
// FIXME scope
- ScopeEnum scope = component.getComponentImplementation().getServices().get(0).getInterfaceContract().getScope();
+ Scope scope = component.getComponentImplementation().getComponentType().getServices().get(0).getServiceContract().getScope();
Class implClass = null;
Set<Field> fields;
Set<Method> methods;
try {
- implClass = JavaIntrospectionHelper.loadClass(javaImpl.getClass_());
+ implClass = javaImpl.getImplementationClass();
fields = JavaIntrospectionHelper.getAllFields(implClass);
methods = JavaIntrospectionHelper.getAllUniqueMethods(implClass);
String name = component.getName();
@@ -163,25 +162,26 @@
}
}
JavaComponentRuntimeConfiguration config = new JavaComponentRuntimeConfiguration(name, JavaIntrospectionHelper
- .getDefaultConstructor(implClass), eagerInit, initInvoker, destroyInvoker, scope.getValue());
+ .getDefaultConstructor(implClass), eagerInit, initInvoker, destroyInvoker, scope);
component.getComponentImplementation().setRuntimeConfiguration(config);
// create chains for handling incoming requests
for (ConfiguredService configuredService : component.getConfiguredServices()) {
Service service = configuredService.getService();
- Interface interfaze = service.getInterfaceContract();
- Map<OperationType, InvocationConfiguration> iConfigMap = new HashMap();
+ ServiceContract serviceContract = service.getServiceContract();
+ Map<Method, InvocationConfiguration> iConfigMap = new HashMap();
ProxyFactory proxyFactory = factory.createProxyFactory();
// FIXME we pass null for scopes since ProxyConfiguration requires scopes - this should be removed
- for (OperationType type : interfaze.getInterfaceType().getOperationTypes()) {
- InvocationConfiguration iConfig = new InvocationConfiguration(type);
- iConfigMap.put(type, iConfig);
+ Set<Method> javaMethods=JavaIntrospectionHelper.getAllUniqueMethods(serviceContract.getInterface());
+ for (Method method : javaMethods) {
+ InvocationConfiguration iConfig = new InvocationConfiguration(method);
+ iConfigMap.put(method, iConfig);
}
// @FIXME hardcode separator
// QualifiedName qName = new QualifiedName(configuredService.getPart().getName() + "/"
// + configuredService.getService().getName());
ProxyConfiguration pConfiguration = new ProxyConfiguration(null, iConfigMap, null, null, msgFactory);
- proxyFactory.setBusinessInterface(interfaze.getInterfaceType().getInstanceClass());
+ proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
config.addTargetProxyFactory(service.getName(), proxyFactory);
configuredService.setProxyFactory(proxyFactory);
@@ -202,21 +202,22 @@
if (configuredReferences != null) {
for (ConfiguredReference reference : configuredReferences) {
ProxyFactory proxyFactory = factory.createProxyFactory();
- Interface interfaze = reference.getReference().getInterfaceContract();
- Map<OperationType, InvocationConfiguration> iConfigMap = new HashMap();
- for (OperationType type : interfaze.getInterfaceType().getOperationTypes()) {
- InvocationConfiguration iConfig = new InvocationConfiguration(type);
- iConfigMap.put(type, iConfig);
+ ServiceContract serviceContract = reference.getReference().getServiceContract();
+ Map<Method, InvocationConfiguration> iConfigMap = new HashMap();
+ Set<Method> javaMethods=JavaIntrospectionHelper.getAllUniqueMethods(serviceContract.getInterface());
+ for (Method method : javaMethods) {
+ InvocationConfiguration iConfig = new InvocationConfiguration(method);
+ iConfigMap.put(method, iConfig);
}
/*
* FIXME we pass null for scopes since ProxyConfiguration requires scopes - this should be
* removed from the constructor
*/
- QualifiedName qName = new QualifiedName(reference.getPart().getName() + "/"
+ QualifiedName qName = new QualifiedName(reference.getAggregatePart().getName() + "/"
+ reference.getPort().getName());
ProxyConfiguration pConfiguration = new ProxyConfiguration(qName, iConfigMap, null, null, msgFactory);
- proxyFactory.setBusinessInterface(interfaze.getInterfaceType().getInstanceClass());
+ proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
config.addSourceProxyFactory(reference.getReference().getName(), proxyFactory);
reference.setProxyFactory(proxyFactory);
@@ -234,11 +235,6 @@
e.addContextName(component.getName());
e.addContextName(parentContext.getName());
throw e;
- } catch (ClassNotFoundException e) {
- BuilderException be = new BuilderConfigException(e);
- be.addContextName(component.getName());
- be.addContextName(parentContext.getName());
- throw be;
} catch (NoSuchMethodException e) {
BuilderConfigException ce = new BuilderConfigException("Class does not have a no-arg constructor", e);
ce.setIdentifier(implClass.getName());
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java Mon Feb 20 23:34:58 2006
@@ -20,7 +20,6 @@
import org.apache.tuscany.core.context.ScopeContext;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.model.types.java.JavaOperationType;
import org.osoa.sca.annotations.Scope;
/**
@@ -41,8 +40,7 @@
}
for (InvocationConfiguration sourceInvocationConfig : sourceFactory.getProxyConfiguration().getInvocationConfigurations()
.values()) {
- ScopedJavaComponentInvoker invoker = new ScopedJavaComponentInvoker(sourceFactory.getProxyConfiguration()
- .getTargetName(), ((JavaOperationType) sourceInvocationConfig.getOperationType()).getJavaMethod(),
+ ScopedJavaComponentInvoker invoker = new ScopedJavaComponentInvoker(sourceFactory.getProxyConfiguration().getTargetName(), sourceInvocationConfig.getMethod(),
targetScopeContext);
if (downScope) {
// the source scope is shorter than the target, so the invoker can cache the target instance
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/Java5ComponentTypeIntrospector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/Java5ComponentTypeIntrospector.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/Java5ComponentTypeIntrospector.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/Java5ComponentTypeIntrospector.java Mon Feb 20 23:34:58 2006
@@ -23,20 +23,20 @@
import java.util.Iterator;
import java.util.List;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
import org.apache.tuscany.container.java.assembly.JavaAssemblyFactory;
import org.apache.tuscany.core.config.ComponentTypeIntrospector;
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.model.assembly.ComponentType;
-import org.apache.tuscany.model.assembly.Interface;
+import org.apache.tuscany.model.assembly.Multiplicity;
import org.apache.tuscany.model.assembly.Property;
import org.apache.tuscany.model.assembly.Reference;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.types.java.JavaInterface;
+import org.apache.tuscany.model.assembly.ServiceContract;
+import org.apache.tuscany.model.types.java.JavaServiceContract;
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Remotable;
/**
* Introspects Java annotation-based metata data
@@ -68,9 +68,9 @@
// FIXME scopes should be handled at the interface level
if (compType != null) {
- ScopeEnum scope = getScope(implClass);
+ Scope scope = getScope(implClass);
for (Iterator<Service> i = compType.getServices().iterator(); i.hasNext();) {
- Interface intf = i.next().getInterfaceContract();
+ ServiceContract intf = i.next().getServiceContract();
if (intf != null)
intf.setScope(scope);
}
@@ -84,7 +84,7 @@
*
* @throws ConfigurationException
*/
- private ScopeEnum getScope(Class<?> implClass) throws ConfigurationException {
+ private Scope getScope(Class<?> implClass) throws ConfigurationException {
org.osoa.sca.annotations.Scope scope = implClass.getAnnotation(org.osoa.sca.annotations.Scope.class);
if (scope == null) {
// scope was not defined on the implementation class, look for annotated interfaces
@@ -98,13 +98,13 @@
}
if ("MODULE".equalsIgnoreCase(scope.value())) {
- return (ScopeEnum.MODULE_LITERAL);
+ return (Scope.MODULE);
} else if ("SESSION".equalsIgnoreCase(scope.value())) {
- return (ScopeEnum.SESSION_LITERAL);
+ return (Scope.SESSION);
} else if ("REQUEST".equalsIgnoreCase(scope.value())) {
- return (ScopeEnum.REQUEST_LITERAL);
+ return (Scope.REQUEST);
} else {
- return (ScopeEnum.INSTANCE_LITERAL);
+ return (Scope.INSTANCE);
}
}
@@ -159,17 +159,17 @@
* @throws ConfigurationException
*/
protected void addService(List<Service> services, Class<?> serviceClass) throws ConfigurationException {
- JavaInterface javaInterface = factory.createJavaInterface();
- javaInterface.setInterface(serviceClass.getName());
+ JavaServiceContract javaInterface = factory.createJavaServiceContract();
+ javaInterface.setInterface(serviceClass);
Callback callback = serviceClass.getAnnotation(Callback.class);
if (callback != null && !Void.class.equals(callback.value())) {
- javaInterface.setCallbackInterface(callback.value().getName());
+ javaInterface.setCallbackInterface(callback.value());
}
String name = JavaIntrospectionHelper.getBaseName(serviceClass);
Service service = factory.createService();
service.setName(name);
- service.setInterfaceContract(javaInterface);
+ service.setServiceContract(javaInterface);
services.add(service);
}
@@ -350,7 +350,7 @@
prop.setMany(type.isArray() || Collection.class.isAssignableFrom(type));
// todo how is the default specified using annotations?
- prop.setDefault(null);
+ prop.setDefaultValue(null);
properties.add(prop);
}
@@ -405,11 +405,15 @@
Reference ref = factory.createReference();
ref.setName(name);
boolean many = type.isArray() || Collection.class.isAssignableFrom(type);
- String multiplicity = (required ? "1.." : "0..") + (many ? "n" : "1");
+ Multiplicity multiplicity;
+ if (required)
+ multiplicity=many? Multiplicity.ONE_N:Multiplicity.ONE_ONE;
+ else
+ multiplicity=many? Multiplicity.ZERO_N:Multiplicity.ZERO_ONE;
ref.setMultiplicity(multiplicity);
- Interface javaInterface = factory.createJavaInterface();
- javaInterface.setInterface(type.getName());
- ref.setInterfaceContract(javaInterface);
+ ServiceContract javaInterface = factory.createJavaServiceContract();
+ javaInterface.setInterface(type);
+ ref.setServiceContract(javaInterface);
references.add(ref);
}
}
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaComponentRuntimeConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaComponentRuntimeConfiguration.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaComponentRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaComponentRuntimeConfiguration.java Mon Feb 20 23:34:58 2006
@@ -14,31 +14,19 @@
package org.apache.tuscany.container.java.config;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.tuscany.container.java.context.JavaComponentContext;
-import org.apache.tuscany.container.java.injection.ReferenceProxyTargetFactory;
-import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.ContextCreationException;
-import org.apache.tuscany.core.builder.NoAccessorException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.core.context.SimpleComponentContext;
import org.apache.tuscany.core.injection.EventInvoker;
-import org.apache.tuscany.core.injection.FactoryInitException;
-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.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.model.assembly.ConfiguredReference;
-import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
/**
* A RuntimeConfiguration that handles POJO component implementation types
@@ -67,7 +55,7 @@
private EventInvoker destroy;
// the scope of the implementation instance
- private int scope;
+ private Scope scope;
private boolean stateless;
@@ -90,7 +78,7 @@
* @param scope the scope of the component implementation type
*/
public JavaComponentRuntimeConfiguration(String name, Constructor ctr, List<Injector> setters, boolean eagerInit,
- EventInvoker init, EventInvoker destroy, int scope) {
+ EventInvoker init, EventInvoker destroy, Scope scope) {
assert (name != null) : "Name was null";
assert (ctr != null) : "Constructor was null";
this.name = name;
@@ -100,11 +88,11 @@
this.init = init;
this.destroy = destroy;
this.scope = scope;
- stateless = (scope == ScopeEnum.INSTANCE);
+ stateless = (scope == Scope.INSTANCE);
}
public JavaComponentRuntimeConfiguration(String name, Constructor ctr, boolean eagerInit, EventInvoker init,
- EventInvoker destroy, int scope) {
+ EventInvoker destroy, Scope scope) {
this(name, ctr, null, eagerInit, init, destroy, scope);
}
@@ -116,7 +104,7 @@
return name;
}
- public int getScope() {
+ public Scope getScope() {
return scope;
}
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/AbstractJavaComponentInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/AbstractJavaComponentInvoker.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/AbstractJavaComponentInvoker.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/AbstractJavaComponentInvoker.java Mon Feb 20 23:34:58 2006
@@ -54,12 +54,12 @@
public Message invoke(Message msg) {
try {
- Object resp = invokeTarget(msg.getPayload());
- msg.setPayload(resp);
+ Object resp = invokeTarget(msg.getBody());
+ msg.setBody(resp);
} catch (InvocationTargetException e) {
- msg.setPayload(e.getCause());
+ msg.setBody(e.getCause());
} catch (Throwable e) {
- msg.setPayload(e);
+ msg.setBody(e);
}
return msg;
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java Mon Feb 20 23:34:58 2006
@@ -21,6 +21,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.tuscany.common.resource.loader.ResourceLoaderFactory;
import org.apache.tuscany.container.java.assembly.mock.HelloWorldImpl;
import org.apache.tuscany.container.java.assembly.mock.HelloWorldWithFieldProperties;
import org.apache.tuscany.container.java.assembly.mock.NakedHelloWorld;
@@ -29,7 +30,7 @@
import org.apache.tuscany.model.assembly.Property;
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
-import org.apache.tuscany.model.assembly.sdo.AssemblyPackage;
+import org.apache.tuscany.model.assembly.loader.impl.AssemblyLoaderImpl;
/**
* @version $Rev$ $Date$
@@ -38,16 +39,16 @@
private JavaImplementationImpl impl = (JavaImplementationImpl) new JavaAssemblyFactoryImpl().createJavaImplementation();
public void testFoo() {
- impl.setClass(HelloWorldImpl.class.getName());
+ impl.setImplementationClass(HelloWorldImpl.class);
// this is not needed anymore
//assertEquals("org/apache/tuscany/container/java/assembly/mock/HelloWorldImpl.componentType", impl.getComponentTypeName());
}
public void testNoImplementationClass() {
- impl.setClass("no.such.Class");
+ impl.setImplementationClass(null);
try {
- impl.initialize(new AssemblyModelContextImpl());
+ impl.initialize(new AssemblyModelContextImpl(new AssemblyLoaderImpl(), ResourceLoaderFactory.getResourceLoader(Thread.currentThread().getContextClassLoader())));
impl.getComponentType();
fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
@@ -56,8 +57,8 @@
}
public void testNakedHelloWorld() {
- impl.setClass(NakedHelloWorld.class.getName());
- impl.initialize(new AssemblyModelContextImpl());
+ impl.setImplementationClass(NakedHelloWorld.class);
+ impl.initialize(new AssemblyModelContextImpl(new AssemblyLoaderImpl(), ResourceLoaderFactory.getResourceLoader(Thread.currentThread().getContextClassLoader())));
ComponentType type = impl.getComponentType();
Assert.assertNotNull(type);
Assert.assertTrue(type.getProperties().isEmpty());
@@ -68,8 +69,8 @@
}
public void testNakedHelloWorldWithInterface() {
- impl.setClass(NakedHelloWorldWithInterface.class.getName());
- impl.initialize(new AssemblyModelContextImpl());
+ impl.setImplementationClass(NakedHelloWorldWithInterface.class);
+ impl.initialize(new AssemblyModelContextImpl(new AssemblyLoaderImpl(), ResourceLoaderFactory.getResourceLoader(Thread.currentThread().getContextClassLoader())));
ComponentType type = impl.getComponentType();
Assert.assertNotNull(type);
Assert.assertTrue(type.getProperties().isEmpty());
@@ -80,8 +81,8 @@
}
public void testHelloWorldWithSidefile() {
- impl.setClass(HelloWorldImpl.class.getName());
- impl.initialize(new AssemblyModelContextImpl());
+ impl.setImplementationClass(HelloWorldImpl.class);
+ impl.initialize(new AssemblyModelContextImpl(new AssemblyLoaderImpl(), ResourceLoaderFactory.getResourceLoader(Thread.currentThread().getContextClassLoader())));
ComponentType type = impl.getComponentType();
Assert.assertNotNull(type);
List<Property> props = type.getProperties();
@@ -96,8 +97,8 @@
}
public void testHelloWorldWithFieldProperties() {
- impl.setClass(HelloWorldWithFieldProperties.class.getName());
- impl.initialize(new AssemblyModelContextImpl());
+ impl.setImplementationClass(HelloWorldWithFieldProperties.class);
+ impl.initialize(new AssemblyModelContextImpl(new AssemblyLoaderImpl(), ResourceLoaderFactory.getResourceLoader(Thread.currentThread().getContextClassLoader())));
ComponentType type = impl.getComponentType();
Assert.assertNotNull(type);
List<Property> props = type.getProperties();
@@ -107,24 +108,19 @@
Assert.assertNotNull(prop);
Assert.assertEquals("text", prop.getName());
Assert.assertEquals(false, prop.isRequired());
- Assert.assertEquals(String.class, prop.getType_());
+ Assert.assertEquals(String.class, prop.getType());
prop = type.getProperty("text2");
Assert.assertNotNull(prop);
Assert.assertEquals("text2", prop.getName());
Assert.assertEquals(true, prop.isRequired());
- Assert.assertEquals(Integer.class, prop.getType_());
+ Assert.assertEquals(Integer.class, prop.getType());
prop = type.getProperty("foo");
Assert.assertNotNull(prop);
Assert.assertEquals("foo", prop.getName());
Assert.assertEquals(false, prop.isRequired());
- Assert.assertEquals(Integer.TYPE, prop.getType_());
- }
-
- static {
- // bootstrap this somehow
- AssemblyPackage.eINSTANCE.getClass();
+ Assert.assertEquals(Integer.TYPE, prop.getType());
}
protected void setUp() throws Exception {
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java Mon Feb 20 23:34:58 2006
@@ -16,20 +16,19 @@
*/
package org.apache.tuscany.container.java.assembly.tests;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.model.assembly.AssemblyLoader;
+import org.apache.tuscany.common.resource.loader.ResourceLoaderFactory;
+import org.apache.tuscany.container.java.assembly.tests.bigbank.account.services.accountdata.AccountDataService;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
import org.apache.tuscany.model.assembly.Component;
import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.tuscany.model.assembly.Module;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
-import org.apache.tuscany.model.types.InterfaceType;
-import org.apache.tuscany.model.types.OperationType;
+import org.apache.tuscany.model.assembly.loader.AssemblyLoader;
+import org.apache.tuscany.model.assembly.loader.impl.AssemblyLoaderImpl;
/**
*/
@@ -61,14 +60,11 @@
Object value = component.getConfiguredProperty("currency").getValue();
Assert.assertTrue(value.equals("EURO"));
- ConfiguredService configuredService = component.getConfiguredReference("accountDataService").getConfiguredServices().get(0);
- Assert.assertTrue(configuredService.getPart().getName().equals("AccountDataServiceComponent"));
+ ConfiguredService configuredService = component.getConfiguredReference("accountDataService").getTargetConfiguredServices().get(0);
+ Assert.assertTrue(configuredService.getAggregatePart().getName().equals("AccountDataServiceComponent"));
- InterfaceType interfaceType = configuredService.getService().getInterfaceContract().getInterfaceType();
- OperationType operationType = interfaceType.getOperationType("getCheckingAccount");
- Type type = operationType.getInputType();
- Property arg = (Property) type.getProperties().get(0);
- Assert.assertTrue(arg.getType().getInstanceClass() == String.class);
+ Class interfaceClass = configuredService.getService().getServiceContract().getInterface();
+ Assert.assertTrue(interfaceClass == AccountDataService.class);
}
@@ -76,7 +72,7 @@
super.setUp();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- modelContext = new AssemblyModelContextImpl();
+ modelContext = new AssemblyModelContextImpl(new AssemblyLoaderImpl(), ResourceLoaderFactory.getResourceLoader(getClass().getClassLoader()));
}
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java Mon Feb 20 23:34:58 2006
@@ -10,7 +10,6 @@
import junit.framework.TestCase;
import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
-import org.apache.tuscany.container.java.assembly.pojo.PojoJavaOperationType;
import org.apache.tuscany.container.java.invocation.mock.MockSyncInterceptor;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.MockConfigContext;
@@ -36,16 +35,7 @@
import org.apache.tuscany.core.message.impl.PojoMessageFactory;
import org.apache.tuscany.model.assembly.Component;
import org.apache.tuscany.model.assembly.Module;
-import org.apache.tuscany.model.assembly.ScopeEnum;
-import org.apache.tuscany.model.assembly.pojo.PojoConfiguredReference;
-import org.apache.tuscany.model.assembly.pojo.PojoConfiguredService;
-import org.apache.tuscany.model.assembly.pojo.PojoInterface;
-import org.apache.tuscany.model.assembly.pojo.PojoInterfaceType;
-import org.apache.tuscany.model.assembly.pojo.PojoJavaInterface;
-import org.apache.tuscany.model.assembly.pojo.PojoModule;
-import org.apache.tuscany.model.assembly.pojo.PojoPort;
-import org.apache.tuscany.model.assembly.pojo.PojoReference;
-import org.apache.tuscany.model.assembly.pojo.PojoService;
+import org.apache.tuscany.model.assembly.Scope;
public class JavaComponentContextBuilderTestCase extends TestCase {
@@ -115,10 +105,8 @@
public Module createModule() throws Exception {
- Component sourceComponent = MockAssemblyFactory.createComponent("source", ModuleScopeComponentImpl.class,
- ScopeEnum.MODULE_LITERAL);
- Component targetComponent = MockAssemblyFactory.createComponent("target", ModuleScopeComponentImpl.class,
- ScopeEnum.MODULE_LITERAL);
+ Component sourceComponent = MockAssemblyFactory.createComponent("source", ModuleScopeComponentImpl.class,Scope.MODULE);
+ Component targetComponent = MockAssemblyFactory.createComponent("target", ModuleScopeComponentImpl.class,Scope.MODULE);
PojoReference ref = new PojoReference();
PojoConfiguredReference cref = new PojoConfiguredReference();
ref.setName("setGenericComponent");
@@ -130,7 +118,7 @@
oType.setJavaMethod((Method) JavaIntrospectionHelper.getBeanProperty(GenericComponent.class, "getString", null));
type.addOperationType(oType);
inter.setInterfaceType(type);
- ref.setInterfaceContract(inter);
+ ref.setServiceContract(inter);
cref.setReference(ref);
cref.setPart(targetComponent);
PojoPort port = new PojoPort();
@@ -138,7 +126,7 @@
cref.setPort(port);
sourceComponent.getConfiguredReferences().add(cref);
PojoService sourceService = new PojoService();
- sourceService.setInterfaceContract(inter);
+ sourceService.setServiceContract(inter);
sourceService.setName("GenericComponent");
PojoConfiguredService cService = new PojoConfiguredService();
cService.setService(sourceService);
@@ -149,7 +137,7 @@
sourceComponent.getConfiguredServices().add(cService);
PojoService targetService = new PojoService();
- targetService.setInterfaceContract(inter);
+ targetService.setServiceContract(inter);
targetService.setName("GenericComponent");
PojoConfiguredService cTargetService = new PojoConfiguredService();
cTargetService.setService(targetService);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java Mon Feb 20 23:34:58 2006
@@ -9,7 +9,6 @@
import org.apache.tuscany.container.java.config.JavaComponentRuntimeConfiguration;
import org.apache.tuscany.container.java.invocation.mock.MockHandler;
-import org.apache.tuscany.container.java.invocation.mock.MockJavaOperationType;
import org.apache.tuscany.container.java.invocation.mock.MockScopeContext;
import org.apache.tuscany.container.java.invocation.mock.MockSyncInterceptor;
import org.apache.tuscany.container.java.invocation.mock.SimpleTarget;
@@ -25,12 +24,10 @@
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.message.impl.PojoMessageFactory;
import org.apache.tuscany.core.message.impl.PojoMessageImpl;
-import org.apache.tuscany.model.types.OperationType;
public class JavaTargetWireBuilderTestCase extends TestCase {
private Method hello;
-
private Method goodbye;
public JavaTargetWireBuilderTestCase() {
@@ -51,9 +48,8 @@
*/
public void testInvocation() throws Exception {
MessageFactory msgFactory = new PojoMessageFactory();
- OperationType operation = new MockJavaOperationType(hello);
- InvocationConfiguration source = new InvocationConfiguration(operation);
+ InvocationConfiguration source = new InvocationConfiguration(hello);
MockHandler sourceRequestHandler = new MockHandler();
MockHandler sourceResponseHandler = new MockHandler();
MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
@@ -62,14 +58,14 @@
source.addSourceInterceptor(sourceInterceptor);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<OperationType, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
- sourceInvocationConfigs.put(operation, source);
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), null, msgFactory);
sourceFactory.setProxyConfiguration(sourceConfig);
sourceFactory.setBusinessInterface(SimpleTarget.class);
- InvocationConfiguration target = new InvocationConfiguration(operation);
+ InvocationConfiguration target = new InvocationConfiguration(hello);
MockHandler targetRequestHandler = new MockHandler();
MockHandler targetResponseHandler = new MockHandler();
MockSyncInterceptor targetInterceptor = new MockSyncInterceptor();
@@ -79,8 +75,8 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<OperationType, InvocationConfiguration> targetInvocationConfigs = new HashMap();
- targetInvocationConfigs.put(operation, target);
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), null, msgFactory);
targetFactory.setProxyConfiguration(targetConfig);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java Mon Feb 20 23:34:58 2006
@@ -16,13 +16,13 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.components.ModuleScopeComponentImpl;
import org.apache.tuscany.container.java.mock.components.SessionScopeComponentImpl;
import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.model.assembly.ExtensibleModelObject;
+import org.apache.tuscany.model.assembly.Extensible;
import org.apache.tuscany.model.assembly.ScopeEnum;
import org.apache.tuscany.model.assembly.SimpleComponent;
@@ -42,9 +42,9 @@
*
* @param ctx the parent module context
*/
- public static List<ExtensibleModelObject> createAssembly(AggregateContext ctx) throws BuilderException {
+ public static List<Extensible> createAssembly(AggregateContext ctx) throws BuilderException {
try {
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", ModuleScopeComponentImpl.class,
ScopeEnum.MODULE_LITERAL);
SimpleComponent sessionComponent = MockAssemblyFactory.createComponent("TestService2",
@@ -54,7 +54,7 @@
builder.build(component, ctx);
builder.build(sessionComponent, ctx);
builder.build(requestComponent, ctx);
- List<ExtensibleModelObject> configs = new ArrayList();
+ List<Extensible> configs = new ArrayList();
configs.add(component);
configs.add(sessionComponent);
configs.add(requestComponent);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAssemblyFactory.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAssemblyFactory.java Mon Feb 20 23:34:58 2006
@@ -17,21 +17,14 @@
package org.apache.tuscany.container.java.mock;
import org.apache.tuscany.container.java.assembly.JavaImplementation;
-import org.apache.tuscany.container.java.assembly.pojo.PojoJavaImplementation;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.system.assembly.SystemImplementation;
-import org.apache.tuscany.core.system.assembly.pojo.PojoSystemImplementation;
import org.apache.tuscany.model.assembly.Component;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.SimpleComponent;
-import org.apache.tuscany.model.assembly.pojo.PojoAggregateComponent;
-import org.apache.tuscany.model.assembly.pojo.PojoComponent;
-import org.apache.tuscany.model.assembly.pojo.PojoJavaInterface;
-import org.apache.tuscany.model.assembly.pojo.PojoService;
-import org.apache.tuscany.model.assembly.pojo.PojoSimpleComponent;
-import org.apache.tuscany.model.types.java.JavaInterface;
+import org.apache.tuscany.model.types.java.JavaServiceContract;
/**
* Generates test components and module assemblies
@@ -40,14 +33,14 @@
*/
public class MockAssemblyFactory {
- public static SimpleComponent createComponent(String name, Class type, ScopeEnum scope) throws NoSuchMethodException {
+ public static SimpleComponent createComponent(String name, Class type, Scope scope) throws NoSuchMethodException {
SimpleComponent sc = new PojoSimpleComponent();
JavaImplementation impl = new PojoJavaImplementation();
- impl.setClass(type.getName());
+ impl.setImplementationClass(type.getName());
sc.setComponentImplementation(impl);
Service s = new PojoService();
- JavaInterface ji = new PojoJavaInterface();
- s.setInterfaceContract(ji);
+ JavaServiceContract ji = new PojoJavaInterface();
+ s.setServiceContract(ji);
ji.setScope(scope);
impl.getServices().add(s);
sc.setName(name);
@@ -55,7 +48,7 @@
return sc;
}
- public static Component createSystemComponent(String name, String type, ScopeEnum scope) throws NoSuchMethodException,
+ public static Component createSystemComponent(String name, String type, Scope scope) throws NoSuchMethodException,
ClassNotFoundException {
Class claz = JavaIntrospectionHelper.loadClass(type);
@@ -66,11 +59,11 @@
sc = new PojoSimpleComponent();
}
SystemImplementation impl = new PojoSystemImplementation();
- impl.setClass(type);
+ impl.setImplementationClass(type);
sc.setComponentImplementation(impl);
Service s = new PojoService();
- JavaInterface ji = new PojoJavaInterface();
- s.setInterfaceContract(ji);
+ JavaServiceContract ji = new PojoJavaInterface();
+ s.setServiceContract(ji);
ji.setScope(scope);
impl.getServices().add(s);
sc.setName(name);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java Mon Feb 20 23:34:58 2006
@@ -24,7 +24,7 @@
import org.apache.tuscany.core.context.ConfigurationContext;
import org.apache.tuscany.core.context.ScopeContext;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.model.assembly.ExtensibleModelObject;
+import org.apache.tuscany.model.assembly.Extensible;
/**
* A mock configuration context
@@ -39,10 +39,10 @@
this.builders=builders;
}
- public void configure(ExtensibleModelObject model) throws ConfigurationException {
+ public void configure(Extensible model) throws ConfigurationException {
}
- public void build(AggregateContext parent, ExtensibleModelObject model) throws BuilderConfigException {
+ public void build(AggregateContext parent, Extensible model) throws BuilderConfigException {
AssemblyVisitor visitor = new AssemblyVisitor(parent, builders);
visitor.start(model);
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockModuleFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockModuleFactory.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockModuleFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockModuleFactory.java Mon Feb 20 23:34:58 2006
@@ -40,7 +40,7 @@
oType.setJavaMethod((Method) JavaIntrospectionHelper.getBeanProperty(GenericComponent.class, "getString", null));
type.addOperationType(oType);
inter.setInterfaceType(type);
- ref.setInterfaceContract(inter);
+ ref.setServiceContract(inter);
cref.setReference(ref);
cref.setPart(targetComponent);
PojoPort port = new PojoPort();
@@ -48,7 +48,7 @@
cref.setPort(port);
sourceComponent.getConfiguredReferences().add(cref);
PojoService sourceService = new PojoService();
- sourceService.setInterfaceContract(inter);
+ sourceService.setServiceContract(inter);
sourceService.setName("GenericComponent");
PojoConfiguredService cService = new PojoConfiguredService();
cService.setService(sourceService);
@@ -59,7 +59,7 @@
sourceComponent.getConfiguredServices().add(cService);
PojoService targetService = new PojoService();
- targetService.setInterfaceContract(inter);
+ targetService.setServiceContract(inter);
targetService.setName("GenericComponent");
PojoConfiguredService cTargetService = new PojoConfiguredService();
cTargetService.setService(targetService);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java Mon Feb 20 23:34:58 2006
@@ -43,7 +43,7 @@
import org.apache.tuscany.model.assembly.pojo.PojoReference;
import org.apache.tuscany.model.assembly.pojo.PojoService;
import org.apache.tuscany.model.assembly.pojo.PojoSimpleComponent;
-import org.apache.tuscany.model.types.java.JavaInterface;
+import org.apache.tuscany.model.types.java.JavaServiceContract;
/**
* Creates test artifacts for system types such as runtime configurations and system components
@@ -97,11 +97,11 @@
sc = new PojoSimpleComponent();
}
SystemImplementation impl = new PojoSystemImplementation();
- impl.setClass(type);
+ impl.setImplementationClass(type);
sc.setComponentImplementation(impl);
Service s = new PojoService();
- JavaInterface ji = new PojoJavaInterface();
- s.setInterfaceContract(ji);
+ JavaServiceContract ji = new PojoJavaInterface();
+ s.setServiceContract(ji);
ji.setScope(scope);
impl.getServices().add(s);
sc.setName(name);
@@ -113,7 +113,7 @@
AggregateContext aggregateContext) throws NoSuchMethodException {
EntryPoint ep = createEntryPoint(name, refName);
- ep.getConfiguredReference().getConfiguredServices().get(0).setPart(component);
+ ep.getConfiguredReference().getTargetConfiguredServices().get(0).setPart(component);
SystemEntryPointBuilder builder = new SystemEntryPointBuilder();
builder.build(ep, aggregateContext);
return ep;
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java Mon Feb 20 23:34:58 2006
@@ -30,7 +30,7 @@
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.AggregateScopeContext;
import org.apache.tuscany.model.assembly.Component;
-import org.apache.tuscany.model.assembly.ExtensibleModelObject;
+import org.apache.tuscany.model.assembly.Extensible;
import junit.framework.Assert;
/**
@@ -56,8 +56,8 @@
scopeContainer.start();
AggregateContext child = (AggregateContext) scopeContainer.getContext("AggregateComponent");
- List<ExtensibleModelObject> models = MockAggregateAssemblyFactory.createAssembly(moduleComponentCtx);
- for (ExtensibleModelObject model : models) {
+ List<Extensible> models = MockAggregateAssemblyFactory.createAssembly(moduleComponentCtx);
+ for (Extensible model : models) {
child.registerModelObject(model);
}
@@ -112,8 +112,8 @@
.getComponentImplementation().getRuntimeConfiguration());
scopeContainer.start();
AggregateContext child = (AggregateContext) scopeContainer.getContext("AggregateComponent");
- List<ExtensibleModelObject> parts = MockAggregateAssemblyFactory.createAssembly(moduleComponentCtx);
- for (ExtensibleModelObject part : parts) {
+ List<Extensible> parts = MockAggregateAssemblyFactory.createAssembly(moduleComponentCtx);
+ for (Extensible part : parts) {
child.registerModelObject(part);
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java Mon Feb 20 23:34:58 2006
@@ -22,7 +22,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.components.SessionScopeComponent;
import org.apache.tuscany.container.java.mock.components.SessionScopeComponentImpl;
@@ -205,7 +205,7 @@
// ----------------------------------
// Private methods
// ----------------------------------
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", SessionScopeComponentImpl.class, ScopeEnum.SESSION_LITERAL);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java Mon Feb 20 23:34:58 2006
@@ -22,7 +22,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.components.ModuleScopeComponentImpl;
import org.apache.tuscany.container.java.mock.components.ModuleScopeInitDestroyComponent;
@@ -106,7 +106,7 @@
// Private methods
// ----------------------------------
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", ModuleScopeComponentImpl.class, ScopeEnum.MODULE_LITERAL);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java Mon Feb 20 23:34:58 2006
@@ -22,7 +22,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.components.RequestScopeComponent;
import org.apache.tuscany.container.java.mock.components.RequestScopeComponentImpl;
@@ -126,7 +126,7 @@
// Private methods
// ----------------------------------
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", RequestScopeComponentImpl.class,
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java Mon Feb 20 23:34:58 2006
@@ -22,7 +22,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.components.StatelessComponent;
import org.apache.tuscany.container.java.mock.components.StatelessComponentImpl;
@@ -102,7 +102,7 @@
// Private methods
// ----------------------------------
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createConfigurations()
throws NoSuchMethodException, BuilderException {
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java Mon Feb 20 23:34:58 2006
@@ -22,7 +22,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.components.SessionScopeDestroyOnlyComponent;
import org.apache.tuscany.container.java.mock.components.SessionScopeInitDestroyComponent;
@@ -121,7 +121,7 @@
// Private methods
// ----------------------------------
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java Mon Feb 20 23:34:58 2006
@@ -22,7 +22,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.components.ModuleScopeDestroyOnlyComponent;
import org.apache.tuscany.container.java.mock.components.ModuleScopeEagerInitComponent;
@@ -153,7 +153,7 @@
// Private methods
// ----------------------------------
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java?rev=379386&r1=379385&r2=379386&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java Mon Feb 20 23:34:58 2006
@@ -22,7 +22,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder2;
import org.apache.tuscany.container.java.mock.MockAssemblyFactory;
import org.apache.tuscany.container.java.mock.components.SessionScopeDestroyOnlyComponent;
import org.apache.tuscany.container.java.mock.components.SessionScopeInitDestroyComponent;
@@ -114,7 +114,7 @@
// Private methods
// ----------------------------------
- JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+ JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];