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 2007/04/14 19:09:47 UTC
svn commit: r528841 - in /incubator/tuscany/java/sca/modules:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/bootstrap/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/test/java/org/apa...
Author: jsdelfino
Date: Sat Apr 14 10:09:46 2007
New Revision: 528841
URL: http://svn.apache.org/viewvc?view=rev&rev=528841
Log:
Removed the LocalBinding as it's not used by the Deployer anymore.
Removed:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/binding/local/
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/binding/local/
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/mock/wire/MockTargetInvoker.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/mock/MockTargetInvoker.java
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=528841&r1=528840&r2=528841
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Sat Apr 14 10:09:46 2007
@@ -20,9 +20,6 @@
import javax.xml.stream.XMLInputFactory;
-import org.apache.tuscany.contribution.service.ContributionService;
-import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
-import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl;
import org.apache.tuscany.core.component.ComponentManagerImpl;
@@ -151,7 +148,6 @@
compositeBuilder.init();
// builderRegistry.register(CompositeImplementation.class,
// compositeBuilder);
- builderRegistry.register(LocalBindingDefinition.class, new LocalBindingBuilder());
return builderRegistry;
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=528841&r1=528840&r2=528841
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Sat Apr 14 10:09:46 2007
@@ -31,7 +31,6 @@
import org.apache.tuscany.assembly.Property;
import org.apache.tuscany.assembly.SCABinding;
import org.apache.tuscany.assembly.Service;
-import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
import org.apache.tuscany.core.implementation.composite.ReferenceImpl;
import org.apache.tuscany.core.implementation.composite.ServiceImpl;
import org.apache.tuscany.core.util.JavaIntrospectionHelper;
@@ -164,18 +163,6 @@
return null;
}
URI uri = URI.create(context.getComponentId() + "#" + serviceDefinition.getName());
- if (serviceDefinition.getBindings().isEmpty()) {
- // if no bindings are configured, default to the local binding.
- // this should be changed to allow runtime selection
- if (serviceDefinition.getBindings().isEmpty()) {
- // TODO JFM implement capability for the runtime to choose a
- // binding
- org.apache.tuscany.assembly.Component component = serviceDefinition.getPromotedService()
- .getBinding(SCABinding.class).getComponent();
- URI targetURI = URI.create(context.getComponentId() + component.getName());
- serviceDefinition.getBindings().add(new LocalBindingDefinition(targetURI));
- }
- }
// FIXME:
URI targetUri = URI.create("#" + serviceDefinition.getPromotedService().getName());
org.apache.tuscany.spi.component.Service service = new ServiceImpl(uri, serviceDefinition, targetUri);
@@ -199,19 +186,6 @@
return null;
}
URI uri = URI.create(context.getComponentId() + "#" + referenceDefinition.getName());
- if (referenceDefinition.getBindings().isEmpty()) {
- // if no bindings are configured, default to the local binding.
- // this should be changed to allow runtime selection
- if (referenceDefinition.getBindings().isEmpty()) {
- // TODO JFM implement capability for the runtime to choose a
- // binding
- ComponentReference componentReference = referenceDefinition.getPromotedReferences().get(0);
- org.apache.tuscany.assembly.Component component = componentReference.getBinding(SCABinding.class)
- .getComponent();
- URI targetURI = URI.create(context.getComponentId() + component.getName());
- referenceDefinition.getBindings().add(new LocalBindingDefinition(targetURI));
- }
- }
Reference reference = new ReferenceImpl(uri, referenceDefinition);
for (Binding bindingDefinition : referenceDefinition.getBindings()) {
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java?view=diff&rev=528841&r1=528840&r2=528841
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java Sat Apr 14 10:09:46 2007
@@ -34,10 +34,6 @@
import org.apache.tuscany.assembly.impl.CompositeReferenceImpl;
import org.apache.tuscany.assembly.impl.CompositeServiceImpl;
import org.apache.tuscany.assembly.impl.SCABindingImpl;
-import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
-import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
-import org.apache.tuscany.core.binding.local.LocalReferenceBinding;
-import org.apache.tuscany.core.binding.local.LocalServiceBinding;
import org.apache.tuscany.core.component.ComponentManagerImpl;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.component.Component;
@@ -72,8 +68,6 @@
Service service = registry.build(definition, deploymentContext);
- assertEquals(1, service.getServiceBindings().size());
- assertTrue(service.getServiceBindings().get(0) instanceof LocalServiceBinding);
EasyMock.verify(deploymentContext);
EasyMock.verify(parent);
}
@@ -95,8 +89,6 @@
Reference reference = registry.build(definition, deploymentContext);
- assertEquals(1, reference.getReferenceBindings().size());
- assertTrue(reference.getReferenceBindings().get(0) instanceof LocalReferenceBinding);
EasyMock.verify(deploymentContext);
EasyMock.verify(parent);
}
@@ -107,7 +99,6 @@
EasyMock.expect(deploymentContext.getComponentId()).andReturn(URI.create("/default/")).anyTimes();
parent = EasyMock.createNiceMock(Component.class);
registry = new BuilderRegistryImpl(new ComponentManagerImpl(), null);
- registry.register(LocalBindingDefinition.class, new LocalBindingBuilder());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org