Author: slaws
Date: Thu Jun 17 13:55:03 2010
New Revision: 955601
URL: http://svn.apache.org/viewvc?rev=955601&view=rev
Log:
Add a flag to the binding builder to indicate that generated data should be
regenerated. Also rename the methods for getting/setting the generated data to
make it more obvious that that's what it's doing.
Modified:
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
Modified:
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
Thu Jun 17 13:55:03 2010
@@ -201,7 +201,7 @@ public class BuilderTestCase {
}
}
- Definition def = wsBinding.getWSDLDocument();
+ Definition def = wsBinding.getGeneratedWSDLDocument();
TestUtils.writeWSDL(def);
javax.wsdl.Service svc = def.getService(new
QName("http://builder.itest.sca.tuscany.apache.org/";, "Service3Service"));
Modified:
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
Thu Jun 17 13:55:03 2010
@@ -150,14 +150,14 @@ public class TestUtils {
for (ComponentService componentService : component.getServices()) {
for (Binding binding : componentService.getBindings()) {
if (binding instanceof WebServiceBinding) {
- writeWSDL(component, componentService,
((WebServiceBinding)binding).getWSDLDocument());
+ writeWSDL(component, componentService,
((WebServiceBinding)binding).getGeneratedWSDLDocument());
}
}
}
for (ComponentReference componentReference :
component.getReferences()) {
for (Binding binding : componentReference.getBindings()) {
if (binding instanceof WebServiceBinding) {
- writeWSDL(component, componentReference,
((WebServiceBinding)binding).getWSDLDocument());
+ writeWSDL(component, componentReference,
((WebServiceBinding)binding).getGeneratedWSDLDocument());
}
}
}
@@ -167,14 +167,14 @@ public class TestUtils {
for (Service service : composite.getServices()) {
for (Binding binding : service.getBindings()) {
if (binding instanceof WebServiceBinding) {
- writeWSDL(null, service,
((WebServiceBinding)binding).getWSDLDocument());
+ writeWSDL(null, service,
((WebServiceBinding)binding).getGeneratedWSDLDocument());
}
}
}
for (Reference reference : composite.getReferences()) {
for (Binding binding : reference.getBindings()) {
if (binding instanceof WebServiceBinding) {
- writeWSDL(null, reference,
((WebServiceBinding)binding).getWSDLDocument());
+ writeWSDL(null, reference,
((WebServiceBinding)binding).getGeneratedWSDLDocument());
}
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
Thu Jun 17 13:55:03 2010
@@ -39,8 +39,11 @@ public interface BindingBuilder<B extend
* @param component The component for the binding's service or reference
* @param contract The binding's service or reference
* @param context The context for the builder
+ * @param rebuild Set true to have derived data in the binding rebuilt
+ * caching can cause problems in the late binding case so we
+ * need to be able to remove cached data
*/
- void build(Component component, Contract contract, B binding,
BuilderContext context);
+ void build(Component component, Contract contract, B binding,
BuilderContext context, boolean rebuild);
/**
* Get QName of the binding type
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
Thu Jun 17 13:55:03 2010
@@ -275,8 +275,8 @@ public class DefaultBuilderExtensionPoin
this.qname =
ServiceDeclarationParser.getQName(sd.getAttributes().get("qname"));
}
- public void build(Component component, Contract contract, Binding
binding, BuilderContext context) {
- getBuilder().build(component, contract, binding, context);
+ public void build(Component component, Contract contract, Binding
binding, BuilderContext context, boolean rebuild) {
+ getBuilder().build(component, contract, binding, context, rebuild);
}
public QName getBindingType() {
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
Thu Jun 17 13:55:03 2010
@@ -143,7 +143,7 @@ public class DefaultSCABindingMapper imp
Binding binding = map(endpoint.getBinding());
ep.setBinding(binding);
if (builder != null) {
- builder.build(ep.getComponent(), ep.getService(), binding, new
BuilderContext(registry));
+ builder.build(ep.getComponent(), ep.getService(), binding, new
BuilderContext(registry), false);
}
return ep;
}
@@ -166,7 +166,7 @@ public class DefaultSCABindingMapper imp
//
epr.setTargetEndpoint(map((RuntimeEndpoint)epr.getTargetEndpoint()));
if (builder != null) {
- builder.build(epr.getComponent(), epr.getReference(), binding, new
BuilderContext(registry));
+ builder.build(epr.getComponent(), epr.getReference(), binding, new
BuilderContext(registry), false);
}
return epr;
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
Thu Jun 17 13:55:03 2010
@@ -230,7 +230,7 @@ public class Axis2EngineIntegration {
Port port,
WebServiceBinding
wsBinding) throws AxisFault {
- Definition definition = wsBinding.getWSDLDocument();
+ Definition definition = wsBinding.getGeneratedWSDLDocument();
QName serviceQName = wsBinding.getService().getQName();
Definition def = getDefinition(definition, serviceQName);
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
Thu Jun 17 13:55:03 2010
@@ -154,7 +154,7 @@ public class Axis2ReferenceBindingInvoke
PortType portType =
((WSDLInterface)wsBinding.getBindingInterfaceContract().getInterface()).getPortType();
Operation op =
portType.getOperation(wsdlOperationName.getLocalPart(), null, null);
action =
-
WSDL11ActionHelper.getActionFromInputElement(wsBinding.getWSDLDocument(),
portType, op, op
+
WSDL11ActionHelper.getActionFromInputElement(wsBinding.getGeneratedWSDLDocument(),
portType, op, op
.getInput());
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
Thu Jun 17 13:55:03 2010
@@ -96,7 +96,7 @@ public class Axis2ReferenceBindingProvid
this.reference =
(RuntimeComponentReference)endpointReference.getReference();
// A WSDL document should always be present in the binding
- if (wsBinding.getWSDLDocument() == null) {
+ if (wsBinding.getGeneratedWSDLDocument() == null) {
throw new ServiceRuntimeException("No WSDL document for " +
component.getName() + "/" + reference.getName());
}
@@ -128,7 +128,7 @@ public class Axis2ReferenceBindingProvid
configContext =
Axis2EngineIntegration.getAxisConfigurationContext(extensionPoints.getServiceDiscovery());
try {
- Definition definition = wsBinding.getWSDLDocument();
+ Definition definition = wsBinding.getGeneratedWSDLDocument();
QName serviceQName = wsBinding.getService().getQName();
Port port = wsBinding.getPort();
if (port == null) {
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
Thu Jun 17 13:55:03 2010
@@ -89,7 +89,7 @@ public class Axis2ServiceBindingProvider
this.service = (RuntimeComponentService)endpoint.getService();
// A WSDL document should always be present in the binding
- if (wsBinding.getWSDLDocument() == null) {
+ if (wsBinding.getGeneratedWSDLDocument() == null) {
throw new ServiceRuntimeException("No WSDL document for " +
component.getName() + "/" + service.getName());
}
@@ -273,7 +273,7 @@ public class Axis2ServiceBindingProvider
private void createAxisService(String endpointURL, Port port) throws
AxisFault {
AxisService axisService;
- if (wsBinding.getWSDLDocument() != null) {
+ if (wsBinding.getGeneratedWSDLDocument() != null) {
axisService =
Axis2EngineIntegration.createWSDLAxisService(endpointURL, port, wsBinding);
} else {
axisService =
Axis2EngineIntegration.createJavaAxisService(endpointURL, configContext,
service);
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java
Thu Jun 17 13:55:03 2010
@@ -43,7 +43,7 @@ public class JAXWSReferenceBindingProvid
this.wsBinding = (WebServiceBinding) endpointReference.getBinding();
// A WSDL document should always be present in the binding
- if (wsBinding.getWSDLDocument() == null) {
+ if (wsBinding.getGeneratedWSDLDocument() == null) {
throw new ServiceRuntimeException("No WSDL document for " +
endpointReference.getURI());
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
Thu Jun 17 13:55:03 2010
@@ -82,7 +82,7 @@ public class JAXWSBindingInvoker impleme
private Dispatch<SOAPMessage> createDispatch(WebServiceBinding wsBinding) {
URL wsdlLocation = null;
try {
- wsdlLocation = new
URL(wsBinding.getWSDLDocument().getDocumentBaseURI());
+ wsdlLocation = new
URL(wsBinding.getGeneratedWSDLDocument().getDocumentBaseURI());
} catch (Exception e) {
try {
if (wsBinding.getWSDLDefinition().getLocation() != null){
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
Thu Jun 17 13:55:03 2010
@@ -84,7 +84,7 @@ public class JAXWSBindingProvider implem
this.wsBinding = (WebServiceBinding)endpoint.getBinding();
// A WSDL document should always be present in the binding
- if (wsBinding.getWSDLDocument() == null) {
+ if (wsBinding.getGeneratedWSDLDocument() == null) {
throw new ServiceRuntimeException("No WSDL document for " +
endpoint.getURI());
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
Thu Jun 17 13:55:03 2010
@@ -244,10 +244,10 @@ public class BindingWSDLGenerator {
// attempt to share the same document across multiple bindings.
// generate a WSDL definitions document if needed
- Definition definition = wsBinding.getWSDLDocument();
+ Definition definition = wsBinding.getGeneratedWSDLDocument();
if (definition == null) {
definition =
WSDLServiceGenerator.configureWSDLDefinition(wsBinding, component, contract,
monitor);
- wsBinding.setWSDLDocument(definition);
+ wsBinding.setGeneratedWSDLDocument(definition);
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
Thu Jun 17 13:55:03 2010
@@ -44,8 +44,12 @@ public class WebServiceBindingBuilder im
/**
* Create a calculated WSDL document and save it in the Web Service
binding.
*/
- public void build(Component component, Contract contract,
WebServiceBinding binding, BuilderContext context) {
- binding.setWSDLDocument(null);
+ public void build(Component component, Contract contract,
WebServiceBinding binding, BuilderContext context, boolean rebuild) {
+ // in some cases (callback service endpoint processing) we need to
re-generate the
+ // WSDL doc from a ws binding that already has one.
+ if (rebuild == true){
+ binding.setGeneratedWSDLDocument(null);
+ }
BindingWSDLGenerator.generateWSDL(component, contract, binding,
extensionPoints, context.getMonitor());
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
Thu Jun 17 13:55:03 2010
@@ -205,7 +205,7 @@ public interface WebServiceBinding exten
* Returns the generated WSDL definitions document.
* @return the generated WSDL definitions document
*/
- Definition getWSDLDocument();
+ Definition getGeneratedWSDLDocument();
/**
* Sets the generated WSDL definitions document. The WSDL is generated
@@ -213,14 +213,6 @@ public interface WebServiceBinding exten
*
* @param definition the generated WSDL definitions document
*/
- void setWSDLDocument(Definition definition);
-
-
- // TODO - There are a wealth of oddly named methods in this binding
- // We have an opportunity with the JAXWS version of the WS binding
- // to re-think how the information here should be present so am
- // going to start adding/moving methods to below this point that
- // (hopefully) give a better idea of where the information is
- // derived from.
+ void setGeneratedWSDLDocument(Definition definition);
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
Thu Jun 17 13:55:03 2010
@@ -287,11 +287,11 @@ class WebServiceBindingImpl implements W
this.endPointReference = epr;
}
- public Definition getWSDLDocument() {
+ public Definition getGeneratedWSDLDocument() {
return generatedWSDLDocument;
}
- public void setWSDLDocument(Definition definition) {
+ public void setGeneratedWSDLDocument(Definition definition) {
this.generatedWSDLDocument = definition;
}
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
Thu Jun 17 13:55:03 2010
@@ -63,7 +63,7 @@ public class ComponentReferenceBindingBu
for (Binding binding : componentReference.getBindings()) {
BindingBuilder builder =
builders.getBindingBuilder(binding.getType());
if (builder != null) {
- builder.build(component, componentReference, binding,
context);
+ builder.build(component, componentReference, binding,
context, false);
}
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
Thu Jun 17 13:55:03 2010
@@ -70,7 +70,7 @@ public class ComponentServiceBindingBuil
for (Binding binding : componentService.getBindings()) {
BindingBuilder builder =
builders.getBindingBuilder(binding.getType());
if (builder != null) {
- builder.build(component, componentService, binding,
context);
+ builder.build(component, componentService, binding,
context, false);
}
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
Thu Jun 17 13:55:03 2010
@@ -285,7 +285,7 @@ public class ServiceReferenceImpl<B> imp
BindingBuilder bindingBuilder =
builders.getBindingBuilder(binding.getType());
if (bindingBuilder != null) {
org.apache.tuscany.sca.assembly.builder.BuilderContext context
= new BuilderContext(registry);
- bindingBuilder.build(endpointReference.getComponent(),
reference, endpointReference.getBinding(), context);
+ bindingBuilder.build(endpointReference.getComponent(),
reference, endpointReference.getBinding(), context, false);
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java?rev=955601&r1=955600&r2=955601&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
Thu Jun 17 13:55:03 2010
@@ -349,7 +349,8 @@ public class EndpointReferenceBinderImpl
builder.build(endpointReference.getComponent(),
endpointReference.getReference(),
endpointReference.getBinding(),
- new BuilderContext(extensionPoints));
+ new BuilderContext(extensionPoints),
+ false);
}
}
@@ -439,7 +440,8 @@ public class EndpointReferenceBinderImpl
builder.build(endpoint.getComponent(),
endpoint.getService(),
endpoint.getBinding(),
- new BuilderContext(extensionPoints));
+ new BuilderContext(extensionPoints),
+ true);
}
}
