Author: slaws
Date: Mon Jun 21 09:18:29 2010
New Revision: 956511
URL: http://svn.apache.org/viewvc?rev=956511&view=rev
Log:
BWS_2003 - add a check that wsdl.service doesn't appear on a service binding.ws
element
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/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=956511&r1=956510&r2=956511&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
Mon Jun 21 09:18:29 2010
@@ -135,6 +135,7 @@ public class WebServiceBindingProcessor
if (uri != null) {
wsBinding.setURI(uri);
+ // BWS20001
if (context.getParentModel() instanceof Reference){
try {
URI tmpURI = new URI(uri);
@@ -164,6 +165,11 @@ public class WebServiceBindingProcessor
String localName = wsdlElement.substring(index + 1);
if (localName.startsWith("wsdl.service")) {
+ // BWS20003
+ if (context.getParentModel() instanceof
org.apache.tuscany.sca.assembly.Service){
+ error(monitor, "WSDLServiceOnService", reader,
wsdlElement);
+ }
+
// Read a wsdl.service
localName = localName.substring("wsdl.service(".length(),
localName.length() - 1);
wsBinding.setServiceName(new QName(namespace, localName));
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=956511&r1=956510&r2=956511&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
Mon Jun 21 09:18:29 2010
@@ -27,6 +27,7 @@ WsdlPortTypeDoesNotMatch = The #wsdl.por
WsdliLocationMissingWsdlElement = binding.ws has a @wsdli:wsdlLocation
attribute but no @wsdlElement attribute
URINotAbsolute = [BWS20001] The URI value for binding.ws on an SCA reference
must be absolute. Non-absolute value found {0}
InvalidURISyntax = The URI value {0} found on binding.ws has invalid syntax
+WSDLServiceOnService = [BWS20003] The wsdlElement attribute of a binding.ws on
an SCA service must not specify the wsdl.service form of URI. The following URI
was found {0}
