Author: jkaputin
Date: Fri May 25 06:56:09 2007
New Revision: 541655
URL: http://svn.apache.org/viewvc?view=rev&rev=541655
Log:
WODEN-3 Eliminate Schema-0016 from assertion checking
as it has now been removed from WSDL2 spec.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java?view=diff&rev=541655&r1=541654&r2=541655
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
Fri May 25 06:56:09 2007
@@ -181,8 +181,9 @@
InterfaceFaultElement faultElement = faultElements[j];
if(!testAssertionSchema0020b(descElement, faultElement, errorReporter))
isValid = false;
- if(!testAssertionSchema0016(descElement,
faultElement.getElementName().getNamespaceURI(), errorReporter))
- isValid = false;
+ //Schema-0016 removed from spec during CR phase
+ //if(!testAssertionSchema0016(descElement,
faultElement.getElementName().getNamespaceURI(), errorReporter))
+ // isValid = false;
}
return isValid;
}
@@ -230,12 +231,13 @@
isValid = false;
// Only call the namespace assertion if the referenced element name
is not null.
- QName elementName = messageReference.getElementName();
- if(elementName != null)
- {
- if(!testAssertionSchema0016(descElement,
elementName.getNamespaceURI(), errorReporter))
- isValid = false;
- }
+ //Schema-0016 removed from spec during CR phase
+ //QName elementName = messageReference.getElementName();
+ //if(elementName != null)
+ //{
+ // if(!testAssertionSchema0016(descElement,
elementName.getNamespaceURI(), errorReporter))
+ // isValid = false;
+ //}
}
return isValid;
}
Modified:
incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java?view=diff&rev=541655&r1=541654&r2=541655
==============================================================================
---
incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
(original)
+++
incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
Fri May 25 06:56:09 2007
@@ -1256,6 +1256,9 @@
/**
+ * TODO: this assertion has been removed from the WSDL2 spec during CR, so
+ * ignore this test method when reimplementing the validation code.
+ *
* Test assertion Schema-0016. References to XML schema components must only
refer
* to elements and types in namespaces that have been imported or inlined or
that
* are part of the XML schema namespace.
@@ -1263,7 +1266,7 @@
* TODO: Implement tests for specific elements that contain invalid
references.
* These tests should probably be contained in a test method for
validateInterfaces, validateBindings, etc.
*/
- public void testTestAssertionSchema0016()
+ public void dontTestAssertionSchema0016()
{
// Create a schema for use in the tests and add it to a types section.
InlinedSchema schema = new InlinedSchemaImpl();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
