diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-12 09:03:08 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-12 09:03:08 +0000 |
| commit | ed94c1efa04d08de65afb771efc91f74262a88a3 (patch) | |
| tree | f7c8e4e9a3805751bb6b7b2af1144e5c852c57db /sca-java-2.x/trunk/modules/binding-ws | |
| parent | a2f9c036ee8c1f00e8262366f9e1401c427581a0 (diff) | |
Update wsdli:location validation to fix conformance test BWS_2015
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@953965 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-ws')
3 files changed, 7 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java index 7c07e94906..e288d162d8 100644 --- a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java +++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java @@ -193,6 +193,9 @@ public class WebServiceBindingProcessor extends BaseStAXArtifactProcessor implem // Read wsdlLocation wsBinding.setLocation(reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION)); + if (wsdlElement == null && wsBinding.getLocation() != null) { + error(monitor, "WsdliLocationMissingWsdlElement", reader); + } // Skip to end element while (reader.hasNext()) { diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java index 88f173368d..a7126a67ee 100644 --- a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java +++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java @@ -35,7 +35,7 @@ public interface WebServiceConstants { QName WSDL_ELEMENT_QNAME = new QName(SCA11_NS, WSDL_ELEMENT); String WSDL_LOCATION = "wsdlLocation"; - String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance"; + String WSDLI_NS = "http://www.w3.org/ns/wsdl-instance"; QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties b/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties index 2dfa5e6133..7a6cee4dc5 100644 --- a/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties +++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties @@ -24,5 +24,8 @@ InvalidInterfaceException = Exception creating interface from WSDL for binding: WsdlBindingDoesNotMatch = The #wsdl.binding({0}) does not match with the WSDL Definitions WsdlServiceDoesNotMatch = The #wsdl.service({0}) does not match with the WSDL Definitions WsdlPortTypeDoesNotMatch = The #wsdl.port({0}) does not match with the WSDL Definitions +WsdliLocationMissingWsdlElement = binding.ws has a @wsdli:wsdlLocation attribute but no @wsdlElement attribute + + |