You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/08/03 14:07:49 UTC
svn commit: r800327 - in /tuscany/java/sca/modules/interface-wsdl/src/main:
java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ resources/
Author: slaws
Date: Mon Aug 3 12:07:49 2009
New Revision: 800327
URL: http://svn.apache.org/viewvc?rev=800327&view=rev
Log:
Raise an error when remotable is set to anything but true. Required to get ASM-8019 going. There needs to be a further change here to get the context of the error printed out. ML discussion ongoing.
Modified:
tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
tuscany/java/sca/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java?rev=800327&r1=800326&r2=800327&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java (original)
+++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java Mon Aug 3 12:07:49 2009
@@ -31,6 +31,7 @@
QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl");
String INTERFACE = "interface";
String CALLBACK_INTERFACE = "callbackInterface";
+ String REMOTABLE = "remotable";
String WSDL_LOCATION = "wsdlLocation";
String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance";
QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION);
Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?rev=800327&r1=800326&r2=800327&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Mon Aug 3 12:07:49 2009
@@ -176,6 +176,17 @@
if (wsdlCallbackInterface != null)
wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface);
}
+
+ String remotable = reader.getAttributeValue(null, REMOTABLE);
+ if (remotable != null &&
+ !remotable.equals("true")){
+ Monitor.error(monitor,
+ this,
+ "interface-wsdlxml-validation-messages",
+ "InvalidRemotableValue",
+ ((WSDLInterface)wsdlInterfaceContract.getInterface()).getName().toString(),
+ remotable);
+ }
// Skip to end element
while (reader.hasNext()) {
Modified: tuscany/java/sca/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties?rev=800327&r1=800326&r2=800327&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties (original)
+++ tuscany/java/sca/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties Mon Aug 3 12:07:49 2009
@@ -21,4 +21,5 @@
ContributionReadException = ContributionReadException occured due to :
ContributionResolveException = ContributionResolveException occured due to :
InvalidWSDLInterfaceAttr = Invalid WSDL interface attribute: {0}
-WsdlInterfaceDoesNotMatch = The #wsdl.interface({0}) specified does not match with WSDL Definitions
\ No newline at end of file
+WsdlInterfaceDoesNotMatch = The #wsdl.interface({0}) specified does not match with WSDL Definitions
+InvalidRemotableValue = The interface.wsdl interface {0} element can only have a remotable attribute with the value "true" as WSDL interface are assumed to be remotable by default. The value that was found is: {1}.
\ No newline at end of file