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 2007/01/10 17:17:06 UTC
svn commit: r494872 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/
kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/
kernel/spi/src/main/java/org/apache/tuscany/spi/com...
Author: jmarino
Date: Wed Jan 10 08:17:05 2007
New Revision: 494872
URL: http://svn.apache.org/viewvc?view=rev&rev=494872
Log:
remove ServiceBinding.setBindingContract()
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceBinding.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.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/Axis2ServiceBinding.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.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/JMSServiceBinding.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceBinding.java?view=diff&rev=494872&r1=494871&r2=494872
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceBinding.java Wed Jan 10 08:17:05 2007
@@ -96,10 +96,6 @@
return serviceContract;
}
- public void setBindingServiceContract(ServiceContract<?> serviceContract) {
- throw new UnsupportedOperationException();
- }
-
@Override
public boolean isSystem() {
return service != null && service.isSystem();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java?view=diff&rev=494872&r1=494871&r2=494872
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java Wed Jan 10 08:17:05 2007
@@ -55,10 +55,6 @@
return bindingServiceContract;
}
- public void setBindingServiceContract(ServiceContract<?> bindingServiceContract) {
- this.bindingServiceContract = bindingServiceContract;
- }
-
public InboundWire getInboundWire() {
return inboundWire;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java?view=diff&rev=494872&r1=494871&r2=494872
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java Wed Jan 10 08:17:05 2007
@@ -55,14 +55,6 @@
ServiceContract<?> getBindingServiceContract();
/**
- * Set the ServiceContract for the binding. This contract will be used for the inbound wire. If not set, it will be
- * the same as the ServideContract from the interface.
- *
- * @param serviceContract the binding contract
- */
- void setBindingServiceContract(ServiceContract<?> serviceContract);
-
- /**
* Returns the inbound wire for flowing a request through the service
*
* @return the inbound wire for flowing a request through the service
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java?view=diff&rev=494872&r1=494871&r2=494872
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java Wed Jan 10 08:17:05 2007
@@ -79,10 +79,6 @@
return bindingServiceContract;
}
- public void setBindingServiceContract(ServiceContract<?> serviceContract) {
- this.bindingServiceContract = serviceContract;
- }
-
@Override
public boolean isSystem() {
return service != null && service.isSystem();
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=494872&r1=494871&r2=494872
==============================================================================
--- 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 Jan 10 08:17:05 2007
@@ -124,10 +124,8 @@
}
ServiceBinding serviceBinding =
- new Axis2ServiceBinding(serviceDefinition.getName(), outboundContract, parent, wsBinding,
+ new Axis2ServiceBinding(serviceDefinition.getName(), outboundContract, inboundContract, parent, wsBinding,
servletHost, configContext, workContext);
- serviceBinding.setBindingServiceContract(inboundContract);
-
return serviceBinding;
} catch (InvalidServiceContractException e) {
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java?view=diff&rev=494872&r1=494871&r2=494872
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java Wed Jan 10 08:17:05 2007
@@ -94,14 +94,17 @@
public Axis2ServiceBinding(String theName,
ServiceContract<?> serviceContract,
+ ServiceContract<?> serviceBindingContract,
CompositeComponent parent,
WebServiceBindingDefinition binding,
ServletHost servletHost,
- ConfigurationContext configContext, WorkContext workContext) {
+ ConfigurationContext configContext,
+ WorkContext workContext) {
super(theName, parent);
this.serviceContract = serviceContract;
+ this.bindingServiceContract = serviceBindingContract;
this.binding = binding;
this.servletHost = servletHost;
this.configContext = configContext;
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=494872&r1=494871&r2=494872
==============================================================================
--- 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 Jan 10 08:17:05 2007
@@ -118,6 +118,7 @@
new Axis2ServiceBinding(serviceName,
contract,
null,
+ null,
wsBinding,
tomcatHost,
configurationContext, new WorkContextImpl());
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java?view=diff&rev=494872&r1=494871&r2=494872
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java Wed Jan 10 08:17:05 2007
@@ -70,12 +70,8 @@
OperationAndDataBinding responseODB =
getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
- ServiceBinding serviceBinding =
- new JMSServiceBinding(serviceDefinition.getName(), parent, jmsBinding, jmsResourceFactory,
- requestODB, responseODB, interfaze);
- serviceBinding.setBindingServiceContract(serviceContract);
-
- return serviceBinding;
+ return new JMSServiceBinding(serviceDefinition.getName(), parent, jmsBinding, jmsResourceFactory,
+ serviceContract, requestODB, responseODB, interfaze);
}
public JMSReferenceBinding build(CompositeComponent parent,
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java?view=diff&rev=494872&r1=494871&r2=494872
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java Wed Jan 10 08:17:05 2007
@@ -29,6 +29,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.extension.ServiceBindingExtension;
+import org.apache.tuscany.spi.model.ServiceContract;
/**
* @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
@@ -46,6 +47,7 @@
CompositeComponent parent,
JMSBindingDefinition jmsBinding,
JMSResourceFactory jmsResourceFactory,
+ ServiceContract<?> serviceBindingContract,
OperationAndDataBinding requestOperationAndDataBinding,
OperationAndDataBinding responseOperationAndDataBinding,
Class<?> service) {
@@ -53,6 +55,7 @@
this.jmsBinding = jmsBinding;
this.jmsResourceFactory = jmsResourceFactory;
+ this.bindingServiceContract = serviceBindingContract;
this.requestOperationAndDataBinding = requestOperationAndDataBinding;
this.responseOperationAndDataBinding = responseOperationAndDataBinding;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org