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/27 11:23:45 UTC
svn commit: r490475 [1/2] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/builder/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/composi...
Author: jmarino
Date: Wed Dec 27 02:23:42 2006
New Revision: 490475
URL: http://svn.apache.org/viewvc?view=rev&rev=490475
Log:
Rename Binding to BindingDefinition
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBinding.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Binding.java
incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBinding.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBinding.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBinding.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBinding.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingDefinition.java (contents, props changed)
- copied, changed from r490460, incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBinding.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBinding.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Binding.java
incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBinding.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBinding.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBinding.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBinding.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBinding.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemBindingLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java
incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/WebServiceOperationMetaData.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoaderTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingBuilderTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingTestCase.java
incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java
incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Wed Dec 27 02:23:42 2006
@@ -65,7 +65,7 @@
import org.apache.tuscany.core.implementation.system.loader.SystemComponentTypeLoader;
import org.apache.tuscany.core.implementation.system.loader.SystemCompositeComponentTypeLoader;
import org.apache.tuscany.core.implementation.system.loader.SystemImplementationLoader;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemBindingDefinition;
import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.loader.ComponentLoader;
@@ -245,7 +245,7 @@
SystemCompositeBuilder builder = new SystemCompositeBuilder(builderRegistry, createConnector());
builderRegistry.register(SystemCompositeImplementation.class, builder);
builderRegistry.register(SystemImplementation.class, new SystemComponentBuilder());
- builderRegistry.register(SystemBinding.class, new SystemBindingBuilder());
+ builderRegistry.register(SystemBindingDefinition.class, new SystemBindingBuilder());
return builderRegistry;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Wed Dec 27 02:23:42 2006
@@ -39,7 +39,7 @@
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BindlessServiceDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
@@ -63,9 +63,9 @@
private final Map<Class<? extends Implementation<?>>,
ComponentBuilder<? extends Implementation<?>>> componentBuilders =
new HashMap<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>();
- private final Map<Class<? extends Binding>,
- BindingBuilder<? extends Binding>> bindingBuilders =
- new HashMap<Class<? extends Binding>, BindingBuilder<? extends Binding>>();
+ private final Map<Class<? extends BindingDefinition>,
+ BindingBuilder<? extends BindingDefinition>> bindingBuilders =
+ new HashMap<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>>();
private BindlessBuilder bindlessBuilder;
public BuilderRegistryImpl() {
@@ -98,7 +98,7 @@
}
@SuppressWarnings("unchecked")
- public <B extends Binding> void register(BindingBuilder<B> builder) {
+ public <B extends BindingDefinition> void register(BindingBuilder<B> builder) {
Type[] interfaces = builder.getClass().getGenericInterfaces();
for (Type type : interfaces) {
if (!(type instanceof ParameterizedType)) {
@@ -115,7 +115,7 @@
throw new IllegalArgumentException("builder is not generified");
}
- public <B extends Binding> void register(Class<B> implClass, BindingBuilder<B> builder) {
+ public <B extends BindingDefinition> void register(Class<B> implClass, BindingBuilder<B> builder) {
bindingBuilders.put(implClass, builder);
}
@@ -150,7 +150,7 @@
}
@SuppressWarnings("unchecked")
- public <B extends Binding> SCAObject build(CompositeComponent parent,
+ public <B extends BindingDefinition> SCAObject build(CompositeComponent parent,
BoundServiceDefinition<B> boundServiceDefinition,
DeploymentContext deploymentContext) throws BuilderException {
Class<?> bindingClass = boundServiceDefinition.getBinding().getClass();
@@ -168,7 +168,7 @@
}
@SuppressWarnings("unchecked")
- public <B extends Binding> SCAObject build(CompositeComponent parent,
+ public <B extends BindingDefinition> SCAObject build(CompositeComponent parent,
BoundReferenceDefinition<B> boundReferenceDefinition,
DeploymentContext deploymentContext) throws BuilderException {
Class<B> bindingClass = (Class<B>) boundReferenceDefinition.getBinding().getClass();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java Wed Dec 27 02:23:42 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BindlessServiceDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
@@ -57,13 +57,13 @@
new ArrayList<ComponentDefinition<? extends Implementation<?>>>();
allComponents.addAll(componentType.getComponents().values());
- List<BoundServiceDefinition<? extends Binding>> allBoundServices =
- new ArrayList<BoundServiceDefinition<? extends Binding>>();
+ List<BoundServiceDefinition<? extends BindingDefinition>> allBoundServices =
+ new ArrayList<BoundServiceDefinition<? extends BindingDefinition>>();
List<BindlessServiceDefinition> allBindlessServices = new ArrayList<BindlessServiceDefinition>();
for (ServiceDefinition serviceDefinition : componentType.getServices().values()) {
if (serviceDefinition instanceof BoundServiceDefinition) {
- BoundServiceDefinition<? extends Binding> boundService =
- (BoundServiceDefinition<? extends Binding>) serviceDefinition;
+ BoundServiceDefinition<? extends BindingDefinition> boundService =
+ (BoundServiceDefinition<? extends BindingDefinition>) serviceDefinition;
allBoundServices.add(boundService);
} else if (serviceDefinition instanceof BindlessServiceDefinition) {
allBindlessServices.add((BindlessServiceDefinition) serviceDefinition);
@@ -71,13 +71,13 @@
}
// FIXME is this right?
- List<BoundReferenceDefinition<? extends Binding>> allBoundReferences =
- new ArrayList<BoundReferenceDefinition<? extends Binding>>();
+ List<BoundReferenceDefinition<? extends BindingDefinition>> allBoundReferences =
+ new ArrayList<BoundReferenceDefinition<? extends BindingDefinition>>();
List<ReferenceDefinition> allTargetlessReferences = new ArrayList<ReferenceDefinition>();
for (Object referenceTarget : componentType.getReferences().values()) {
if (referenceTarget instanceof BoundReferenceDefinition<?>) {
- allBoundReferences.add((BoundReferenceDefinition<? extends Binding>) referenceTarget);
+ allBoundReferences.add((BoundReferenceDefinition<? extends BindingDefinition>) referenceTarget);
} else if (referenceTarget instanceof ReferenceDefinition) {
allTargetlessReferences.add((ReferenceDefinition) referenceTarget);
}
@@ -85,7 +85,7 @@
String name = componentDefinition.getName();
CompositeComponentImpl component = new CompositeComponentImpl(name, parent, connector, null);
- for (BoundReferenceDefinition<? extends Binding> referenceDefinition : allBoundReferences) {
+ for (BoundReferenceDefinition<? extends BindingDefinition> referenceDefinition : allBoundReferences) {
try {
component.register(builderRegistry.build(component, referenceDefinition, deploymentContext));
} catch (ComponentRegistrationException e) {
@@ -106,7 +106,7 @@
throw new BuilderInstantiationException("Error registering component", e);
}
}
- for (BoundServiceDefinition<? extends Binding> serviceDefinition : allBoundServices) {
+ for (BoundServiceDefinition<? extends BindingDefinition> serviceDefinition : allBoundServices) {
try {
component.register(builderRegistry.build(component, serviceDefinition, deploymentContext));
} catch (ComponentRegistrationException e) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java Wed Dec 27 02:23:42 2006
@@ -34,18 +34,18 @@
import org.apache.tuscany.core.implementation.system.component.SystemReferenceImpl;
import org.apache.tuscany.core.implementation.system.component.SystemServiceImpl;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemBindingDefinition;
/**
* Creates services and references confgured with the system binding
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemBindingBuilder extends BindingBuilderExtension<SystemBinding>
- implements BindingBuilder<SystemBinding> {
+public class SystemBindingBuilder extends BindingBuilderExtension<SystemBindingDefinition>
+ implements BindingBuilder<SystemBindingDefinition> {
public Service build(CompositeComponent parent,
- BoundServiceDefinition<SystemBinding> definition,
+ BoundServiceDefinition<SystemBindingDefinition> definition,
DeploymentContext deploymentContext) throws BuilderException {
URI uri = definition.getTarget();
@@ -57,14 +57,14 @@
}
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<SystemBinding> definition,
+ BoundReferenceDefinition<SystemBindingDefinition> definition,
DeploymentContext deploymentContext) {
String name = definition.getName();
return new SystemReferenceImpl(name, parent);
}
@Override
- protected Class<SystemBinding> getBindingType() {
- return SystemBinding.class;
+ protected Class<SystemBindingDefinition> getBindingType() {
+ return SystemBindingDefinition.class;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java Wed Dec 27 02:23:42 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeComponentType;
@@ -66,12 +66,12 @@
new ArrayList<ComponentDefinition<? extends Implementation<?>>>();
allComponents.addAll(componentType.getComponents().values());
- List<BoundServiceDefinition<? extends Binding>> allBoundServices =
- new ArrayList<BoundServiceDefinition<? extends Binding>>();
+ List<BoundServiceDefinition<? extends BindingDefinition>> allBoundServices =
+ new ArrayList<BoundServiceDefinition<? extends BindingDefinition>>();
for (ServiceDefinition serviceDefinition : componentType.getServices().values()) {
if (serviceDefinition instanceof BoundServiceDefinition) {
- BoundServiceDefinition<? extends Binding> boundService =
- (BoundServiceDefinition<? extends Binding>) serviceDefinition;
+ BoundServiceDefinition<? extends BindingDefinition> boundService =
+ (BoundServiceDefinition<? extends BindingDefinition>) serviceDefinition;
allBoundServices.add(boundService);
}
}
@@ -96,7 +96,7 @@
}
}
- for (BoundServiceDefinition<? extends Binding> serviceDefinition : allBoundServices) {
+ for (BoundServiceDefinition<? extends BindingDefinition> serviceDefinition : allBoundServices) {
SCAObject object;
try {
object = builderRegistry.build(component, serviceDefinition, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemBindingLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -24,7 +24,7 @@
import org.osoa.sca.annotations.Constructor;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemBindingDefinition;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
@@ -39,7 +39,7 @@
*
* @version $Rev$ $Date$
*/
-public class SystemBindingLoader extends LoaderExtension<SystemBinding> {
+public class SystemBindingLoader extends LoaderExtension<SystemBindingDefinition> {
public static final QName SYSTEM_BINDING =
new QName("http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT", "binding.system");
@@ -52,10 +52,10 @@
return SYSTEM_BINDING;
}
- public SystemBinding load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ public SystemBindingDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
LoaderUtil.skipToEndElement(reader);
- return new SystemBinding();
+ return new SystemBindingDefinition();
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBindingDefinition.java (from r490460, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBinding.java&r1=490460&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -18,12 +18,12 @@
*/
package org.apache.tuscany.core.implementation.system.model;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
* A by-reference binding used by runtime system services
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemBinding extends Binding {
+public class SystemBindingDefinition extends BindingDefinition {
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Wed Dec 27 02:23:42 2006
@@ -33,7 +33,7 @@
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.Multiplicity;
@@ -65,7 +65,7 @@
String name = reader.getAttributeValue(null, "name");
Multiplicity multiplicity =
StAXUtil.multiplicity(reader.getAttributeValue(null, "multiplicity"), Multiplicity.ONE_ONE);
- Binding binding = null;
+ BindingDefinition binding = null;
ServiceContract serviceContract = null;
while (true) {
switch (reader.next()) {
@@ -73,8 +73,8 @@
ModelObject o = registry.load(parent, null, reader, deploymentContext);
if (o instanceof ServiceContract) {
serviceContract = (ServiceContract) o;
- } else if (o instanceof Binding) {
- binding = (Binding) o;
+ } else if (o instanceof BindingDefinition) {
+ binding = (BindingDefinition) o;
}
reader.next();
break;
@@ -84,7 +84,7 @@
referenceDefinition.setMultiplicity(multiplicity);
return referenceDefinition;
} else {
- BoundReferenceDefinition<Binding> referenceDefinition = new BoundReferenceDefinition<Binding>();
+ BoundReferenceDefinition<BindingDefinition> referenceDefinition = new BoundReferenceDefinition<BindingDefinition>();
referenceDefinition.setName(name);
referenceDefinition.setServiceContract(serviceContract);
referenceDefinition.setMultiplicity(multiplicity);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Wed Dec 27 02:23:42 2006
@@ -36,7 +36,7 @@
import org.apache.tuscany.spi.loader.InvalidReferenceException;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BindlessServiceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ModelObject;
@@ -68,7 +68,7 @@
assert SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
String target = null;
- Binding binding = null;
+ BindingDefinition binding = null;
ServiceContract serviceContract = null;
while (true) {
int i = reader.next();
@@ -83,8 +83,8 @@
ModelObject o = registry.load(parent, null, reader, deploymentContext);
if (o instanceof ServiceContract) {
serviceContract = (ServiceContract) o;
- } else if (o instanceof Binding) {
- binding = (Binding) o;
+ } else if (o instanceof BindingDefinition) {
+ binding = (BindingDefinition) o;
}
}
break;
@@ -101,7 +101,7 @@
}
// FIXME need a way to specify "remotable" on a service
- return new BoundServiceDefinition<Binding>(name, serviceContract, false, binding,
+ return new BoundServiceDefinition<BindingDefinition>(name, serviceContract, false, binding,
targetURI);
} else if (target != null) {
URI targetURI;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java Wed Dec 27 02:23:42 2006
@@ -36,7 +36,7 @@
import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
import org.apache.tuscany.spi.wire.WireService;
import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
@@ -46,7 +46,7 @@
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemBindingDefinition;
import org.apache.tuscany.core.implementation.composite.CompositeService;
import org.apache.tuscany.core.implementation.composite.CompositeReference;
@@ -140,8 +140,8 @@
// have been registered
CompositeComponent compositeComponent = (CompositeComponent) component;
if (service instanceof BoundServiceDefinition) {
- Binding binding = ((BoundServiceDefinition) service).getBinding();
- if (binding instanceof SystemBinding) {
+ BindingDefinition binding = ((BoundServiceDefinition) service).getBinding();
+ if (binding instanceof SystemBindingDefinition) {
continue;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java Wed Dec 27 02:23:42 2006
@@ -42,7 +42,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.bootstrap.Bootstrapper;
import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemBindingDefinition;
import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.mock.component.BasicInterface;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
@@ -82,7 +82,7 @@
assertNotNull(serviceDefinition);
assertEquals("service", serviceDefinition.getName());
assertEquals(BasicInterface.class, serviceDefinition.getServiceContract().getInterfaceClass());
- assertTrue(serviceDefinition.getBinding() instanceof SystemBinding);
+ assertTrue(serviceDefinition.getBinding() instanceof SystemBindingDefinition);
// check parse of <component>
Map<String, ComponentDefinition<? extends Implementation<?>>> components = composite.getDeclaredComponents();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java Wed Dec 27 02:23:42 2006
@@ -24,7 +24,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.InvalidWireException;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BindlessServiceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -52,10 +52,10 @@
//add a service to the composite
ServiceDefinition serviceDefn = new ServiceDefinition("compositeService1", null, true);
BindlessServiceDefinition bindlessSvcDefn = new BindlessServiceDefinition("bindlessSvc", null, true, null);
- BoundServiceDefinition<Binding> boundSvcDefn =
- new BoundServiceDefinition<Binding>("boundSvc", null, true, null, null);
- BoundServiceDefinition<Binding> boundSvcDefnWithTarget =
- new BoundServiceDefinition<Binding>("boundSvcWithTarget", null, true, null, new URI("orgTarget"));
+ BoundServiceDefinition<BindingDefinition> boundSvcDefn =
+ new BoundServiceDefinition<BindingDefinition>("boundSvc", null, true, null, null);
+ BoundServiceDefinition<BindingDefinition> boundSvcDefnWithTarget =
+ new BoundServiceDefinition<BindingDefinition>("boundSvcWithTarget", null, true, null, new URI("orgTarget"));
componentType.add(serviceDefn);
componentType.add(boundSvcDefn);
componentType.add(bindlessSvcDefn);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java Wed Dec 27 02:23:42 2006
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemBindingDefinition;
import org.easymock.EasyMock;
/**
@@ -46,7 +46,7 @@
EasyMock.replay(parent);
DeploymentContext context = EasyMock.createMock(DeploymentContext.class);
EasyMock.replay(context);
- BoundServiceDefinition<SystemBinding> definition = new BoundServiceDefinition<SystemBinding>();
+ BoundServiceDefinition<SystemBindingDefinition> definition = new BoundServiceDefinition<SystemBindingDefinition>();
definition.setName("bar");
definition.setTarget(new URI("foo"));
ServiceContract<Object> contract = new ServiceContract<Object>(Object.class) {
@@ -60,7 +60,7 @@
public void testRegister() {
BuilderRegistry registry = EasyMock.createMock(BuilderRegistry.class);
- registry.register(EasyMock.eq(SystemBinding.class), EasyMock.isA(SystemBindingBuilder.class));
+ registry.register(EasyMock.eq(SystemBindingDefinition.class), EasyMock.isA(SystemBindingBuilder.class));
EasyMock.replay(registry);
SystemBindingBuilder builder = new SystemBindingBuilder();
builder.setBuilderRegistry(registry);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java Wed Dec 27 02:23:42 2006
@@ -37,7 +37,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemBindingDefinition;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Target;
@@ -151,9 +151,9 @@
}
- public static BoundReferenceDefinition<SystemBinding> createBoundReference() {
- SystemBinding binding = new SystemBinding();
- BoundReferenceDefinition<SystemBinding> referenceDefinition = new BoundReferenceDefinition<SystemBinding>();
+ public static BoundReferenceDefinition<SystemBindingDefinition> createBoundReference() {
+ SystemBindingDefinition binding = new SystemBindingDefinition();
+ BoundReferenceDefinition<SystemBindingDefinition> referenceDefinition = new BoundReferenceDefinition<SystemBindingDefinition>();
referenceDefinition.setBinding(binding);
referenceDefinition.setName("target");
ServiceContract<?> contract = new JavaServiceContract();
@@ -165,9 +165,9 @@
/**
* Creates a bound service with the name "service" that is configured to be wired to a target named "target/Target"
*/
- public static BoundServiceDefinition<SystemBinding> createBoundService() {
- SystemBinding binding = new SystemBinding();
- BoundServiceDefinition<SystemBinding> serviceDefinition = new BoundServiceDefinition<SystemBinding>();
+ public static BoundServiceDefinition<SystemBindingDefinition> createBoundService() {
+ SystemBindingDefinition binding = new SystemBindingDefinition();
+ BoundServiceDefinition<SystemBindingDefinition> serviceDefinition = new BoundServiceDefinition<SystemBindingDefinition>();
serviceDefinition.setBinding(binding);
serviceDefinition.setName("serviceDefinition");
ServiceContract<?> contract = new JavaServiceContract();
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java Wed Dec 27 02:23:42 2006
@@ -22,7 +22,7 @@
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
@@ -33,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public interface BindingBuilder<B extends Binding> {
+public interface BindingBuilder<B extends BindingDefinition> {
Service build(CompositeComponent parent,
BoundServiceDefinition<B> boundServiceDefinition,
DeploymentContext deploymentContext) throws BuilderException;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java Wed Dec 27 02:23:42 2006
@@ -22,7 +22,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BindlessServiceDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
@@ -52,14 +52,14 @@
/**
* TODO: JavaDoc this when we know if we will still register Services as contexts
*/
- <B extends Binding> SCAObject build(CompositeComponent parent,
+ <B extends BindingDefinition> SCAObject build(CompositeComponent parent,
BoundServiceDefinition<B> boundServiceDefinition,
DeploymentContext deploymentContext) throws BuilderException;
/**
* TODO: JavaDoc this when we know if we will still register References as contexts
*/
- <B extends Binding> SCAObject build(CompositeComponent parent,
+ <B extends BindingDefinition> SCAObject build(CompositeComponent parent,
BoundReferenceDefinition<B> boundReferenceDefinition,
DeploymentContext deploymentContext) throws BuilderException;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java Wed Dec 27 02:23:42 2006
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.builder;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.Implementation;
/**
@@ -47,12 +47,12 @@
/**
* TODO: JavaDoc this once we know if we will be building contexts for bindings
*/
- <B extends Binding> void register(BindingBuilder<B> builder);
+ <B extends BindingDefinition> void register(BindingBuilder<B> builder);
/**
* TODO: JavaDoc this once we know if we will be building contexts for bindings
*/
- <B extends Binding> void register(Class<B> implClass, BindingBuilder<B> builder);
+ <B extends BindingDefinition> void register(Class<B> implClass, BindingBuilder<B> builder);
/**
* TODO: Make sure this belongs here
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java Wed Dec 27 02:23:42 2006
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.wire.WireService;
@@ -41,7 +41,7 @@
* @version $$Rev$$ $$Date$$
*/
@Scope("COMPOSITE")
-public abstract class BindingBuilderExtension<B extends Binding> implements BindingBuilder<B> {
+public abstract class BindingBuilderExtension<B extends BindingDefinition> implements BindingBuilder<B> {
protected BuilderRegistry builderRegistry;
protected WireService wireService;
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java (from r490460, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Binding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Binding.java&r1=490460&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Binding.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -23,5 +23,5 @@
*
* @version $Rev$ $Date$
*/
-public abstract class Binding extends ModelObject {
+public abstract class BindingDefinition extends ModelObject {
}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java Wed Dec 27 02:23:42 2006
@@ -23,7 +23,7 @@
*
* @version $Rev$ $Date$
*/
-public class BoundReferenceDefinition<B extends Binding> extends ReferenceDefinition {
+public class BoundReferenceDefinition<B extends BindingDefinition> extends ReferenceDefinition {
private B binding;
public B getBinding() {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java Wed Dec 27 02:23:42 2006
@@ -25,7 +25,7 @@
*
* @version $Rev$ $Date$
*/
-public class BoundServiceDefinition<B extends Binding> extends ServiceDefinition {
+public class BoundServiceDefinition<B extends BindingDefinition> extends ServiceDefinition {
private B binding;
private URI target;
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java Wed Dec 27 02:23:42 2006
@@ -33,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public class OSGiBindingBuilder extends BindingBuilderExtension<OSGiBinding> {
+public class OSGiBindingBuilder extends BindingBuilderExtension<OSGiBindingDefinition> {
OSGiHost host;
@@ -42,12 +42,12 @@
this.host = host;
}
- protected Class<OSGiBinding> getBindingType() {
- return OSGiBinding.class;
+ protected Class<OSGiBindingDefinition> getBindingType() {
+ return OSGiBindingDefinition.class;
}
public Service build(CompositeComponent parent,
- BoundServiceDefinition<OSGiBinding> boundServiceDefinition,
+ BoundServiceDefinition<OSGiBindingDefinition> boundServiceDefinition,
DeploymentContext deploymentContext) {
String name = boundServiceDefinition.getName();
String osgiServiceName = boundServiceDefinition.getBinding().getService();
@@ -55,13 +55,13 @@
}
public OSGiReference build(CompositeComponent parent,
- BoundReferenceDefinition<OSGiBinding> boundReferenceDefinition,
+ BoundReferenceDefinition<OSGiBindingDefinition> boundReferenceDefinition,
DeploymentContext deploymentContext) {
String name = boundReferenceDefinition.getName();
return new OSGiReference(name, parent);
}
- protected Class<? extends Object> getServiceInterface(BoundServiceDefinition<OSGiBinding> boundServiceDefinition) {
+ protected Class<? extends Object> getServiceInterface(BoundServiceDefinition<OSGiBindingDefinition> boundServiceDefinition) {
return boundServiceDefinition.getServiceContract().getInterfaceClass();
}
Copied: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java (from r490460, incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBinding.java&r1=490460&p2=incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBinding.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -16,14 +16,14 @@
*/
package org.apache.tuscany.osgi.binding;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
* Represents a binding to an OSGi service.
*
* @version $Rev$ $Date$
*/
-public class OSGiBinding extends Binding {
+public class OSGiBindingDefinition extends BindingDefinition {
private String uri;
private String service;
Propchange: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -38,7 +38,7 @@
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
-public class OSGiBindingLoader extends LoaderExtension<OSGiBinding> {
+public class OSGiBindingLoader extends LoaderExtension<OSGiBindingDefinition> {
public static final QName BINDING_OSGI = new QName("http://tuscany.apache.org/xmlns/osgi/1.0", "binding.osgi");
@Constructor
@@ -50,14 +50,14 @@
return BINDING_OSGI;
}
- public OSGiBinding load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ public OSGiBindingDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
String uri = reader.getAttributeValue(null, "uri");
String service = reader.getAttributeValue(null, "service");
LoaderUtil.skipToEndElement(reader);
- OSGiBinding binding = new OSGiBinding();
+ OSGiBindingDefinition binding = new OSGiBindingDefinition();
binding.setURI(uri);
binding.setService(service);
return binding;
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java Wed Dec 27 02:23:42 2006
@@ -48,7 +48,7 @@
*
* @version $Rev$ $Date$
*/
-public class Axis2BindingBuilder extends BindingBuilderExtension<WebServiceBinding> {
+public class Axis2BindingBuilder extends BindingBuilderExtension<WebServiceBindingDefinition> {
private static final String OM_DATA_BINDING = OMElement.class.getName();
private ServletHost servletHost;
@@ -87,7 +87,7 @@
@SuppressWarnings("unchecked")
public Service build(
CompositeComponent parent,
- BoundServiceDefinition<WebServiceBinding> serviceDefinition,
+ BoundServiceDefinition<WebServiceBindingDefinition> serviceDefinition,
DeploymentContext deploymentContext) {
try {
@@ -103,7 +103,7 @@
// There are also cases that interface.java is used.
ServiceContract<?> inboundContract = null;
- WebServiceBinding wsBinding = serviceDefinition.getBinding();
+ WebServiceBindingDefinition wsBinding = serviceDefinition.getBinding();
Port port = wsBinding.getWSDLPort();
if (port == null) {
// FIXME: [rfeng] No WSDL is referenced by binding.ws, we need to create one from
@@ -139,7 +139,7 @@
@SuppressWarnings("unchecked")
public Reference build(
CompositeComponent parent,
- BoundReferenceDefinition<WebServiceBinding> boundReferenceDefinition,
+ BoundReferenceDefinition<WebServiceBindingDefinition> boundReferenceDefinition,
DeploymentContext deploymentContext) {
try {
@@ -154,7 +154,7 @@
// The WSDL portType from the WSDL Port decides the incoming SOAP message format
ServiceContract<?> outboundContract = inboundContract;
- WebServiceBinding wsBinding = boundReferenceDefinition.getBinding();
+ WebServiceBindingDefinition wsBinding = boundReferenceDefinition.getBinding();
Port port = wsBinding.getWSDLPort();
if (port == null) {
// FIXME: [rfeng] No WSDL is referenced by binding.ws, we need to create one from
@@ -186,8 +186,8 @@
}
}
- protected Class<WebServiceBinding> getBindingType() {
- return WebServiceBinding.class;
+ protected Class<WebServiceBindingDefinition> getBindingType() {
+ return WebServiceBindingDefinition.class;
}
protected void initAxis() throws BuilderConfigException {
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java Wed Dec 27 02:23:42 2006
@@ -54,7 +54,7 @@
@SuppressWarnings("unchecked")
public Axis2Reference(String theName,
CompositeComponent parent,
- WebServiceBinding wsBinding,
+ WebServiceBindingDefinition wsBinding,
ServiceContract contract, WorkContext workContext) {
super(theName, parent);
this.workContext = workContext;
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java Wed Dec 27 02:23:42 2006
@@ -76,7 +76,7 @@
private ConfigurationContext configContext;
- private WebServiceBinding binding;
+ private WebServiceBindingDefinition binding;
private Map<Object, InvocationContext> invCtxMap = new HashMap<Object, InvocationContext>();
@@ -91,7 +91,7 @@
public Axis2Service(String theName,
ServiceContract<?> serviceContract,
CompositeComponent parent,
- WebServiceBinding binding,
+ WebServiceBindingDefinition binding,
ServletHost servletHost,
ConfigurationContext configContext, WorkContext workContext) {
@@ -131,7 +131,7 @@
super.stop();
}
- private AxisService createAxisService(WebServiceBinding wsBinding) throws AxisFault {
+ private AxisService createAxisService(WebServiceBindingDefinition wsBinding) throws AxisFault {
Definition definition = wsBinding.getWSDLDefinition();
WebServicePortMetaData wsdlPortInfo =
new WebServicePortMetaData(definition, wsBinding.getWSDLPort(), null, false);
@@ -321,7 +321,7 @@
ao.getChildrenWithName(new QName("http://www.w3.org/2005/08/addressing", "ReferenceParameters"));
rpI.hasNext();) {
OMElement rpE = (OMElement) rpI.next();
- for (Iterator cidI = rpE.getChildrenWithName(WebServiceBinding.CONVERSATION_ID_REFPARM_QN);
+ for (Iterator cidI = rpE.getChildrenWithName(WebServiceBindingDefinition.CONVERSATION_ID_REFPARM_QN);
cidI.hasNext();) {
OMElement cidE = (OMElement) cidI.next();
conversationID = cidE.getText();
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java Wed Dec 27 02:23:42 2006
@@ -28,8 +28,6 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -114,7 +112,7 @@
String conversationId = (String) workContext.getIdentifier(Scope.CONVERSATION);
if(conversationId != null && conversationId.length()!=0){
EndpointReference fromEPR= new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
- fromEPR.addReferenceParameter(WebServiceBinding.CONVERSATION_ID_REFPARM_QN, conversationId);
+ fromEPR.addReferenceParameter(WebServiceBindingDefinition.CONVERSATION_ID_REFPARM_QN, conversationId);
options.setFrom(fromEPR);
requestMC.setFrom(fromEPR); //who knows why two ways ?
Copied: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java (from r490460, incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBinding.java&r1=490460&p2=incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -24,7 +24,7 @@
import javax.wsdl.Service;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.osoa.sca.Version;
/**
@@ -32,14 +32,14 @@
*
* @version $Rev$ $Date$
*/
-public class WebServiceBinding extends Binding {
+public class WebServiceBindingDefinition extends BindingDefinition {
public static final QName CONVERSATION_ID_REFPARM_QN = new QName(Version.XML_NAMESPACE_1_0,"conversationID");
private Definition definition;
private Port port;
private Service service;
//private String portURI;
private String uri;
- public WebServiceBinding(Definition definition, Port port, String uri, String portURI, Service service) {
+ public WebServiceBindingDefinition(Definition definition, Port port, String uri, String portURI, Service service) {
this.definition = definition;
this.port = port;
this.uri = uri;
Propchange: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -45,13 +45,13 @@
import org.osoa.sca.annotations.Scope;
/**
- * Parses a <code>WebServiceBinding</code> entry in an assembly XML file
+ * Parses a <code>WebServiceBindingDefinition</code> entry in an assembly XML file
*
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
@SuppressWarnings("deprecation")
-public class WebServiceBindingLoader extends LoaderExtension<WebServiceBinding> {
+public class WebServiceBindingLoader extends LoaderExtension<WebServiceBindingDefinition> {
public static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");
private WSDLDefinitionRegistry wsdlDefinitionRegistry;
@@ -67,7 +67,7 @@
return BINDING_WS;
}
- public WebServiceBinding load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ public WebServiceBindingDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
// not sure what uri was here ? String uri = reader.getAttributeValue(null, "uri");
@@ -84,7 +84,7 @@
}
@SuppressWarnings("unchecked")
- private WebServiceBinding createBinding(String uri, String endpoint, String wsdlLocation, DeploymentContext deploymentContext)
+ private WebServiceBindingDefinition createBinding(String uri, String endpoint, String wsdlLocation, DeploymentContext deploymentContext)
throws WSDLException, IOException, LoaderException {
// Get the WSDL port namespace and name
if (uri == null && endpoint != null) {
@@ -136,7 +136,7 @@
throw new IllegalArgumentException("Cannot find WSDL port " + endpoint);
}
- return new WebServiceBinding(definition, thePort, uri, endpoint, service);
+ return new WebServiceBindingDefinition(definition, thePort, uri, endpoint, service);
}
// FIXME: Find the first port?
throw new LoaderException("Web Service endpoint cannot be resolved: " + endpoint);
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/WebServiceOperationMetaData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/WebServiceOperationMetaData.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/WebServiceOperationMetaData.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/WebServiceOperationMetaData.java Wed Dec 27 02:23:42 2006
@@ -46,7 +46,7 @@
public class WebServiceOperationMetaData implements Serializable {
private static final long serialVersionUID = 2425306250256227724L;
- // WSDL Binding and BindingOperation
+ // WSDL BindingDefinition and BindingOperation
private Binding binding;
private BindingOperation bindingOperation;
// Fields to cache derived metadata
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java Wed Dec 27 02:23:42 2006
@@ -77,7 +77,7 @@
}
private Axis2Reference createAxis2Reference(String webAppName, String serviceName) throws Exception {
- //Create WebServiceBinding
+ //Create WebServiceBindingDefinition
String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";
URL url = getClass().getResource(wsdlLocation);
assertNotNull("Could not find wsdl " + url.toString(), url);
@@ -90,7 +90,7 @@
Service wsdlService = wsdlDef.getService(new QName("http://objectweb.org/hello_world_soap_http",
"SOAPService"));
Port port = wsdlService.getPort("SoapPort");
- WebServiceBinding wsBinding = new WebServiceBinding(wsdlDef, port, "uri", "portURI", wsdlService);
+ WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
//Create a mocked WireService, make the call of ServiceExtension.getServiceInstance() returns a proxy instance.
WireService wireService = EasyMock.createNiceMock(WireService.class);
EasyMock.replay(wireService);
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java Wed Dec 27 02:23:42 2006
@@ -72,7 +72,7 @@
private Axis2Service createAxis2Service(String serviceName, ServletHost tomcatHost, boolean callback)
throws Exception {
- //Create WebServiceBinding
+ //Create WebServiceBindingDefinition
String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";
URL url = getClass().getResource(wsdlLocation);
assertNotNull("Could not find wsdl " + url.toString(), url);
@@ -85,7 +85,7 @@
Service wsdlService = wsdlDef.getService(new QName("http://objectweb.org/hello_world_soap_http",
"SOAPService"));
Port port = wsdlService.getPort("SoapPort");
- WebServiceBinding wsBinding = new WebServiceBinding(wsdlDef, port, "uri", "portURI", wsdlService);
+ WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
//Create a mocked WireService, make the call of ServiceExtension.getServiceInstance() returns a proxy instance.
WireService wireService = EasyMock.createNiceMock(WireService.class);
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java Wed Dec 27 02:23:42 2006
@@ -39,14 +39,14 @@
*
* @version $Rev$ $Date$
*/
-public class CeltixBindingBuilder extends BindingBuilderExtension<WebServiceBinding> {
+public class CeltixBindingBuilder extends BindingBuilderExtension<WebServiceBindingDefinition> {
private Bus bus;
public Service build(CompositeComponent parent,
- BoundServiceDefinition<WebServiceBinding> boundServiceDefinition,
+ BoundServiceDefinition<WebServiceBindingDefinition> boundServiceDefinition,
DeploymentContext deploymentContext) {
- WebServiceBinding wsBinding = boundServiceDefinition.getBinding();
+ WebServiceBindingDefinition wsBinding = boundServiceDefinition.getBinding();
TypeHelper typeHelper = (TypeHelper) deploymentContext.getExtension(TypeHelper.class.getName());
if (typeHelper == null) {
typeHelper = TypeHelper.INSTANCE;
@@ -63,9 +63,9 @@
}
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<WebServiceBinding> boundReferenceDefinition,
+ BoundReferenceDefinition<WebServiceBindingDefinition> boundReferenceDefinition,
DeploymentContext deploymentContext) {
- WebServiceBinding wsBinding = boundReferenceDefinition.getBinding();
+ WebServiceBindingDefinition wsBinding = boundReferenceDefinition.getBinding();
TypeHelper typeHelper = (TypeHelper) deploymentContext.getExtension(TypeHelper.class.getName());
if (typeHelper == null) {
typeHelper = TypeHelper.INSTANCE;
@@ -81,8 +81,8 @@
typeHelper);
}
- protected Class<WebServiceBinding> getBindingType() {
- return WebServiceBinding.class;
+ protected Class<WebServiceBindingDefinition> getBindingType() {
+ return WebServiceBindingDefinition.class;
}
private Bus getBus(WSDLDefinitionRegistry wsdlDefinitionRegistry) {
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java Wed Dec 27 02:23:42 2006
@@ -47,7 +47,7 @@
public CeltixReference(String name,
CompositeComponent parent,
- WebServiceBinding binding,
+ WebServiceBindingDefinition binding,
Bus theBus,
TypeHelper theTypeHelper) {
super(name, parent);
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java Wed Dec 27 02:23:42 2006
@@ -80,7 +80,7 @@
public CeltixService(String theName,
CompositeComponent parent,
- WebServiceBinding binding,
+ WebServiceBindingDefinition binding,
Bus bus,
TypeHelper theTypeHelper) {
super(theName, parent);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org