You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/12/26 21:41:20 UTC
svn commit: r490367 [1/2] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/implementation/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/
kernel/core/src/main/java/org/apache/tuscany/core/imple...
Author: jmarino
Date: Tue Dec 26 12:41:14 2006
New Revision: 490367
URL: http://svn.apache.org/viewvc?view=rev&rev=490367
Log:
remove Component.getServiceInterfaces()
Removed:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireRegistrationTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java
incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java
incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java
incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java
incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceComponentTestCase.java
incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAAtomicComponent.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java Tue Dec 26 12:41:14 2006
@@ -56,7 +56,6 @@
protected EventInvoker<Object> destroyInvoker;
protected PojoObjectFactory<?> instanceFactory;
protected List<String> constructorParamNames;
- protected List<Class<?>> serviceInterfaces;
protected Map<String, Member> referenceSites;
protected Map<String, Member> resourceSites;
protected Map<String, Member> propertySites;
@@ -82,7 +81,6 @@
instanceFactory = configuration.getInstanceFactory();
constructorParamNames = configuration.getConstructorParamNames();
constructorParamTypes = configuration.getConstructorParamTypes();
- serviceInterfaces = configuration.getServiceInterfaces();
injectors = new ArrayList<Injector<Object>>();
referenceSites = configuration.getReferenceSite() != null ? configuration.getReferenceSite()
: new HashMap<String, Member>();
@@ -93,10 +91,6 @@
callbackSites = configuration.getCallbackSite() != null ? configuration.getCallbackSite()
: new HashMap<String, Member>();
implementationClass = configuration.getImplementationClass();
- }
-
- public List<Class<?>> getServiceInterfaces() {
- return serviceInterfaces;
}
public void init(Object instance) throws TargetInitializationException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java Tue Dec 26 12:41:14 2006
@@ -55,7 +55,6 @@
private Map<String, Member> propertySites = new HashMap<String, Member>();
private Map<String, Member> resourceSites = new HashMap<String, Member>();
private Map<String, Member> callbackSites = new HashMap<String, Member>();
- private List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
private WireService wireService;
private WorkContext workContext;
private WorkScheduler scheduler;
@@ -86,14 +85,6 @@
public void setScopeContainer(ScopeContainer scopeContainer) {
this.scopeContainer = scopeContainer;
- }
-
- public List<Class<?>> getServiceInterfaces() {
- return serviceInterfaces;
- }
-
- public void addServiceInterface(Class<?> serviceInterface) {
- serviceInterfaces.add(serviceInterface);
}
public PojoObjectFactory<?> getInstanceFactory() {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Tue Dec 26 12:41:14 2006
@@ -169,7 +169,6 @@
}
for (JavaMappedService service : componentType.getServices().values()) {
- configuration.addServiceInterface(service.getServiceContract().getInterfaceClass());
// setup callback injection sites
if (service.getCallbackReferenceName() != null) {
// Only if there is a callback reference in the service
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java Tue Dec 26 12:41:14 2006
@@ -88,9 +88,6 @@
if (destroyMethod != null) {
configuration.setDestroyInvoker(new MethodEventInvoker<Object>(destroyMethod));
}
- for (ServiceDefinition serviceDefinition : componentType.getServices().values()) {
- configuration.addServiceInterface(serviceDefinition.getServiceContract().getInterfaceClass());
- }
// setup property injection sites
for (JavaMappedProperty<?> property : componentType.getProperties().values()) {
configuration.addPropertySite(property.getName(), property.getMember());
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java Tue Dec 26 12:41:14 2006
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.core.implementation.system.component;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -50,15 +49,12 @@
public class SystemSingletonAtomicComponent<S, T extends S> extends AbstractSCAObject implements AtomicComponent {
private T instance;
- private List<Class<?>> serviceInterfaces;
private Map<String, InboundWire> inboundWires;
private WireService wireService = new JDKWireService();
public SystemSingletonAtomicComponent(String name, CompositeComponent parent, Class<S> interfaze, T instance) {
super(name, parent);
this.instance = instance;
- serviceInterfaces = new ArrayList<Class<?>>(1);
- serviceInterfaces.add(interfaze);
inboundWires = new HashMap<String, InboundWire>();
initWire(interfaze);
}
@@ -66,19 +62,14 @@
public SystemSingletonAtomicComponent(String name,
CompositeComponent parent,
- List<Class<?>> serviceInterfaces,
+ List<Class<?>> services,
T instance) {
super(name, parent);
this.instance = instance;
- this.serviceInterfaces = serviceInterfaces;
inboundWires = new HashMap<String, InboundWire>();
- for (Class<?> interfaze : serviceInterfaces) {
+ for (Class<?> interfaze : services) {
initWire(interfaze);
}
- }
-
- public List<Class<?>> getServiceInterfaces() {
- return serviceInterfaces;
}
public Scope getScope() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java Tue Dec 26 12:41:14 2006
@@ -116,7 +116,6 @@
private AtomicComponent createComponent(ScopeContainer scopeContainer) {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scopeContainer);
- configuration.addServiceInterface(CompositeScopeInitDestroyComponent.class);
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java Tue Dec 26 12:41:14 2006
@@ -118,7 +118,6 @@
private AtomicComponent createContext(ScopeContainer scopeContainer) {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scopeContainer);
- configuration.addServiceInterface(ConversationalScopeInitDestroyComponent.class);
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java Tue Dec 26 12:41:14 2006
@@ -134,7 +134,6 @@
private AtomicComponent createComponent(ScopeContainer scopeContainer) {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scopeContainer);
- configuration.addServiceInterface(SessionScopeInitDestroyComponent.class);
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java Tue Dec 26 12:41:14 2006
@@ -117,7 +117,6 @@
private AtomicComponent createComponent(ScopeContainer scopeContainer) {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scopeContainer);
- configuration.addServiceInterface(RequestScopeInitDestroyComponent.class);
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java Tue Dec 26 12:41:14 2006
@@ -29,7 +29,6 @@
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.system.component.SystemAtomicComponentImpl;
import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.core.mock.component.RequestScopeInitDestroyComponent;
import org.apache.tuscany.core.mock.component.StatelessComponent;
import org.apache.tuscany.core.mock.component.StatelessComponentImpl;
@@ -113,7 +112,6 @@
private AtomicComponent createComponent(ScopeContainer scopeContainer) {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scopeContainer);
- configuration.addServiceInterface(RequestScopeInitDestroyComponent.class);
configuration.setInstanceFactory(factory);
configuration.setName("foo");
AtomicComponent component = new SystemAtomicComponentImpl(configuration);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java Tue Dec 26 12:41:14 2006
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.core.component.scope;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
@@ -47,9 +44,6 @@
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
EasyMock.expect(component.createInstance()).andThrow(new ObjectCreationException(""));
EasyMock.expect(component.getInitLevel()).andReturn(1);
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Object.class);
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.replay(component);
scope.register(component);
scope.onEvent(new CompositeStart(this, null));
@@ -67,9 +61,6 @@
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
EasyMock.expect(component.createInstance()).andReturn(new Object());
EasyMock.expect(component.getInitLevel()).andReturn(1);
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Object.class);
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
component.init(EasyMock.isA(Object.class));
component.destroy(EasyMock.isA(Object.class));
EasyMock.expectLastCall().andThrow(new TargetDestructionException("", ""));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java Tue Dec 26 12:41:14 2006
@@ -46,7 +46,6 @@
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("destroy"));
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
- configuration.addServiceInterface(InitDestroyOnce.class);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Constructor<InitDestroyOnce> ctr = InitDestroyOnce.class.getConstructor((Class<?>[]) null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java Tue Dec 26 12:41:14 2006
@@ -57,7 +57,6 @@
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("destroy"));
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
- configuration.addServiceInterface(ConversationalScopeRestartTestCase.InitDestroyOnce.class);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Constructor<InitDestroyOnce> ctr = InitDestroyOnce.class.getConstructor((Class<?>[]) null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInitDestroyErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInitDestroyErrorTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInitDestroyErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInitDestroyErrorTestCase.java Tue Dec 26 12:41:14 2006
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.core.component.scope;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
@@ -50,9 +47,6 @@
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
EasyMock.expect(component.createInstance()).andThrow(new ObjectCreationException(""));
EasyMock.expect(component.isEagerInit()).andReturn(true);
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Object.class);
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.replay(component);
scope.register(component);
scope.onEvent(new HttpSessionStart(this, new Object()));
@@ -71,9 +65,6 @@
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
EasyMock.expect(component.createInstance()).andReturn(new Object());
EasyMock.expect(component.isEagerInit()).andReturn(true);
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Object.class);
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
component.init(EasyMock.isA(Object.class));
component.destroy(EasyMock.isA(Object.class));
EasyMock.expectLastCall().andThrow(new TargetDestructionException("", ""));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java Tue Dec 26 12:41:14 2006
@@ -50,7 +50,6 @@
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("destroy"));
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
- configuration.addServiceInterface(HttpSessionScopeRestartTestCase.InitDestroyOnce.class);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Constructor<InitDestroyOnce> ctr = InitDestroyOnce.class.getConstructor((Class<?>[]) null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java Tue Dec 26 12:41:14 2006
@@ -62,7 +62,6 @@
Map<String, AtomicComponent> components = new HashMap<String, AtomicComponent>();
AtomicComponent targetComponent = createAtomicComponent(target, targetScopeContainer, targetClass);
PojoConfiguration sourceConfig = new PojoConfiguration();
- sourceConfig.getServiceInterfaces().addAll(sourceInterfaces);
sourceConfig.setScopeContainer(sourceScopeContainer);
sourceConfig.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
@@ -115,7 +114,6 @@
throws NoSuchMethodException {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(container);
- configuration.addServiceInterface(clazz);
configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
Method[] methods = clazz.getMethods();
for (Method method : methods) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java Tue Dec 26 12:41:14 2006
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.core.component.scope;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
@@ -50,9 +47,6 @@
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
EasyMock.expect(component.createInstance()).andThrow(new ObjectCreationException(""));
EasyMock.expect(component.isEagerInit()).andReturn(true);
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Object.class);
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.replay(component);
scope.register(component);
scope.onEvent(new RequestStart(this));
@@ -71,9 +65,6 @@
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
EasyMock.expect(component.createInstance()).andReturn(new Object());
EasyMock.expect(component.isEagerInit()).andReturn(true);
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Object.class);
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
component.init(EasyMock.isA(Object.class));
component.destroy(EasyMock.isA(Object.class));
EasyMock.expectLastCall().andThrow(new TargetDestructionException("", ""));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java Tue Dec 26 12:41:14 2006
@@ -48,7 +48,6 @@
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("destroy"));
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
- configuration.addServiceInterface(InitDestroyOnce.class);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Constructor<InitDestroyOnce> ctr = InitDestroyOnce.class.getConstructor((Class<?>[]) null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java Tue Dec 26 12:41:14 2006
@@ -21,7 +21,6 @@
import java.lang.reflect.Type;
import java.util.Hashtable;
-import java.util.List;
import java.util.Map;
import org.apache.tuscany.spi.ObjectCreationException;
@@ -66,7 +65,7 @@
}
public void testProcessInclusionOfInterceptor() {
-
+
InboundWire inboundWire = createMock(InboundWire.class);
OutboundWire outboundWire = createMock(OutboundWire.class);
@@ -75,7 +74,7 @@
Map<Operation<?>, InboundInvocationChain> inChainsMap =
new Hashtable<Operation<?>, InboundInvocationChain>();
- Operation<Type> operation1 = new Operation<Type>("testMethod", null, null, null);
+ Operation<Type> operation1 = new Operation<Type>("testMethod", null, null, null);
operation1.setServiceContract(serviceContract);
InboundInvocationChainImpl inChain = new InboundInvocationChainImpl(operation1);
inChainsMap.put(operation1, inChain);
@@ -171,10 +170,6 @@
}
public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
- return null;
- }
-
- public List<Class<?>> getServiceInterfaces() {
return null;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java Tue Dec 26 12:41:14 2006
@@ -50,7 +50,6 @@
interfaces.add(Source2.class);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(interfaces);
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(interfaces);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -77,7 +76,6 @@
interfaces.add(Source2.class);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(interfaces);
EasyMock.expect(component.isSystem()).andReturn(false).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(interfaces);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java Tue Dec 26 12:41:14 2006
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.core.implementation.composite;
-import java.util.List;
-
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
@@ -94,22 +92,6 @@
composite.register(new ServiceExtension("foo", null));
composite.register(getReference("bar"));
Assert.assertEquals(1, composite.getReferences().size());
- }
-
- public void testServiceInterfaces() throws Exception {
- CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
- Service service1 = getService("foo", Foo.class);
- composite.register(service1);
- Service service2 = getService("bar", Bar.class);
- composite.register(service2);
-
- List<Class<?>> interfaces = composite.getServiceInterfaces();
- assertEquals(2, interfaces.size());
- for (Class o : interfaces) {
- if (!(Foo.class.isAssignableFrom(o)) && !(Bar.class.isAssignableFrom(o))) {
- fail();
- }
- }
}
public void testOnEvent() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java Tue Dec 26 12:41:14 2006
@@ -52,8 +52,6 @@
inbound.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Foo.class);
QualifiedName qName = new QualifiedName("target/bar");
OutboundWire outbound = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(outbound.getTargetName()).andReturn(qName).atLeastOnce();
@@ -71,7 +69,6 @@
AtomicComponent source = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(source.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(source.getServiceInterfaces()).andReturn(services);
EasyMock.expect(source.getOutboundWires()).andReturn(wireMap);
source.getInboundWires();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
@@ -88,7 +85,6 @@
AtomicComponent target = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(target.getName()).andReturn("target").atLeastOnce();
- EasyMock.expect(target.getServiceInterfaces()).andReturn(services);
EasyMock.expect(target.getInboundWire("bar")).andReturn(inbound).atLeastOnce();
Map<String, InboundWire> inboundWires = new HashMap<String, InboundWire>();
inboundWires.put("bar", inbound);
@@ -122,8 +118,6 @@
EasyMock.expect(inbound.getServiceContract()).andReturn(new JavaServiceContract(Foo.class)).atLeastOnce();
EasyMock.replay(inbound);
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Foo.class);
QualifiedName qName = new QualifiedName("target/bar");
OutboundWire outbound = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(outbound.isAutowire()).andReturn(false);
@@ -139,7 +133,6 @@
CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, new ConnectorImpl(), null);
AtomicComponent source = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(source.getServiceInterfaces()).andReturn(services);
Map<String, InboundWire> inboundWires = new HashMap<String, InboundWire>();
inboundWires.put("bar", inbound);
source.getInboundWires();
@@ -153,7 +146,6 @@
AtomicComponent target = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(target.getName()).andReturn("target").atLeastOnce();
- EasyMock.expect(target.getServiceInterfaces()).andReturn(services);
inboundWires.put("bar", inbound);
EasyMock.expect(target.getInboundWires()).andReturn(inboundWires).atLeastOnce();
EasyMock.expect(target.isSystem()).andReturn(false).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java Tue Dec 26 12:41:14 2006
@@ -46,7 +46,6 @@
CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -63,7 +62,6 @@
CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component.isSystem()).andReturn(false).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -83,7 +81,6 @@
CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -91,7 +88,6 @@
parent.register(component);
AtomicComponent component2 = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component2.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component2.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component2.isSystem()).andReturn(false).atLeastOnce();
EasyMock.expect(component2.getInboundWires()).andReturn(wires).atLeastOnce();
EasyMock.replay(component2);
@@ -107,7 +103,6 @@
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
component.stop();
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
@@ -126,7 +121,6 @@
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component.isSystem()).andReturn(false).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -145,7 +139,6 @@
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -167,7 +160,6 @@
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
TestUtils.populateInboundWires(component, wires);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java Tue Dec 26 12:41:14 2006
@@ -47,7 +47,6 @@
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("source").atLeastOnce();
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(interfaces);
Map<String, InboundWire> wires = TestUtils.createInboundWires(interfaces);
TestUtils.populateInboundWires(component, wires);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -66,7 +65,6 @@
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("source").atLeastOnce();
EasyMock.expect(component.isSystem()).andReturn(false).atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(interfaces);
Map<String, InboundWire> wires = TestUtils.createInboundWires(interfaces);
TestUtils.populateInboundWires(component, wires);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java Tue Dec 26 12:41:14 2006
@@ -60,7 +60,6 @@
TestUtils.populateInboundWires(component, wires);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(interfaces);
EasyMock.replay(component);
CompositeComponent composite = new CompositeComponentImpl("foo", null, null, null);
@@ -89,7 +88,6 @@
TestUtils.populateInboundWires(component, wires);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(interfaces);
EasyMock.replay(component);
CompositeComponent composite = new CompositeComponentImpl("foo", null, null, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java Tue Dec 26 12:41:14 2006
@@ -50,7 +50,6 @@
AtomicComponent component = createMock(AtomicComponent.class);
expect(component.getName()).andReturn("source").anyTimes();
component.stop();
- expect(component.getServiceInterfaces()).andReturn(interfaces);
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(interfaces);
TestUtils.populateInboundWires(component, wires);
@@ -69,7 +68,6 @@
AtomicComponent component = createMock(AtomicComponent.class);
expect(component.getName()).andReturn("source").anyTimes();
component.stop();
- expect(component.getServiceInterfaces()).andReturn(interfaces);
EasyMock.expect(component.isSystem()).andReturn(false).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(interfaces);
TestUtils.populateInboundWires(component, wires);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java Tue Dec 26 12:41:14 2006
@@ -49,7 +49,6 @@
EasyMock.expect(component1.getName()).andReturn("source").atLeastOnce();
EasyMock.expect(component1.isSystem()).andReturn(true).atLeastOnce();
component1.stop();
- EasyMock.expect(component1.getServiceInterfaces()).andReturn(interfaces);
Map<String, InboundWire> wires = TestUtils.createInboundWires(interfaces);
TestUtils.populateInboundWires(component1, wires);
EasyMock.expect(component1.getInboundWires()).andReturn(wires).atLeastOnce();
@@ -59,7 +58,6 @@
EasyMock.expect(component2.getName()).andReturn("source").atLeastOnce();
EasyMock.expect(component2.isSystem()).andReturn(true).atLeastOnce();
component2.stop();
- EasyMock.expect(component2.getServiceInterfaces()).andReturn(interfaces);
EasyMock.replay(component2);
parent.register(component1);
@@ -78,7 +76,6 @@
CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
Map<String, InboundWire> wires = TestUtils.createInboundWires(services);
TestUtils.populateInboundWires(component, wires);
@@ -87,7 +84,6 @@
parent.register(component);
AtomicComponent component2 = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component2.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component2.getServiceInterfaces()).andReturn(services);
EasyMock.expect(component2.isSystem()).andReturn(true).atLeastOnce();
EasyMock.replay(component2);
try {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java Tue Dec 26 12:41:14 2006
@@ -83,13 +83,6 @@
}
}
- public void testServiceInterfaces() throws Exception {
- JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
- assertEquals(1, component.getServiceInterfaces().size());
- assertEquals(Source.class, component.getServiceInterfaces().get(0));
- }
-
protected void setUp() throws Exception {
super.setUp();
parent = new CompositeComponentImpl(null, null, null, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Tue Dec 26 12:41:14 2006
@@ -50,7 +50,6 @@
final Target target = new TargetImpl();
PojoConfiguration configuration = new PojoConfiguration();
configuration.addReferenceSite("target", SourceImpl.class.getMethod("setTarget", Target.class));
- configuration.addServiceInterface(Source.class);
Constructor<SourceImpl> ctr = SourceImpl.class.getConstructor();
configuration.setInstanceFactory(new PojoObjectFactory<SourceImpl>(ctr));
configuration.setScopeContainer(scope);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Tue Dec 26 12:41:14 2006
@@ -182,7 +182,6 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
configuration.setInstanceFactory(new PojoObjectFactory<TargetImpl>(TargetImpl.class.getConstructor()));
- configuration.addServiceInterface(Target.class);
configuration.setParent(parent);
configuration.setWorkContext(workContext);
configuration.setName("source");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java Tue Dec 26 12:41:14 2006
@@ -41,7 +41,6 @@
public void testDefaultCreationAndInit() throws Exception {
PojoObjectFactory<Foo> factory = new PojoObjectFactory<Foo>(Foo.class.getConstructor((Class[]) null));
PojoConfiguration configuration = new PojoConfiguration();
- configuration.addServiceInterface(Foo.class);
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
configuration.setName("foo");
@@ -54,7 +53,6 @@
public void testDestroy() throws Exception {
PojoObjectFactory<Foo> factory = new PojoObjectFactory<Foo>(Foo.class.getConstructor((Class[]) null));
PojoConfiguration configuration = new PojoConfiguration();
- configuration.addServiceInterface(Foo.class);
configuration.setInstanceFactory(factory);
configuration.setDestroyInvoker(destroyInvoker);
configuration.setName("foo");
@@ -67,7 +65,6 @@
public void testReferenceAndPropertyConstructor() throws Exception {
PojoObjectFactory<Bar> factory = new PojoObjectFactory<Bar>(Bar.class.getConstructor(String.class, Foo.class));
PojoConfiguration configuration = new PojoConfiguration();
- configuration.addServiceInterface(Foo.class);
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
configuration.addConstructorParamName("foo");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java Tue Dec 26 12:41:14 2006
@@ -45,7 +45,6 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
configuration.addReferenceSite("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
- configuration.addServiceInterface(Source.class);
configuration.setInstanceFactory(new PojoObjectFactory<SourceImpl>(SourceImpl.class.getConstructor()));
configuration.setName("source");
AtomicComponent component = new SystemAtomicComponentImpl(configuration);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Tue Dec 26 12:41:14 2006
@@ -120,7 +120,6 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(sourceScope);
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
- configuration.addServiceInterface(sourceClass);
configuration.setWireService(WIRE_SERVICE);
for (Map.Entry<String, Member> entry : members.entrySet()) {
configuration.addReferenceSite(entry.getKey(), entry.getValue());
@@ -174,7 +173,6 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(sourceScope);
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
- configuration.addServiceInterface(sourceClass);
configuration.setWireService(WIRE_SERVICE);
for (Map.Entry<String, Member> entry : members.entrySet()) {
configuration.addReferenceSite(entry.getKey(), entry.getValue());
@@ -237,7 +235,6 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
- configuration.addServiceInterface(clazz);
configuration.setWireService(WIRE_SERVICE);
configuration.setWorkContext(new WorkContextImpl());
configuration.setName(name);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java Tue Dec 26 12:41:14 2006
@@ -34,11 +34,6 @@
public interface Component extends SCAObject {
/**
- * Returns the service interfaces implemented by the component
- */
- List<Class<?>> getServiceInterfaces();
-
- /**
* Adds a target-side wire. Target-side wire factories contain the invocation chains associated with the destination
* service of a wire
*/
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Tue Dec 26 12:41:14 2006
@@ -232,16 +232,6 @@
return null;
}
- public List<Class<?>> getServiceInterfaces() {
- List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>(services.size());
- synchronized (services) {
- for (Service service : services) {
- serviceInterfaces.add(service.getInboundWire().getServiceContract().getInterfaceClass());
- }
- }
- return serviceInterfaces;
- }
-
public InboundWire resolveAutowire(Class<?> instanceInterface) throws TargetResolutionException {
InboundWire wire = autowireInternal.get(instanceInterface);
if (wire != null) {
@@ -475,9 +465,8 @@
}
protected void registerAutowire(AtomicComponent component) throws InvalidAutowireInterface {
- List<Class<?>> services = component.getServiceInterfaces();
- for (Class<?> service : services) {
- registerAutowireInternal(service, component);
+ for (InboundWire wire : component.getInboundWires().values()) {
+ registerAutowireInternal(wire.getServiceContract().getInterfaceClass(), component);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java Tue Dec 26 12:41:14 2006
@@ -30,26 +30,12 @@
* @version $Rev$ $Date$
*/
public abstract class SystemAtomicComponentExtension extends AtomicComponentExtension {
- protected List<Class<?>> interfazes;
public SystemAtomicComponentExtension(String name,
CompositeComponent parent,
ScopeContainer scopeContainer,
int initLevel) {
- this(name, null, parent, scopeContainer, initLevel);
- }
-
- public SystemAtomicComponentExtension(String name,
- List<Class<?>> serviceInterfaces,
- CompositeComponent parent,
- ScopeContainer scopeContainer,
- int initLevel) {
super(name, parent, scopeContainer, null, null, null, null, initLevel);
- this.interfazes = serviceInterfaces;
- }
-
- public List<Class<?>> getServiceInterfaces() {
- return interfazes;
}
public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java Tue Dec 26 12:41:14 2006
@@ -86,10 +86,6 @@
return null;
}
- public List<Class<?>> getServiceInterfaces() {
- return null;
- }
-
public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
return null;
}
Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java Tue Dec 26 12:41:14 2006
@@ -41,7 +41,6 @@
*/
public class GroovyAtomicComponent extends AtomicComponentExtension {
private final Class<? extends GroovyObject> groovyClass;
- private final List<Class<?>> services;
//FIXME properties should move up to AtomicComponentExtension
private final Map<String, ObjectFactory> properties;
@@ -56,13 +55,8 @@
configuration.getInitLevel());
this.groovyClass = configuration.getGroovyClass();
- this.services = Collections.unmodifiableList(configuration.getServices());
this.properties = new HashMap<String, ObjectFactory>();
assert groovyClass != null;
- }
-
- public List<Class<?>> getServiceInterfaces() {
- return services;
}
public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java Tue Dec 26 12:41:14 2006
@@ -43,21 +43,17 @@
*/
public class JavaScriptComponent extends AtomicComponentExtension {
- private final List<Class<?>> services;
-
private final Map<String, Object> properties;
private RhinoScript rhinoScript;
public JavaScriptComponent(String name, RhinoScript rhinoScript, Map<String, Object> properties,
- List<Class<?>> services,
CompositeComponent parent, ScopeContainer scopeContainer, WireService wireService,
WorkContext workContext,
ExecutionMonitor monitor) {
super(name, parent, scopeContainer, wireService, workContext, null, monitor, 0);
this.rhinoScript = rhinoScript;
- this.services = services;
this.scope = scopeContainer.getScope();
this.properties = properties;
}
@@ -94,10 +90,6 @@
}
// TODO: move all the following up to AtomicComponentExtension?
-
- public List<Class<?>> getServiceInterfaces() {
- return services;
- }
public Map<String, Object> getProperties() {
return properties;
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java Tue Dec 26 12:41:14 2006
@@ -103,7 +103,7 @@
scopeContainer = scopeRegistry.getScopeContainer(scope);
}
- return new JavaScriptComponent(name, rhinoScript, properties, services, parent, scopeContainer, wireService, workContext , monitor);
+ return new JavaScriptComponent(name, rhinoScript, properties, parent, scopeContainer, wireService, workContext , monitor);
}
private void enhanceRhinoScript(ServiceDefinition serviceDefn, JavaScriptImplementation implementation) throws BuilderConfigException {
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java Tue Dec 26 12:41:14 2006
@@ -122,7 +122,7 @@
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
JavaScriptComponent context =
- new JavaScriptComponent("source", implClass2, new HashMap<String, Object>(), services, null, scope,
+ new JavaScriptComponent("source", implClass2, new HashMap<String, Object>(), null, scope,
ArtifactFactory.createWireService(), null, null);
scope.register(context);
Operation<Type> operation = new Operation<Type>("greet", null, null, null, false, null, NO_CONVERSATION);
@@ -140,7 +140,7 @@
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
JavaScriptComponent context =
- new JavaScriptComponent("source", implClass2, new HashMap<String, Object>(), services, null, scope,
+ new JavaScriptComponent("source", implClass2, new HashMap<String, Object>(), null, scope,
ArtifactFactory.createWireService(), null, null);
scope.register(context);
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java Tue Dec 26 12:41:14 2006
@@ -43,8 +43,6 @@
*/
public class RubyComponent extends AtomicComponentExtension {
- private final List<Class<?>> services;
-
private final Map<String, Object> properties;
private RubyScript rubyScript;
@@ -54,7 +52,6 @@
public RubyComponent(String name,
RubyScript rubyScript,
String rubyClassName,
- List<Class<?>> services,
Map<String, Object> propValues,
CompositeComponent parent,
ScopeContainer scopeContainer,
@@ -65,7 +62,6 @@
this.rubyScript = rubyScript;
this.rubyClassName = rubyClassName;
- this.services = services;
this.scope = scopeContainer.getScope();
//this.properties = new HashMap<String, Object>();
this.properties = propValues;
@@ -111,10 +107,6 @@
}
// TODO: move all the following up to AtomicComponentExtension?
-
- public List<Class<?>> getServiceInterfaces() {
- return services;
- }
public Map<String, Object> getProperties() {
return properties;
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java Tue Dec 26 12:41:14 2006
@@ -83,7 +83,6 @@
return new RubyComponent(name,
rubyScript,
implementation.getRubyClassName(),
- services,
propertyValues,
parent,
scopeContainer,
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java Tue Dec 26 12:41:14 2006
@@ -119,7 +119,6 @@
RubyComponent context = new RubyComponent("source",
implClass2,
null,
- services,
properties,
null,
scope,
@@ -155,7 +154,6 @@
RubyComponent context = new RubyComponent("source",
implClass2,
null,
- services,
properties,
null,
scope,
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java Tue Dec 26 12:41:14 2006
@@ -38,7 +38,6 @@
* @version $Rev$ $Date$
*/
public class ScriptComponent extends AtomicComponentExtension {
- private final List<Class<?>> services;
private ScriptInstanceFactory factory;
public ScriptComponent(ComponentConfiguration config) {
@@ -51,7 +50,6 @@
config.getMonitor(),
config.getInitLevel());
this.factory = config.getFactory();
- this.services = config.getServices();
this.scope = config.getScopeContainer().getScope();
}
@@ -64,10 +62,6 @@
Method[] methods = operation.getServiceContract().getInterfaceClass().getMethods();
Method method = findMethod(operation, methods);
return new ScriptTargetInvoker(method.getName(), this);
- }
-
- public List<Class<?>> getServiceInterfaces() {
- return services;
}
protected void onReferenceWire(OutboundWire wire) {
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java Tue Dec 26 12:41:14 2006
@@ -19,11 +19,9 @@
package org.apache.tuscany.container.script;
import java.lang.reflect.Type;
-import java.util.ArrayList;
import java.util.List;
import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.model.Operation;
import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
import org.apache.tuscany.spi.model.Scope;
@@ -47,16 +45,6 @@
operation.setServiceContract(new Contract<Type>(List.class));
TargetInvoker invoker = component.createTargetInvoker("hashCode", operation, null);
assertNotNull(invoker);
- }
-
- public void testGetServiceInterfaces() {
- List<Class<?>> services = new ArrayList<Class<?>>();
- ComponentConfiguration config = new ComponentConfiguration();
- config.setName("foo");
- config.setScopeContainer(container);
- config.setServices(services);
- ScriptComponent pc = new ScriptComponent(config);
- assertEquals(services, pc.getServiceInterfaces());
}
@Override
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java?view=diff&rev=490367&r1=490366&r2=490367
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java Tue Dec 26 12:41:14 2006
@@ -18,9 +18,7 @@
*/
package org.apache.tuscany.persistence.datasource;
-import java.util.ArrayList;
import java.util.List;
-import javax.sql.DataSource;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -38,7 +36,6 @@
*/
public class DataSourceComponent extends SystemAtomicComponentExtension {
private ProviderObjectFactory instanceFactory;
- private List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
/**
* Creates a <code>DataSourceComponent</code>
@@ -57,7 +54,6 @@
super(name, parent, scopeContainer, initLevel);
this.instanceFactory = instanceFactory;
- serviceInterfaces.add(DataSource.class);
}
public Object createInstance() throws ObjectCreationException {
@@ -76,10 +72,6 @@
throw new DataSourceCloseException("Error closing data source provider", e);
}
}
- }
-
- public List<Class<?>> getServiceInterfaces() {
- return serviceInterfaces;
}
protected void onReferenceWire(OutboundWire wire) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org