Author: antelder
Date: Sat Jun 12 09:03:08 2010
New Revision: 953965
URL: http://svn.apache.org/viewvc?rev=953965&view=rev
Log:
Update wsdli:location validation to fix conformance test BWS_2015
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.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/xml/WebServiceBindingProcessor.java?rev=953965&r1=953964&r2=953965&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
Sat Jun 12 09:03:08 2010
@@ -193,6 +193,9 @@ public class WebServiceBindingProcessor
// 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()) {
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.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/xml/WebServiceConstants.java?rev=953965&r1=953964&r2=953965&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
Sat Jun 12 09:03:08 2010
@@ -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);
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties?rev=953965&r1=953964&r2=953965&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
Sat Jun 12 09:03:08 2010
@@ -24,5 +24,8 @@ InvalidInterfaceException = Exception cr
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
+
+
