Fix for TUSCANY-2962

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@773823 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 34 insertions, 1 deletions

diff --git a/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 226362eb31..b54fa6b722 100644
--- a/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
@@ -22,6 +22,7 @@ package org.apache.tuscany.sca.binding.ws.xml;
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.wsdl.Binding;
@@ -69,6 +70,8 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
 import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
 import org.apache.tuscany.sca.policy.PolicyFactory;
 
+import com.ibm.wsdl.OperationImpl;
+
 /**
  * This is the StAXArtifactProcessor for the Web Services Binding.
  *
@@ -421,6 +424,19 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ
 
             PortType portType = getPortType(model);
             if (portType != null) {
+            	// Introspect the WSDL portType and validate the input/output messages.
+            	List<OperationImpl> operations = portType.getOperations();
+            	for (OperationImpl operation : operations) {
+            		if (operation.getInput().getMessage() == null) {
+            			ContributionResolveException ce = new ContributionResolveException("WSDL binding operation input name " + operation.getInput().getName() + " does not match with PortType Definition");
+                        error("ContributionResolveException", wsdlDefinition, ce);
+            		}
+            		if (operation.getOutput().getMessage() == null) {
+            			ContributionResolveException ce = new ContributionResolveException("WSDL binding operation output name " + operation.getOutput().getName() + " does not match with PortType Definition");
+                        error("ContributionResolveException", wsdlDefinition, ce);
+            		}
+            	}            	
+            	
                 WSDLInterfaceContract interfaceContract = wsdlFactory.createWSDLInterfaceContract();
                 WSDLInterface wsdlInterface = null;
                 try {
diff --git a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index 11cff6658f..3ad2da4205 100644
--- a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
@@ -21,6 +21,7 @@ package org.apache.tuscany.sca.interfacedef.wsdl.xml;
 
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 
+import java.util.List;
 import javax.wsdl.PortType;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -45,9 +46,11 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
+import org.apache.tuscany.sca.interfacedef.wsdl.impl.WSDLOperationImpl;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
+import com.ibm.wsdl.OperationImpl;
 
 /**
  *
@@ -251,7 +254,21 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
                     wsdlDefinition.getXmlSchemas().addAll(resolved.getXmlSchemas());
                     wsdlDefinition.setUnresolved(false);
                     WSDLObject<PortType> portType = wsdlDefinition.getWSDLObject(PortType.class, wsdlInterface.getName());
-                    if (portType != null) {                        
+                    if (portType != null) {
+                    	// Introspect the WSDL portType and validate 
+                    	// the input/output messages.
+                    	List<OperationImpl> operations = portType.getElement().getOperations();
+                    	for (OperationImpl operation : operations) {
+                    		if (operation.getInput().getMessage() == null) {
+                    			ContributionResolveException ce = new ContributionResolveException("WSDL binding operation input name " + operation.getInput().getName() + " does not match with PortType Definition");
+                                error("ContributionResolveException", wsdlDefinition, ce);
+                    		}
+                    		if (operation.getOutput().getMessage() == null) {
+                    			ContributionResolveException ce = new ContributionResolveException("WSDL binding operation output name " + operation.getOutput().getName() + " does not match with PortType Definition");
+                                error("ContributionResolveException", wsdlDefinition, ce);
+                    		}
+                    	}
+                    	
                         // Introspect the WSDL portType and add the resulting
                         // WSDLInterface to the resolver
                         try {