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:28:37 UTC
svn commit: r494876 - 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/wire/
kernel/spi/src/main/java/org/apache/tuscany/spi/component/ ...
Author: jmarino
Date: Wed Jan 10 08:28:36 2007
New Revision: 494876
URL: http://svn.apache.org/viewvc?view=rev&rev=494876
Log:
remove ReferenceBinding.setBindingServiceContract()
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.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/Axis2ReferenceBinding.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.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/JMSReferenceBinding.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java?view=diff&rev=494876&r1=494875&r2=494876
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java Wed Jan 10 08:28:36 2007
@@ -86,10 +86,6 @@
throw new UnsupportedOperationException();
}
- public void setBindingServiceContract(ServiceContract<?> serviceContract) {
- throw new UnsupportedOperationException();
- }
-
@Override
public boolean isSystem() {
return reference != null && reference.isSystem();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java?view=diff&rev=494876&r1=494875&r2=494876
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java Wed Jan 10 08:28:36 2007
@@ -269,10 +269,6 @@
return bindingServiceContract;
}
- public void setBindingServiceContract(ServiceContract<?> bindingServiceContract) {
- this.bindingServiceContract = bindingServiceContract;
- }
-
public QName getBindingType() {
return null;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java?view=diff&rev=494876&r1=494875&r2=494876
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java Wed Jan 10 08:28:36 2007
@@ -85,13 +85,4 @@
*/
ServiceContract<?> getBindingServiceContract();
-
- /**
- * Set the ServiceContract for the binding. This contract will be used for the outbound wire. If not set, it will be
- * the same as the ServideContract from the interface.
- *
- * @param serviceContract the service contract
- */
- void setBindingServiceContract(ServiceContract<?> serviceContract);
-
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java?view=diff&rev=494876&r1=494875&r2=494876
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java Wed Jan 10 08:28:36 2007
@@ -70,10 +70,6 @@
return bindingServiceContract;
}
- public void setBindingServiceContract(ServiceContract<?> serviceContract) {
- this.bindingServiceContract = serviceContract;
- }
-
@Override
public boolean isSystem() {
return reference != null && reference.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=494876&r1=494875&r2=494876
==============================================================================
--- 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:28:36 2007
@@ -172,11 +172,8 @@
throw new Axis2BindingBuilderRuntimeException(e);
}
- ReferenceBinding referenceBinding = new Axis2ReferenceBinding(boundReferenceDefinition.getName(), parent, wsBinding,
- inboundContract, workContext);
- referenceBinding.setBindingServiceContract(outboundContract);
-
- return referenceBinding;
+ return new Axis2ReferenceBinding(boundReferenceDefinition.getName(), parent, wsBinding,
+ inboundContract, outboundContract, workContext);
} catch (InvalidServiceContractException e) {
throw new Axis2BindingBuilderRuntimeException(e);
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java?view=diff&rev=494876&r1=494875&r2=494876
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java Wed Jan 10 08:28:36 2007
@@ -58,8 +58,11 @@
public Axis2ReferenceBinding(String theName,
CompositeComponent parent,
WebServiceBindingDefinition wsBinding,
- ServiceContract contract, WorkContext workContext) {
+ ServiceContract contract,
+ ServiceContract<?> bindingServiceContract,
+ WorkContext workContext) {
super(theName, parent);
+ this.bindingServiceContract = bindingServiceContract;
this.workContext = workContext;
try {
Definition wsdlDefinition = wsBinding.getWSDLDefinition();
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=494876&r1=494875&r2=494876
==============================================================================
--- 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 Jan 10 08:28:36 2007
@@ -90,7 +90,8 @@
Service wsdlService = wsdlDef.getService(new QName("http://objectweb.org/hello_world_soap_http",
"SOAPService"));
Port port = wsdlService.getPort("SoapPort");
- WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
+ WebServiceBindingDefinition wsBinding =
+ new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
//Create a mocked WireService, make the call of ServiceBindingExtension.getServiceInstance() returns a proxy instance.
WireService wireService = EasyMock.createNiceMock(WireService.class);
EasyMock.replay(wireService);
@@ -101,6 +102,8 @@
return new Axis2ReferenceBinding(serviceName,
parent,
wsBinding,
- contract, null);
+ contract,
+ null,
+ null);
}
}
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=494876&r1=494875&r2=494876
==============================================================================
--- 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:28:36 2007
@@ -106,11 +106,8 @@
OperationAndDataBinding responseODB =
getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
- JMSReferenceBinding reference =
- new JMSReferenceBinding(name, parent, jmsBinding, jmsResourceFactory, requestODB, responseODB,
- requestDest, replyDest);
- reference.setBindingServiceContract(serviceContract);
- return reference;
+ return new JMSReferenceBinding(name, parent, jmsBinding, jmsResourceFactory, serviceContract, requestODB, responseODB,
+ requestDest, replyDest);
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java?view=diff&rev=494876&r1=494875&r2=494876
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java Wed Jan 10 08:28:36 2007
@@ -46,13 +46,14 @@
CompositeComponent parent,
JMSBindingDefinition jmsBinding,
JMSResourceFactory jmsResourceFactory,
+ ServiceContract<?> bindingServiceContract,
OperationAndDataBinding requestOperationAndDataBinding,
OperationAndDataBinding responseOperationAndDataBinding,
Destination requestDest,
Destination replyDest) {
super(name, parent);
-
+ this.bindingServiceContract = bindingServiceContract;
this.jmsBinding = jmsBinding;
this.jmsResourceFactory = jmsResourceFactory;
this.requestOperationAndDataBinding = requestOperationAndDataBinding;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org