ws-woden-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkapu...@apache.org
Subject svn commit: r546553 [1/3] - in /incubator/woden/trunk/java: src/org/apache/woden/internal/ src/org/apache/woden/internal/util/ src/org/apache/woden/internal/wsdl20/validation/ test/org/apache/woden/internal/wsdl20/validation/
Date Tue, 12 Jun 2007 16:19:23 GMT
Author: jkaputin
Date: Tue Jun 12 09:19:17 2007
New Revision: 546553

URL: http://svn.apache.org/viewvc?view=rev&rev=546553
Log:
WODEN-149
Renumbered assertion numbers in the Woden source 
code to the PR assertion numbers.

Modified:
    incubator/woden/trunk/java/src/org/apache/woden/internal/Messages.properties
    incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
    incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java
    incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
    incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java
    incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/Messages.properties?view=diff&rev=546553&r1=546552&r2=546553
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/Messages.properties (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/Messages.properties Tue Jun 12 09:19:17 2007
@@ -92,8 +92,8 @@
 
 # ---------------- WSDL Document Level Assertions -------------------
 
-Description-0025 = The target namespace ''{0}'' is not an absolute IRI. The target namespace must be an absolute IRI.
-Description-0025.assertion = The type of the targetNamespace attribute information item is xs:anyURI. Its value MUST be an absolute IRI (see [IETF RFC 3987]).
+Description-1006 = The target namespace ''{0}'' is not an absolute IRI. The target namespace must be an absolute IRI.
+Description-1006.assertion = The type of the targetNamespace attribute information item is xs:anyURI. Its value MUST be an absolute IRI (see [IETF RFC 3987]).
 
 Import-0001 = The component ''{0}'' is in the namespace ''{1}'', which has not been imported. A namespace must be imported before components from it can be referenced in this document.
 Import-0001.assertion =  However, any WSDL 2.0 document that contains component definitions that refer by QName to WSDL 2.0 components that belong to a different namespace MUST contain a wsdl:import element information item  for that namespace (see 4.2 Importing Descriptions).
@@ -101,59 +101,59 @@
 Import-0003 = The imported document located at ''{0}'' has the same namespace as this document. An imported document's target namespace must be different than the target namespace of the document that imports it. If the target namespaces are the same a WSDL include should be used instead of a WSDL import.
 Import-0003.assertion =  Imported components have different target namespace values from the WSDL 2.0 document that is importing them.
 
-Interface-0031 = The styleDefault attribute contains the IRI ''{0}'', which is not absolute. All IRIs specified for styleDefault must be absolute.
-Interface-0031.assertion = The type of the styleDefault attribute information item is list of xs:anyURI. Its value, if present, MUST contain absolute IRIs (see [IETF RFC 3987]).
+Interface-1012 = The styleDefault attribute contains the IRI ''{0}'', which is not absolute. All IRIs specified for styleDefault must be absolute.
+Interface-1012.assertion = The type of the styleDefault attribute information item is list of xs:anyURI. Its value, if present, MUST contain absolute IRIs (see [IETF RFC 3987]).
 
 MessageLabel-0004 = 
 MessageLabel-0004.assertion = The messageLabel attribute information item of an interface message reference element information item MUST be present if the message exchange pattern has more than one placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0005 = 
-MessageLabel-0005.assertion = The messageLabel attribute information item of an interface fault reference element information item  MUST be present if the message exchange pattern has more than one placeholder message with {direction} equal to the message direction.
+MessageLabel-1041 = 
+MessageLabel-1041.assertion = The messageLabel attribute information item of an interface fault reference element information item  MUST be present if the message exchange pattern has more than one placeholder message with {direction} equal to the message direction.
 
 MessageLabel-0006 = 
 MessageLabel-0006.assertion =  The messageLabel attribute information item  of a binding message reference element information item  MUST be present if the message exchange pattern has more than one placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0007 = 
-MessageLabel-0007.assertion =  The messageLabel attribute information item  of a binding fault reference element information item  MUST be present if the message exchange pattern has more than one placeholder message with {direction} equal to the message direction.
+MessageLabel-1056 = 
+MessageLabel-1056.assertion =  The messageLabel attribute information item  of a binding fault reference element information item  MUST be present if the message exchange pattern has more than one placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0008 = 
-MessageLabel-0008.assertion =  If the messageLabel attribute information item  of an interface message reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
+MessageLabel-1030 = 
+MessageLabel-1030.assertion =  If the messageLabel attribute information item  of an interface message reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0009 = 
-MessageLabel-0009.assertion =  If the messageLabel attribute information item  of an interface fault reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
+MessageLabel-1042 = 
+MessageLabel-1042.assertion =  If the messageLabel attribute information item  of an interface fault reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0010 = 
-MessageLabel-0010.assertion =  If the messageLabel attribute information item  of a binding message reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
+MessageLabel-1053 = 
+MessageLabel-1053.assertion =  If the messageLabel attribute information item  of a binding message reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0011 = 
-MessageLabel-0011.assertion =  If the messageLabel attribute information item  of a binding fault reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
+MessageLabel-1057 = 
+MessageLabel-1057.assertion =  If the messageLabel attribute information item  of a binding fault reference element information item  is present then its actual value MUST match the {message label} of some placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0012 = 
-MessageLabel-0012.assertion =  If the messageLabel attribute information item  of an interface message reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
+MessageLabel-1031 = 
+MessageLabel-1031.assertion =  If the messageLabel attribute information item  of an interface message reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0013 = 
-MessageLabel-0013.assertion =  If the messageLabel attribute information item  of an interface fault reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
+MessageLabel-1043 = 
+MessageLabel-1043.assertion =  If the messageLabel attribute information item  of an interface fault reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0014 = 
-MessageLabel-0014.assertion =  If the messageLabel attribute information item  of a binding message reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
+MessageLabel-1054 = 
+MessageLabel-1054.assertion =  If the messageLabel attribute information item  of a binding message reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
 
-MessageLabel-0015 = 
-MessageLabel-0015.assertion =  If the messageLabel attribute information item  of a binding fault reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
+MessageLabel-1058 = 
+MessageLabel-1058.assertion =  If the messageLabel attribute information item  of a binding fault reference element information item  is absent then there MUST be a unique placeholder message with {direction} equal to the message direction.
 
-Schema-0016 = A component in the XML Schema namespace ''{0}'' has been referenced but this namespace is not available. In order to reference components from a XML Schema namespace the namespace must be imported or defined inline.
-Schema-0016.assertion = A WSDL 2.0 document MUST NOT refer to XML Schema components in a given namespace unless an xs:import or xs:schema element information item for that namespace is present or the namespace is the XML Schema namespace which contains built-in types as defined in XML Schema Part 2: Datatypes Second Edition [XML Schema: Datatypes].
+Schema-1066 = A component in the XML Schema namespace ''{0}'' has been referenced but this namespace is not available. In order to reference components from a XML Schema namespace the namespace must be imported or defined inline.
+Schema-1066.assertion = A WSDL 2.0 document MUST NOT refer to XML Schema components in a given namespace unless an xs:import or xs:schema element information item for that namespace is present or the namespace is the XML Schema namespace which contains built-in types as defined in XML Schema Part 2: Datatypes Second Edition [XML Schema: Datatypes].
 
-Schema-0017 = The XML schema imported from ''{0}'' must specify a target namespace.
-Schema-0017.assertion = The referenced schema MUST contain a targetNamespace attribute information item on its xs:schema element information item.
+Schema-1069 = The XML schema imported from ''{0}'' must specify a target namespace.
+Schema-1069.assertion = The referenced schema MUST contain a targetNamespace attribute information item on its xs:schema element information item.
 
 #schema-0017b is a replacement for WSDL502
 #WSDL502=The namespace "{0}" specified on a schema import element does not match the target namespace "{1}" of the schema at the schemaLocation "{2}".
 
-Schema-0018 = The element ''{0}'' has already been defined in another inline XML Schema with the target namespace ''{1}''.
-Schema-0018.assertion = A WSDL 2.0 document MUST NOT define the same element or type in more than one inlined schema.
+Schema-1073 = The element ''{0}'' has already been defined in another inline XML Schema with the target namespace ''{1}''.
+Schema-1073.assertion = A WSDL 2.0 document MUST NOT define the same element or type in more than one inlined schema.
 
-Schema-0018b = The type ''{0}'' has already been defined in another inline XML Schema with the target namespace ''{1}''.
-Schema-0018b.assertion = A WSDL 2.0 document MUST NOT define the same element or type in more than one inlined schema.
+Schema-1073b = The type ''{0}'' has already been defined in another inline XML Schema with the target namespace ''{1}''.
+Schema-1073b.assertion = A WSDL 2.0 document MUST NOT define the same element or type in more than one inlined schema.
 
 # This assertion is for interface message reference
 Schema-0020 = The message reference ''{0}'' refers to the type definition ''{1}''. A message reference must refer to an element definition. 
@@ -163,71 +163,71 @@
 Schema-0020b = The fault ''{0}'' refers to the type definition ''{1}''. A fault must refer to an element definition. 
 Schema-0020b.assertion = An element attribute information item MUST NOT refer to a global xs:simpleType or xs:complexType definition.
 
-Schema-0021 = The alternative schema language makes use of the XML Schema namespace.
-Schema-0021.assertion = A specification of extension syntax for an alternative schema language MUST use a namespace that is different than the namespace of XML Schema.
+Schema-1075 = The alternative schema language makes use of the XML Schema namespace.
+Schema-1075.assertion = A specification of extension syntax for an alternative schema language MUST use a namespace that is different than the namespace of XML Schema.
 
-Schema-0022 = The binding ''{0}'' specified is not consistent with the interface ''{1}'' specified. The binding must refer to the same interface as is specified by the interace attribute.
-Schema-0022.assertion = If wsdlx:interface and wsdlx:binding are used together then they MUST satisfy the same consistency rules that apply to the {interface} property of a Service component and the {binding} property of a nested Endpoint component, that is either the binding refers the interface of the service or the binding refers to no interface.
+Schema-1079 = The binding ''{0}'' specified is not consistent with the interface ''{1}'' specified. The binding must refer to the same interface as is specified by the interace attribute.
+Schema-1079.assertion = If wsdlx:interface and wsdlx:binding are used together then they MUST satisfy the same consistency rules that apply to the {interface} property of a Service component and the {binding} property of a nested Endpoint component, that is either the binding refers the interface of the service or the binding refers to no interface.
 
-Schema-0052 = The imported XML Schema is not defined with the namespace ''{0}'' that is specified on the import element.
-Schema-0052.assertion = The value of the targetNamespace attribute information item of the xs:schema element information item of an imported schema MUST equal the value of the namespace of the import element information item in the importing WSDL 2.0 document.
+Schema-1070 = The imported XML Schema is not defined with the namespace ''{0}'' that is specified on the import element.
+Schema-1070.assertion = The value of the targetNamespace attribute information item of the xs:schema element information item of an imported schema MUST equal the value of the namespace of the import element information item in the importing WSDL 2.0 document.
 
-Schema-0053 = The namespace ''{0}'' specified is not an absolute IRI.
-Schema-0053.assertion = The namespace used for an alternate schema language MUST be an absolute IRI.
+Schema-1076 = The namespace ''{0}'' specified is not an absolute IRI.
+Schema-1076.assertion = The namespace used for an alternate schema language MUST be an absolute IRI.
 
-Types-0023 = The alternate schema language does not include a declaration of an element information item to appear as a child of the types element.
-Types-0023.assertion = A specification of extension syntax for an alternative schema language MUST include the declaration of an element information item, intended to appear as a child of the wsdl:types element information item, which references, names, and locates the schema instance (an "import" element information item).
+Types-1074 = The alternate schema language does not include a declaration of an element information item to appear as a child of the types element.
+Types-1074.assertion = A specification of extension syntax for an alternative schema language MUST include the declaration of an element information item, intended to appear as a child of the wsdl:types element information item, which references, names, and locates the schema instance (an "import" element information item).
 
 
 # ---------------- WSDL Component Level Assertions -------------------
 
 # If a Binding component specifies any operation-specific binding details (by including Binding Operation components) or any fault binding details (by including Binding Fault components) then it MUST specify an interface the Binding  component applies to, so as to indicate which interface the operations come from.
-Binding-0054 = An interface has not been specified for a binding that specifies operation or fault details. An interface must be specified when operation or fault details are specified.
+Binding-1044 = An interface has not been specified for a binding that specifies operation or fault details. An interface must be specified when operation or fault details are specified.
 
 # A Binding component that defines bindings for an Interface component MUST define bindings for all the operations of that Interface component.
-Binding-0055 = The binding ''{0}'' does not define bindings for the interface operation ''{1}''. When a binding specifies an interface it must specify bindings for all of the interface's operations.
+Binding-1045 = The binding ''{0}'' does not define bindings for the interface operation ''{1}''. When a binding specifies an interface it must specify bindings for all of the interface's operations.
 
 # This xs:anyURI MUST be an absolute IRI as defined by [IETF RFC 3987].
-Binding-0056 = The type ''{0}'' specified for this binding is not an absolute IRI. The type must be absolute.
+Binding-1048 = The type ''{0}'' specified for this binding is not an absolute IRI. The type must be absolute.
 
 # For each Binding component in the {bindings} property of a Description component, the {name} property MUST be unique.
-Binding-0057 = A binding with the name ''{0}'' has already been defined for the description component. All bindings defined in the description component must have unique names.
+Binding-1049 = A binding with the name ''{0}'' has already been defined for the description component. All bindings defined in the description component must have unique names.
 
 # For each Binding Fault component in the {binding faults} property of a Binding component, the {interface fault} property MUST be unique.
-BindingFault-0058 = The interface fault specified for this binding fault has already been specified on another binding fault. Each binding fault within a binding must specify a unique interface fault.
+BindingFault-1050 = The interface fault specified for this binding fault has already been specified on another binding fault. Each binding fault within a binding must specify a unique interface fault.
 
 # For each Binding Fault Reference component in the {binding fault references} property of a Binding Operation component, the {interface fault reference} property MUST be unique.
-BindingFaultReference-0061 = A binding fault reference has already been specified for the interface fault reference ''{0}''. Each binding fault reference within a binding operation component must specify a unique interface fault reference.
+BindingFaultReference-1055 = A binding fault reference has already been specified for the interface fault reference ''{0}''. Each binding fault reference within a binding operation component must specify a unique interface fault reference.
 
 # There MUST be an Interface Fault Reference component in the {interface fault references} of the Interface Operation being bound with {message label} equal to the effective message label and with {interface fault} equal to an Interface Fault component with {name} equal to the actual value of the ref attribute information item.
-BindingFaultReference-0062 = The binding fault reference must reference an defined interface fault reference.
+BindingFaultReference-1059 = The binding fault reference must reference an defined interface fault reference.
 
 # For each Binding Message Reference component in the {binding message references} property of a Binding Operation component, the {interface message reference} property MUST be unique.
-BindingMessageReference-0060 = A binding message reference has already been specified for the interface message reference ''{0}''. Each binding message reference within a binding operation component must specify a unique interface message reference.
+BindingMessageReference-1052 = A binding message reference has already been specified for the interface message reference ''{0}''. Each binding message reference within a binding operation component must specify a unique interface message reference.
 
 # For each Binding Operation component in the {binding operations} property of a Binding component, the {interface operation} property MUST be unique.
-BindingOperation-0059 = A binding operation has already been specified for the interface operation ''{0}''. Each binding operation within a binding component must specify a unique interface operation.
+BindingOperation-1051 = A binding operation has already been specified for the interface operation ''{0}''. Each binding operation within a binding component must specify a unique interface operation.
 
 Description-0024 = 
 Description-0024.ref = 2.1.2
 Description-0024.assertion = Each WSDL 2.0 or type system component MUST be uniquely identified by its qualified name.
 
 # This xs:anyURI MUST be an absolute IRI as defined by [IETF RFC 3987].
-Endpoint-0064 = The address ''{0}'' specified for this endpoint is not an absolute IRI. The address must be absolute.
+Endpoint-1061 = The address ''{0}'' specified for this endpoint is not an absolute IRI. The address must be absolute.
 
 # For each Endpoint component in the {endpoints} property of a Service component, the {name} property MUST be unique.
 Endpoint-0065 = A endpoint with the name ''{0}'' has already been defined for the service component. All endpoints defined in a service component must have unique names.
 
 # For each Endpoint component in the {endpoints} property of a Service component, the {binding} property MUST either be a Binding component with an unspecified {interface} property or a Binding component with an {interface} property equal to the {interface} property of the Service component.
-Endpoint-0066 = The binding ''{0}'' specified for this endpoint specifies the interface ''{1}'' and not the interface ''{2}'' specified by the service. The binding specified for this endpoint must either not specify an interface or specify the same interface as the service.
+Endpoint-1062 = The binding ''{0}'' specified for this endpoint specifies the interface ''{1}'' and not the interface ''{2}'' specified by the service. The binding specified for this endpoint must either not specify an interface or specify the same interface as the service.
 
-Interface-0027 = This interface extends itself via the extended interface ''{0}''. An interface cannot appear in the list of interfaces it extends.
-Interface-0027.ref = 2.2.1
-Interface-0027.assertion = To avoid circular definitions, an interface MUST NOT appear as an element of the set of interfaces it extends, either directly or indirectly.
-
-Interface-0030 = An interface with the name ''{0}'' has already been defined for the description component. All interfaces defined in the description component must have unique names.
-Interface-0030.ref = 2.2.1
-Interface-0030.assertion = For each Interface component in the {interfaces} property of a Description component, the {name} property MUST be unique.
+Interface-1009 = This interface extends itself via the extended interface ''{0}''. An interface cannot appear in the list of interfaces it extends.
+Interface-1009.ref = 2.2.1
+Interface-1009.assertion = To avoid circular definitions, an interface MUST NOT appear as an element of the set of interfaces it extends, either directly or indirectly.
+
+Interface-1010 = An interface with the name ''{0}'' has already been defined for the description component. All interfaces defined in the description component must have unique names.
+Interface-1010.ref = 2.2.1
+Interface-1010.assertion = For each Interface component in the {interfaces} property of a Description component, the {name} property MUST be unique.
 
 InterfaceFault-0028 = The namespace of the interface operation name must be the same as the namespace of the interface name.
 InterfaceFault-0028.ref = 2.2.1
@@ -237,33 +237,33 @@
 InterfaceFault-0032.ref = 2.3.1
 InterfaceFault-0032.assertion = For each Interface Fault component in the {interface faults} property of an Interface component, the {name} property must be unique.
 
-InterfaceFault-0033 = 
-InterfaceFault-0033.ref = 2.3.1
-InterfaceFault-0033.assertion = In cases where, due to an interface extending one or more other interfaces, two or more Interface Fault components have the same value for their {name} property, then the component models of those Interface Fault components MUST be equivalent (see 2.17 Equivalence of Components).
-
-InterfaceFaultReference-0043 = 
-InterfaceFaultReference-0043.ref = 2.6.1
-InterfaceFaultReference-0043.assertion = The value of this property MUST match the name of a placeholder message defined by the message exchange pattern.
-
-InterfaceFaultReference-0044 = 
-InterfaceFaultReference-0044.ref = 2.6.1
-InterfaceFaultReference-0044.assertion = The direction MUST be consistent with the direction implied by the fault propagation ruleset used in the message exchange pattern of the operation.
-
-InterfaceFaultReference-0045 = An interface fault reference with for the fault ''{0}'' and message label ''{1}'' has already been defined for this interface operation. Each fault reference in an interface operation must have a unique combination of fault and message label.
-InterfaceFaultReference-0045.ref = 2.6.1
-InterfaceFaultReference-0045.assertion = For each Interface Fault Reference component in the {interface fault references} property of an Interface Operation component, the combination of its {interface fault} and {message label} properties MUST be unique.
-
-InterfaceMessageReference-0040 = 
-InterfaceMessageReference-0040.ref = 2.5.1
-InterfaceMessageReference-0040.assertion = The direction MUST be the same as the direction of the message identified by the {message label} property in the {message exchange pattern} of the Interface Operation component this is contained within.
-
-InterfaceMessageReference-0041 = The message content model is #any or #none and the element declaration is not empty. The element declaration must be empty when the message content model is #any or #none.
-InterfaceMessageReference-0041.ref = 2.5.1
-InterfaceMessageReference-0041.assertion = When the {message content model} property has the value #any or #none the {element declaration} property MUST be empty.
-
-InterfaceMessageReference-0042 = An interface message reference with the message label ''{0}'' has already been defined. An interface message reference must have a unique message label within the interface operation that contains it.
-InterfaceMessageReference-0042.ref = 2.5.1
-InterfaceMessageReference-0042.assertion = For each Interface Message Reference component in the {interface message references} property of an Interface Operation component, its {message label} property MUST be unique.
+InterfaceFault-1015 = 
+InterfaceFault-1015.ref = 2.3.1
+InterfaceFault-1015.assertion = In cases where, due to an interface extending one or more other interfaces, two or more Interface Fault components have the same value for their {name} property, then the component models of those Interface Fault components MUST be equivalent (see 2.17 Equivalence of Components).
+
+InterfaceFaultReference-1037 = 
+InterfaceFaultReference-1037.ref = 2.6.1
+InterfaceFaultReference-1037.assertion = The value of this property MUST match the name of a placeholder message defined by the message exchange pattern.
+
+InterfaceFaultReference-1038 = 
+InterfaceFaultReference-1038.ref = 2.6.1
+InterfaceFaultReference-1038.assertion = The direction MUST be consistent with the direction implied by the fault propagation ruleset used in the message exchange pattern of the operation.
+
+InterfaceFaultReference-1039 = An interface fault reference with for the fault ''{0}'' and message label ''{1}'' has already been defined for this interface operation. Each fault reference in an interface operation must have a unique combination of fault and message label.
+InterfaceFaultReference-1039.ref = 2.6.1
+InterfaceFaultReference-1039.assertion = For each Interface Fault Reference component in the {interface fault references} property of an Interface Operation component, the combination of its {interface fault} and {message label} properties MUST be unique.
+
+InterfaceMessageReference-1026 = 
+InterfaceMessageReference-1026.ref = 2.5.1
+InterfaceMessageReference-1026.assertion = The direction MUST be the same as the direction of the message identified by the {message label} property in the {message exchange pattern} of the Interface Operation component this is contained within.
+
+InterfaceMessageReference-1028 = The message content model is #any or #none and the element declaration is not empty. The element declaration must be empty when the message content model is #any or #none.
+InterfaceMessageReference-1028.ref = 2.5.1
+InterfaceMessageReference-1028.assertion = When the {message content model} property has the value #any or #none the {element declaration} property MUST be empty.
+
+InterfaceMessageReference-1029 = An interface message reference with the message label ''{0}'' has already been defined. An interface message reference must have a unique message label within the interface operation that contains it.
+InterfaceMessageReference-1029.ref = 2.5.1
+InterfaceMessageReference-1029.assertion = For each Interface Message Reference component in the {interface message references} property of an Interface Operation component, its {message label} property MUST be unique.
 
 InterfaceOperation-0029 = The namespace of the interface operation name must be the same as the namespace of the interface name.
 InterfaceOperation-0029.ref = 2.2.1
@@ -273,31 +273,31 @@
 InterfaceOperation-0035.ref = Section 2.4.1
 InterfaceOperation-0035.assertion = For each Interface Operation component in the {interface operations} property of an Interface component, the {name} property MUST be unique.
 
-InterfaceOperation-0036 = 
-InterfaceOperation-0036 = 2.4.1
-InterfaceOperation-0036.assertion = In cases where, due to an interface extending one or more other interfaces, two or more Interface Operation components have the same value for their {name} property, then the component models of those Interface Operation components MUST be equivalent (see 2.17 Equivalence of Components).
-
-InterfaceOperation-0038 = 
-InterfaceOperation-0038.ref = 2.4.1.2
-InterfaceOperation-0038.assertion = An Interface Operation component MUST satisfy the specification defined by each operation style identified by its {style} property.
-
-MEP-0037 = The message exchange pattern ''{0}'' is not absolute. A message exchange pattern must be identified by an absolute IRI.
-MEP-0037.ref = 2.4.1.1
-MEP-0037.assertion = A message exchange pattern is uniquely identified by an absolute IRI which is used as the value of the {message exchange pattern} property the Interface Operation component, and it specifies the fault propagation ruleset that its faults obey.
-
-MessageLabel-0039 = 
-MessageLabel-0039.ref = 2.5.1
-MessageLabel-0039.assertion = The value of this property MUST match the name of a placeholder message defined by the message exchange pattern.
+InterfaceOperation-20970 = 
+InterfaceOperation-20970 = 2.4.1
+InterfaceOperation-20970.assertion = In cases where, due to an interface extending one or more other interfaces, two or more Interface Operation components have the same value for their {name} property, then the component models of those Interface Operation components MUST be equivalent (see 2.17 Equivalence of Components).
+
+InterfaceOperation-20973 = 
+InterfaceOperation-20973.ref = 2.4.1.2
+InterfaceOperation-20973.assertion = An Interface Operation component MUST satisfy the specification defined by each operation style identified by its {style} property.
+
+MEP-1022 = The message exchange pattern ''{0}'' is not absolute. A message exchange pattern must be identified by an absolute IRI.
+MEP-1022.ref = 2.4.1.1
+MEP-1022.assertion = A message exchange pattern is uniquely identified by an absolute IRI which is used as the value of the {message exchange pattern} property the Interface Operation component, and it specifies the fault propagation ruleset that its faults obey.
+
+MessageLabel-1024 = 
+MessageLabel-1024.ref = 2.5.1
+MessageLabel-1024.assertion = The value of this property MUST match the name of a placeholder message defined by the message exchange pattern.
 
 QName-0002 = 
 QName-0002.assertion = Furthermore, all QName references, whether to the same of to difference namespace MUST resolve to components (see 2.1.9 QName resolution).
 
 # For each Service  component in the {services} property of a Description component, the {name} property MUST be unique.
-Service-0063 = A service with the name ''{0}'' has already been defined for the description component. All services defined in the description component must have unique names.
+Service-1060 = A service with the name ''{0}'' has already been defined for the description component. All services defined in the description component must have unique names.
 
-Types-0026 = 
-Types-0026.ref = 2.1.2.1
-Types-0026.assertion = It is an error if there are multiple type definitions for each QName.
+Types-1008 = 
+Types-1008.ref = 2.1.2.1
+Types-1008.assertion = It is an error if there are multiple type definitions for each QName.
 
 # ------------SECTION 3: WSDL-related warnings -------------------
 # These warnings were pulled from the WSDL 2.0 spec and are possible warnings

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java?view=diff&rev=546553&r1=546552&r2=546553
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java Tue Jun 12 09:19:17 2007
@@ -266,7 +266,7 @@
                 //that is xs:imported within <wsdl:types> and also xs:imported within by 
                 //an inlined schema within the same <wsdl:types> element.
                 //Error case is result.xsd in the W3C WSDL 2.0 test case SparqlQuerySimplified-1G.
-                //This check may be necessary anyway, because if the document assertion Schema-0018
+                //This check may be necessary anyway, because if the document assertion Schema-1073
                 //is violated, we don't want the duplicate schema components in the component model.
                 //TODO check that this behaviour is correct (eliminating duplicates)
             }
@@ -309,7 +309,7 @@
                 //The Description already contains this Type Definition.
                 continue;
                 //The same comments apply here as stated in the buildElementDeclarations method.
-                //TODO check that this behaviour is correct (per assertion Schema-0018).
+                //TODO check that this behaviour is correct (per assertion Schema-1073).
             }
             QName tdQN = xstQN;
             if(xstQN.getNamespaceURI() == null && schemaTns != null) {

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java?view=diff&rev=546553&r1=546552&r2=546553
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java Tue Jun 12 09:19:17 2007
@@ -76,14 +76,14 @@
    */
   protected void validateInterfaces(Interface[] interfaces, ErrorReporter errorReporter) throws WSDLException
   {
-	testAssertionInterface0030(interfaces, errorReporter);
+	testAssertionInterface1010(interfaces, errorReporter);
 	  
 	int numInterfaces = interfaces.length;
 	for(int i = 0; i < numInterfaces; i++)
 	{
       Interface interfac = interfaces[i];
       
-	  testAssertionInterface0027(interfac, errorReporter);
+	  testAssertionInterface1009(interfac, errorReporter);
 	  
 	  validateInterfaceOperations(interfac, interfac.getInterfaceOperations(), errorReporter);
 	  
@@ -108,7 +108,7 @@
 	{
       InterfaceOperation interfaceOperation = interfaceOperations[j];
 		
-      testAssertionMEP0037(interfaceOperation.getMessageExchangePattern(), errorReporter);
+      testAssertionMEP1022(interfaceOperation.getMessageExchangePattern(), errorReporter);
       testAssertionInterfaceOperation0029(interfaceOperation, interfac, errorReporter);
 		
       validateInterfaceMessageReferences(interfaceOperation.getInterfaceMessageReferences(), errorReporter);
@@ -147,14 +147,14 @@
    */
   protected void validateInterfaceMessageReferences(InterfaceMessageReference[] messageReferences, ErrorReporter errorReporter) throws WSDLException
   {
-    testAssertionInterfaceMessageReference0042(messageReferences, errorReporter);
+    testAssertionInterfaceMessageReference1029(messageReferences, errorReporter);
 		
     int numMessageReferences = messageReferences.length;
     for(int k = 0; k < numMessageReferences; k++)
     {
       InterfaceMessageReference messageReference = messageReferences[k];
 		  
-      testAssertionInterfaceMessageReference0041(messageReference, errorReporter);
+      testAssertionInterfaceMessageReference1028(messageReference, errorReporter);
     }
   }
   
@@ -167,7 +167,7 @@
    */
   protected void validateInterfaceFaultReferences(InterfaceFaultReference[] faultReferences, ErrorReporter errorReporter) throws WSDLException
   {
-	testAssertionInterfaceFaultReference0045(faultReferences, errorReporter);
+	testAssertionInterfaceFaultReference1039(faultReferences, errorReporter);
 		
 //    int numFaultReferences = faultReferences.length;
 //    for(int k = 0; k < numFaultReferences; k++)
@@ -187,15 +187,15 @@
    */
   protected void validateBindings(Binding[] bindings, Description desc, ErrorReporter errorReporter) throws WSDLException
   {
-	  testAssertionBinding0057(bindings, errorReporter);
+	  testAssertionBinding1049(bindings, errorReporter);
 	  
 	  int numBindings = bindings.length;
 	  for(int i = 0; i < numBindings; i++)
 	  {
 		  Binding binding = bindings[i];
-		  testAssertionBinding0054(binding, errorReporter);
-		  testAssertionBinding0055(binding, errorReporter);
-		  testAssertionBinding0056(binding, errorReporter);
+		  testAssertionBinding1044(binding, errorReporter);
+		  testAssertionBinding1045(binding, errorReporter);
+		  testAssertionBinding1048(binding, errorReporter);
 		  
 		  validateBindingOperations(binding.getBindingOperations(), desc, errorReporter);
 		  
@@ -213,7 +213,7 @@
    */
   protected void validateBindingOperations(BindingOperation[] bindingOperations, Description desc, ErrorReporter errorReporter) throws WSDLException
   {
-	  testAssertionBindingOperation0059(bindingOperations, errorReporter);
+	  testAssertionBindingOperation1051(bindingOperations, errorReporter);
 	  
 	  int numBindingOperations = bindingOperations.length;
 	  for(int i = 0; i < numBindingOperations; i++)
@@ -235,7 +235,7 @@
    */
   protected void validateBindingMessageReferences(BindingMessageReference[] bindingMessageReferences, Description desc, ErrorReporter errorReporter) throws WSDLException
   {
-	  testAssertionBindingMessageReference0060(bindingMessageReferences, errorReporter);
+	  testAssertionBindingMessageReference1052(bindingMessageReferences, errorReporter);
 	  
 	  int numBindingMessageReferences = bindingMessageReferences.length;
 	  
@@ -256,13 +256,13 @@
    */
   protected void validateBindingFaultReferences(BindingFaultReference[] bindingFaultReferences, Description desc, ErrorReporter errorReporter) throws WSDLException
   {
-	  testAssertionBindingFaultReference0061(bindingFaultReferences, errorReporter);
+	  testAssertionBindingFaultReference1055(bindingFaultReferences, errorReporter);
 	  
 	  int numBindingFaultReferences = bindingFaultReferences.length;
 	  for(int i = 0; i < numBindingFaultReferences; i++)
 	  {
 		BindingFaultReference bindingFaultReference = bindingFaultReferences[i];
-	    testAssertionBindingFaultReference0062(bindingFaultReference, errorReporter);
+	    testAssertionBindingFaultReference1059(bindingFaultReference, errorReporter);
 	  }
   }
   
@@ -276,7 +276,7 @@
    */
   protected void validateBindingFaults(BindingFault[] bindingFaults, Description desc, ErrorReporter errorReporter) throws WSDLException
   {
-	testAssertionBindingFault0058(bindingFaults, errorReporter);
+	testAssertionBindingFault1050(bindingFaults, errorReporter);
 	
 	int numBindingFaults = bindingFaults.length;
 	
@@ -297,7 +297,7 @@
    */
   protected void validateServices(Service[] services, Description desc, ErrorReporter errorReporter) throws WSDLException
   {
-	  testAssertionService0063(services, errorReporter);
+	  testAssertionService1060(services, errorReporter);
 	  
 	  int numServices = services.length;
 	  for(int i = 0; i < numServices; i++)
@@ -324,13 +324,13 @@
 	  for(int i = 0; i < numEndpoints; i++)
 	  {
 		  Endpoint endpoint = endpoints[i];
-		  testAssertionEndpoint0064(endpoint, errorReporter);
-		  testAssertionEndpoint0066(endpoint, errorReporter);
+		  testAssertionEndpoint1061(endpoint, errorReporter);
+		  testAssertionEndpoint1062(endpoint, errorReporter);
 	  }
   }
   
   /**
-   * Test assertion Interface-0027. An interface cannot appear, either directly or indirectly,
+   * Test assertion Interface-1009. An interface cannot appear, either directly or indirectly,
    * in the list of interfaces it extends.
    * 
    * @param interfac The interface to check.
@@ -338,13 +338,13 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionInterface0027(Interface interfac, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionInterface1009(Interface interfac, ErrorReporter errorReporter) throws WSDLException
   {
 	Interface[] extendedInterfaces = interfac.getExtendedInterfaces();
 	Interface extendedInterface = containsInterface(interfac, extendedInterfaces);
 	if(extendedInterface != null)
 	{
-	  errorReporter.reportError(new ErrorLocatorImpl(), "Interface-0027", new Object[]{extendedInterface.getName()}, ErrorReporter.SEVERITY_ERROR);
+	  errorReporter.reportError(new ErrorLocatorImpl(), "Interface-1009", new Object[]{extendedInterface.getName()}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
 	}
 	return true;
@@ -373,7 +373,7 @@
   }
   
   /**
-   * Test assertion Interface-0030. An interface must have a unique name out of all the interfaces
+   * Test assertion Interface-1010. An interface must have a unique name out of all the interfaces
    * in the description component.
    * 
    * @param interfaces The interfaces in the description component.
@@ -381,7 +381,7 @@
    * @return True if all the interfaces have unique names, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionInterface0030(Interface[] interfaces, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionInterface1010(Interface[] interfaces, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean duplicateFound = false;
 	List names = new ArrayList();
@@ -393,7 +393,7 @@
         continue;
 	  if(names.contains(name))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "Interface-0030", new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "Interface-1010", new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
 		duplicateFound = true;
 	  }
 	  else
@@ -405,18 +405,18 @@
   }
   
   /**
-   * Test assertion MEP-0037. A message exchange pattern must be an absolute IRI.
+   * Test assertion MEP-1022. A message exchange pattern must be an absolute IRI.
    * 
    * @param pattern The message exchange pattern to check.
    * @param errorReporter The error reporter.
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionMEP0037(URI pattern, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionMEP1022(URI pattern, ErrorReporter errorReporter) throws WSDLException
   {
 	if(!pattern.isAbsolute())
 	{
-	  errorReporter.reportError(new ErrorLocatorImpl(), "MEP-0037", new Object[]{pattern}, ErrorReporter.SEVERITY_ERROR);
+	  errorReporter.reportError(new ErrorLocatorImpl(), "MEP-1022", new Object[]{pattern}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
 	}
 	return true;
@@ -525,7 +525,7 @@
   }
   
   /**
-   * Test assertion InterfaceMessageReference-0041. When the {message content model} property 
+   * Test assertion InterfaceMessageReference-1028. When the {message content model} property 
    * has the value #any or #none the {element declaration} property MUST be empty.
    * 
    * @param messageReference The interface message reference to check the message content model and element declarations.
@@ -533,20 +533,20 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionInterfaceMessageReference0041(InterfaceMessageReference messageReference, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionInterfaceMessageReference1028(InterfaceMessageReference messageReference, ErrorReporter errorReporter) throws WSDLException
   {
 	String messContentModel = messageReference.getMessageContentModel();
 	if((messContentModel.equals(Constants.NMTOKEN_ANY) || messContentModel.equals(Constants.NMTOKEN_NONE)) 
 		&& messageReference.getElementDeclaration() != null)
 	{
-	  errorReporter.reportError(new ErrorLocatorImpl(), "InterfaceMessageReference-0041", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
+	  errorReporter.reportError(new ErrorLocatorImpl(), "InterfaceMessageReference-1028", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
 	}
 	return true;
   }
   
   /**
-   * Test assertion InterfaceMessageReference-0042. For each Interface Message Reference 
+   * Test assertion InterfaceMessageReference-1029. For each Interface Message Reference 
    * component in the {interface message references} property of an Interface Operation 
    * component, its {message label} property MUST be unique.
    * 
@@ -555,7 +555,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionInterfaceMessageReference0042(InterfaceMessageReference[] messageReferences, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionInterfaceMessageReference1029(InterfaceMessageReference[] messageReferences, ErrorReporter errorReporter) throws WSDLException
   {
 	List messageLabels = new ArrayList();
 	int numMessageReferences = messageReferences.length;
@@ -566,7 +566,7 @@
           continue;
 	  if(messageLabels.contains(messageLabel))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "InterfaceMessageReference-0042", new Object[]{messageLabel}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "InterfaceMessageReference-1029", new Object[]{messageLabel}, ErrorReporter.SEVERITY_ERROR);
 		return false;
 	  }
 	  else
@@ -578,7 +578,7 @@
   }
   
   /**
-   * Test assertion InterfaceFaultReference-0045. For each Interface Fault Reference 
+   * Test assertion InterfaceFaultReference-1039. For each Interface Fault Reference 
    * component in the {interface fault references} property of an Interface Operation 
    * component, the combination of its {interface fault} and {message label} properties 
    * MUST be unique.
@@ -588,7 +588,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionInterfaceFaultReference0045(InterfaceFaultReference[] faultReferences, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionInterfaceFaultReference1039(InterfaceFaultReference[] faultReferences, ErrorReporter errorReporter) throws WSDLException
   {
 	Hashtable identifiers = new Hashtable();
 	
@@ -602,7 +602,7 @@
 	  List messageLabels = (List)identifiers.get(fault);
 	  if(messageLabels != null && messageLabels.contains(messageLabel))
 	  {
-	    errorReporter.reportError(new ErrorLocatorImpl(), "InterfaceFaultReference-0045", new Object[]{fault, messageLabel}, ErrorReporter.SEVERITY_ERROR);
+	    errorReporter.reportError(new ErrorLocatorImpl(), "InterfaceFaultReference-1039", new Object[]{fault, messageLabel}, ErrorReporter.SEVERITY_ERROR);
 		return false;
       }
 	  else
@@ -617,7 +617,7 @@
   }
   
   /**
-   * Test assertion Binding-0054. If a Binding component specifies any 
+   * Test assertion Binding-1044. If a Binding component specifies any 
    * operation-specific binding details (by including Binding Operation 
    * components) or any fault binding details (by including Binding Fault 
    * components) then it MUST specify an interface the Binding  component 
@@ -628,7 +628,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBinding0054(Binding binding, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBinding1044(Binding binding, ErrorReporter errorReporter) throws WSDLException
   {
 	BindingOperation[] bindingOperations = binding.getBindingOperations();
 	BindingFault[] bindingFaults = binding.getBindingFaults();
@@ -637,14 +637,14 @@
 		(bindingFaults != null && bindingFaults.length > 0)) && 
 		 bindingInterface == null)
 	{
-	  errorReporter.reportError(new ErrorLocatorImpl(), "Binding-0054", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
+	  errorReporter.reportError(new ErrorLocatorImpl(), "Binding-1044", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
 	}
     return true;
   }
   
   /**
-   * Test assertion Binding-0055. A Binding component that defines bindings 
+   * Test assertion Binding-1045. A Binding component that defines bindings 
    * for an Interface component MUST define bindings for all the operations 
    * of that Interface component.
    * 
@@ -653,7 +653,7 @@
    * @return True if the all the operations specified on the interface have bindings defined, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBinding0055(Binding binding, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBinding1045(Binding binding, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean allInterfaceOperationsHaveBinding = true;
     QName bindingQN = binding.getName();
@@ -716,7 +716,7 @@
 	{
 	  if(!usedInterfaceOperations.contains(interfaceOperations[i]))
 	  {
-	    errorReporter.reportError(new ErrorLocatorImpl(), "Binding-0055", new Object[]{bindingName, interfaceOperations[i].getName()}, ErrorReporter.SEVERITY_ERROR);
+	    errorReporter.reportError(new ErrorLocatorImpl(), "Binding-1045", new Object[]{bindingName, interfaceOperations[i].getName()}, ErrorReporter.SEVERITY_ERROR);
 		allInterfaceOperationsHaveBinding = false;
 	  }
     }
@@ -724,7 +724,7 @@
   }
   
   /**
-   * Test assertion Binding-0056. The binding type xs:anyURI MUST be an 
+   * Test assertion Binding-1048. The binding type xs:anyURI MUST be an 
    * absolute IRI as defined by [IETF RFC 3987].
    * 
    * @param binding The binding of which to check the type.
@@ -732,19 +732,19 @@
    * @return True if the type is absolute, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBinding0056(Binding binding, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBinding1048(Binding binding, ErrorReporter errorReporter) throws WSDLException
   {
 	URI type = binding.getType();
     if(type != null && !type.isAbsolute())
     {
-      errorReporter.reportError(new ErrorLocatorImpl(), "Binding-0056", new Object[]{type}, ErrorReporter.SEVERITY_ERROR);
+      errorReporter.reportError(new ErrorLocatorImpl(), "Binding-1048", new Object[]{type}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
     }
     return true;
   }
   
   /**
-   * Test assertion Binding-0057. For each Binding component in the {bindings} property of a 
+   * Test assertion Binding-1049. For each Binding component in the {bindings} property of a 
    * Description component, the {name} property MUST be unique.
    * 
    * @param bindings The bindings in the description component.
@@ -752,7 +752,7 @@
    * @return True if the all the bindings have unique names, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBinding0057(Binding[] bindings, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBinding1049(Binding[] bindings, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean duplicateFound = false;
 	List names = new ArrayList();
@@ -764,7 +764,7 @@
         continue;
 	  if(names.contains(name))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "Binding-0057", new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "Binding-1049", new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
 		duplicateFound = true;
 	  }
 	  else
@@ -776,7 +776,7 @@
   }
   
   /**
-   * Test assertion BindingFault-0058. For each Binding Fault component in the 
+   * Test assertion BindingFault-1050. For each Binding Fault component in the 
    * {binding faults} property of a Binding component, the {interface fault} 
    * property MUST be unique.
    * 
@@ -785,7 +785,7 @@
    * @return True if the all the bindings have unique names, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBindingFault0058(BindingFault[] bindingFaults, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBindingFault1050(BindingFault[] bindingFaults, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean duplicateFound = false;
 	List usedInterfaceFaults = new ArrayList();
@@ -797,7 +797,7 @@
 	    continue;
 	  if(usedInterfaceFaults.contains(interfaceFault))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "BindingFault-0058", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "BindingFault-1050", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
 		duplicateFound = true;
 	  }
 	  else
@@ -809,7 +809,7 @@
   }
   
   /**
-   * Test assertion BindingOperation-0059. For each Binding Operation component 
+   * Test assertion BindingOperation-1051. For each Binding Operation component 
    * in the {binding operations} property of a Binding component, the {interface 
    * operation} property MUST be unique.
    * 
@@ -818,7 +818,7 @@
    * @return True if the all the binding operations have specified unique interface operations, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBindingOperation0059(BindingOperation[] bindingOperations, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBindingOperation1051(BindingOperation[] bindingOperations, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean duplicateFound = false;
 	List specifiedInterfaceOperations = new ArrayList();
@@ -830,7 +830,7 @@
 	    continue;
 	  if(specifiedInterfaceOperations.contains(interfaceOperation))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "BindingOperation-0059", new Object[]{interfaceOperation.getName()}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "BindingOperation-1051", new Object[]{interfaceOperation.getName()}, ErrorReporter.SEVERITY_ERROR);
 		duplicateFound = true;
 	  }
 	  else
@@ -842,7 +842,7 @@
   }
   
   /**
-   * Test assertion BindingMessageReference-0060. For each Binding Message 
+   * Test assertion BindingMessageReference-1052. For each Binding Message 
    * Reference component in the {binding message references} property of a 
    * Binding Operation component, the {interface message reference} property 
    * MUST be unique.
@@ -852,7 +852,7 @@
    * @return True if the all the binding message references have specified unique interface message references, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBindingMessageReference0060(BindingMessageReference[] bindingMessageReferences, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBindingMessageReference1052(BindingMessageReference[] bindingMessageReferences, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean duplicateFound = false;
 	List specifiedInterfaceMessageReferences = new ArrayList();
@@ -864,7 +864,7 @@
 	    continue;
 	  if(specifiedInterfaceMessageReferences.contains(interfaceMessageReference))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "BindingMessageReference-0060", new Object[]{interfaceMessageReference.getMessageLabel()}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "BindingMessageReference-1052", new Object[]{interfaceMessageReference.getMessageLabel()}, ErrorReporter.SEVERITY_ERROR);
 		duplicateFound = true;
 	  }
 	  else
@@ -876,7 +876,7 @@
   }
   
   /**
-   * Test assertion BindingFaultReference-0061. For each Binding Fault Reference 
+   * Test assertion BindingFaultReference-1055. For each Binding Fault Reference 
    * component in the {binding fault references} property of a Binding Operation 
    * component, the {interface fault reference} property MUST be unique.
    * 
@@ -885,7 +885,7 @@
    * @return True if the all the binding fault references have specified unique interface fault references, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBindingFaultReference0061(BindingFaultReference[] bindingFaultReferences, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBindingFaultReference1055(BindingFaultReference[] bindingFaultReferences, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean duplicateFound = false;
 	List specifiedInterfaceFaultReferences = new ArrayList();
@@ -897,7 +897,7 @@
 	    continue;
 	  if(specifiedInterfaceFaultReferences.contains(interfaceFaultReference))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "BindingFaultReference-0061", new Object[]{interfaceFaultReference.getMessageLabel()}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "BindingFaultReference-1055", new Object[]{interfaceFaultReference.getMessageLabel()}, ErrorReporter.SEVERITY_ERROR);
 		duplicateFound = true;
 	  }
 	  else
@@ -909,7 +909,7 @@
   }
   
   /**
-   * Test assertion BindingFaultReference-0062. There MUST be an Interface Fault 
+   * Test assertion BindingFaultReference-1059. There MUST be an Interface Fault 
    * Reference component in the {interface fault references} of the Interface 
    * Operation being bound with {message label} equal to the effective message 
    * label and with {interface fault} equal to an Interface Fault component with 
@@ -920,19 +920,19 @@
    * @return True if the binding fault reference specifies a valid interface fault reference, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionBindingFaultReference0062(BindingFaultReference bindingFaultReference, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionBindingFaultReference1059(BindingFaultReference bindingFaultReference, ErrorReporter errorReporter) throws WSDLException
   {
 	InterfaceFaultReference interfaceFaultReference = bindingFaultReference.getInterfaceFaultReference();
 	if(interfaceFaultReference == null)
 	{
-	  errorReporter.reportError(new ErrorLocatorImpl(), "BindingFaultReference-0062", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
+	  errorReporter.reportError(new ErrorLocatorImpl(), "BindingFaultReference-1059", new Object[]{}, ErrorReporter.SEVERITY_ERROR);
       return false;
 	}
 	return true;
   }
   
   /**
-   * Test assertion Service-0063. For each Service  component in the {services} property 
+   * Test assertion Service-1060. For each Service  component in the {services} property 
    * of a Description component, the {name} property MUST be unique.
    * 
    * @param services An array containing all the services in the description component.
@@ -940,7 +940,7 @@
    * @return True if all services contain unique names, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionService0063(Service[] services, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionService1060(Service[] services, ErrorReporter errorReporter) throws WSDLException
   {
 	List names = new ArrayList();
 	int numServices = services.length;
@@ -951,7 +951,7 @@
         continue;
 	  if(names.contains(name))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "Service-0063", new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "Service-1060", new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
 		return false;
 	  }
 	  else
@@ -995,7 +995,7 @@
   }
   
   /**
-   * Test assertion Endpoint-0064. This xs:anyURI MUST be an absolute IRI as 
+   * Test assertion Endpoint-1061. This xs:anyURI MUST be an absolute IRI as 
    * defined by [IETF RFC 3987]. This xs:anyURI refers to the address IRI.
    * 
    * @param endpoint The endpoint of which the address should be checked.
@@ -1003,19 +1003,19 @@
    * @return True if the address IRI is absolute, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionEndpoint0064(Endpoint endpoint, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionEndpoint1061(Endpoint endpoint, ErrorReporter errorReporter) throws WSDLException
   {
 	URI address = endpoint.getAddress();
     if(address != null && !address.isAbsolute())
     {
-      errorReporter.reportError(new ErrorLocatorImpl(), "Endpoint-0064", new Object[]{address}, ErrorReporter.SEVERITY_ERROR);
+      errorReporter.reportError(new ErrorLocatorImpl(), "Endpoint-1061", new Object[]{address}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
     }
     return true;
   }
   
   /**
-   * Test assertion Endpoint-0066. For each Endpoint component in the {endpoints} property 
+   * Test assertion Endpoint-1062. For each Endpoint component in the {endpoints} property 
    * of a Service component, the {binding} property MUST either be a Binding component with 
    * an unspecified {interface} property or a Binding component with an {interface} property 
    * equal to the {interface} property of the Service component.
@@ -1025,7 +1025,7 @@
    * @return True if the binding specified the interface specified by the service or no interface, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionEndpoint0066(Endpoint endpoint, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionEndpoint1062(Endpoint endpoint, ErrorReporter errorReporter) throws WSDLException
   {
 	Binding binding = endpoint.getBinding();
 	// If no binding has been specified this assertion does not apply.
@@ -1043,7 +1043,7 @@
 	  // If the binding interface is null this assertion passes.
 	  if(serviceInterface != null && bindingInterface != null && !serviceInterface.equals(bindingInterface))
 	  {
-		errorReporter.reportError(new ErrorLocatorImpl(), "Endpoint-0066", new Object[]{binding, bindingInterface, serviceInterface}, ErrorReporter.SEVERITY_ERROR);
+		errorReporter.reportError(new ErrorLocatorImpl(), "Endpoint-1062", new Object[]{binding, bindingInterface, serviceInterface}, ErrorReporter.SEVERITY_ERROR);
 		return false;  
 	  }
 	}

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=546553&r1=546552&r2=546553
==============================================================================
--- 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 Tue Jun 12 09:19:17 2007
@@ -62,7 +62,7 @@
     boolean isValid = true;
     
     // Test the description element.
-    isValid = testAssertionDescription0025(descElement, errorReporter);
+    isValid = testAssertionDescription1006(descElement, errorReporter);
     
     // Test the import elements.
     ImportElement[] imports = descElement.getImportElements();
@@ -117,17 +117,17 @@
 	{
 	  ImportedSchema schema = (ImportedSchema)importedSchemas[i];
 		
-	  if(!testAssertionSchema0017(schema, errorReporter))
+	  if(!testAssertionSchema1069(schema, errorReporter))
 		isValid = false;
 		
-	  if(!testAssertionSchema0052(schema, errorReporter))
+	  if(!testAssertionSchema1070(schema, errorReporter))
 		isValid = false;
 		  
 	}
 	
 	// Test inlined schema assertions.
 	InlinedSchema[] inlinedSchemas = types.getInlinedSchemas();
-	if(!testAssertionSchema0018(inlinedSchemas, errorReporter))
+	if(!testAssertionSchema1073(inlinedSchemas, errorReporter))
 	  isValid = false;
 	return isValid;
   }
@@ -150,7 +150,7 @@
 	{
 	  InterfaceElement interfaceElem = interfaces[i];
 	  
-	  if(!testAssertionInterface0031(interfaceElem, errorReporter))
+	  if(!testAssertionInterface1012(interfaceElem, errorReporter))
 		isValid = false;
 	  
 	  if(!validateInterfaceFaults(descElement, interfaceElem.getInterfaceFaultElements(), errorReporter))
@@ -181,9 +181,8 @@
 	  InterfaceFaultElement faultElement = faultElements[j];
       if(!testAssertionSchema0020b(descElement, faultElement, errorReporter))
 	    isValid = false;
-      //Schema-0016 removed from spec during CR phase
-	  //if(!testAssertionSchema0016(descElement, faultElement.getElementName().getNamespaceURI(), errorReporter))
-	  //  isValid = false;
+	  if(!testAssertionSchema1066(descElement, faultElement.getElementName().getNamespaceURI(), errorReporter))
+	    isValid = false;
 	  }  
 	return isValid;
   }
@@ -231,7 +230,7 @@
 	    isValid = false;
 	      
 	  // Only call the namespace assertion if the referenced element name is not null.
-      //Schema-0016 removed from spec during CR phase
+      //Schema-1066 removed from spec during CR phase
 	  //QName elementName = messageReference.getElementName();
 	  //if(elementName != null)
 	  //{
@@ -243,7 +242,7 @@
   }
   
   /**
-   * Test assertion Description-0025. Tests whether the target namespace
+   * Test assertion Description-1006. Tests whether the target namespace
    * specified is an absolute IRI.
    * 
    * @param descElement The description element for which to check the target namespace.
@@ -251,19 +250,19 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionDescription0025(DescriptionElement descElement, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionDescription1006(DescriptionElement descElement, ErrorReporter errorReporter) throws WSDLException
   {
     URI targetNS = descElement.getTargetNamespace();
     if(!targetNS.isAbsolute())
     {
-      errorReporter.reportError(new ErrorLocatorImpl(), "Description-0025", new Object[]{targetNS}, ErrorReporter.SEVERITY_ERROR);
+      errorReporter.reportError(new ErrorLocatorImpl(), "Description-1006", new Object[]{targetNS}, ErrorReporter.SEVERITY_ERROR);
       return false;
 	}
     return true;
   }
 
   /**
-   * Test assertion Schema-0017. An imported schema must contain a
+   * Test assertion Schema-1069. An imported schema must contain a
    * target namespace.
    * 
    * @param schema The imported schema to check.
@@ -271,7 +270,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionSchema0017(ImportedSchema schema, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionSchema1069(ImportedSchema schema, ErrorReporter errorReporter) throws WSDLException
   {
 	XmlSchema schemaDef = schema.getSchemaDefinition();
 	// The assertion is true if the schema definition is not available.
@@ -283,14 +282,14 @@
 	String targetNS = schemaDef.getTargetNamespace();
 	if(targetNS == null || targetNS.equals(""))
 	{
-	  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-0017", new Object[]{schema.getSchemaLocation()}, ErrorReporter.SEVERITY_ERROR);
+	  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-1069", new Object[]{schema.getSchemaLocation()}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
 	}
 	return true;
   }
   
   /**
-   * Test assertion Schema-0052. An imported schema must specify the
+   * Test assertion Schema-1070. An imported schema must specify the
    * same target namespace as the import element.
    * 
    * @param schema The imported schema to check.
@@ -298,7 +297,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionSchema0052(ImportedSchema schema, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionSchema1070(ImportedSchema schema, ErrorReporter errorReporter) throws WSDLException
   {
 	XmlSchema schemaDef = schema.getSchemaDefinition();
     // The assertion is true if the schema definition is not available.
@@ -311,14 +310,14 @@
 	String specifiedTargetNS = schema.getNamespace().toString();
 	if(specifiedTargetNS != null && !specifiedTargetNS.equals(importedSchemaTargetNS))
 	{
-	  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-0052", new Object[]{specifiedTargetNS}, ErrorReporter.SEVERITY_ERROR);
+	  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-1070", new Object[]{specifiedTargetNS}, ErrorReporter.SEVERITY_ERROR);
 	  return false;
 	}
 	return true;
   }
   
   /**
-   * Test assertion Schema-0018. Inlined XML Schemas must not define
+   * Test assertion Schema-1073. Inlined XML Schemas must not define
    * an element that has already been defined by another inline schema
    * with the same target namespace.
    * 
@@ -327,7 +326,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionSchema0018(InlinedSchema[] schema, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionSchema1073(InlinedSchema[] schema, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean isValid = true;
 	int numInlineSchemas = schema.length;
@@ -355,7 +354,7 @@
 			if(((InlinedSchema)otherInlineSchemas.next()).getSchemaDefinition().getElementByName(elementName) != null)
 			{
 			  // Duplicate element defined.
-			  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-0018", new Object[]{elementName, ns}, ErrorReporter.SEVERITY_ERROR);
+			  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-1073", new Object[]{elementName, ns}, ErrorReporter.SEVERITY_ERROR);
 			  isValid = false;
 			}
 		  }
@@ -373,7 +372,7 @@
 		    if(((InlinedSchema)otherInlineSchemas.next()).getSchemaDefinition().getTypeByName(typeName) != null)
 		    {
 			  // Duplicate type defined.
-			  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-0018b", new Object[]{typeName, ns}, ErrorReporter.SEVERITY_ERROR);
+			  errorReporter.reportError(new ErrorLocatorImpl(), "Schema-1073b", new Object[]{typeName, ns}, ErrorReporter.SEVERITY_ERROR);
 			  isValid = false;
 		    }
 		  }
@@ -396,7 +395,7 @@
   }
   
   /**
-   * Test assertion Interface-0031. All style defaults specified on an interface
+   * Test assertion Interface-1012. All style defaults specified on an interface
    * element must be absolute.
    * 
    * @param interfaceElem The interface element to check the style default list.
@@ -404,7 +403,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionInterface0031(InterfaceElement interfaceElem, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionInterface1012(InterfaceElement interfaceElem, ErrorReporter errorReporter) throws WSDLException
   {
 	boolean isValid = true;
 	
@@ -414,7 +413,7 @@
 	{
 	  if(!styleDefaults[i].isAbsolute())
 	  {
-	    errorReporter.reportError(new ErrorLocatorImpl(), "Interface-0031", new Object[]{styleDefaults[i].toString()}, ErrorReporter.SEVERITY_ERROR);
+	    errorReporter.reportError(new ErrorLocatorImpl(), "Interface-1012", new Object[]{styleDefaults[i].toString()}, ErrorReporter.SEVERITY_ERROR);
 	    isValid = false;
 	  }
 	}
@@ -472,7 +471,7 @@
   }
   
   /**
-   * Test assertion Schema-0016. References to XML schema components must only refer
+   * Test assertion Schema-1066. 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.
    * 
@@ -482,7 +481,7 @@
    * @return True if the assertion passes, false otherwise.
    * @throws WSDLException
    */
-  protected boolean testAssertionSchema0016(DescriptionElement descElement, String namespace, ErrorReporter errorReporter) throws WSDLException
+  protected boolean testAssertionSchema1066(DescriptionElement descElement, String namespace, ErrorReporter errorReporter) throws WSDLException
   {
 	// If the namespace is null it can't be checked.
     if(namespace != null && !namespace.equals(Constants.TYPE_XSD_2001))
@@ -490,7 +489,7 @@
       TypesElement types = descElement.getTypesElement();
       if(types == null)
       {
-    	errorReporter.reportError(new ErrorLocatorImpl(), "Schema-0016", new Object[]{namespace}, ErrorReporter.SEVERITY_ERROR);
+    	errorReporter.reportError(new ErrorLocatorImpl(), "Schema-1066", new Object[]{namespace}, ErrorReporter.SEVERITY_ERROR);
         return false;
       }
       Schema[] schemas = types.getSchemas();
@@ -512,7 +511,7 @@
       }
       if(schemaNotFound)
       {
-        errorReporter.reportError(new ErrorLocatorImpl(), "Schema-0016", new Object[]{namespace}, ErrorReporter.SEVERITY_ERROR);
+        errorReporter.reportError(new ErrorLocatorImpl(), "Schema-1066", new Object[]{namespace}, ErrorReporter.SEVERITY_ERROR);
       	return false;
       } 
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org


Mime
View raw message