From 00a70b98556d00a65667409f6a9bed8e64e6590e Mon Sep 17 00:00:00 2001
From: "vidur%netscape.com"
 <vidur%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 6 Feb 2002 22:09:22 +0000
Subject: [PATCH] Support for both schema namespaces. This is not part of the
 default build.

git-svn-id: svn://10.0.0.236/trunk@113830 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../webservices/wsdl/src/nsWSDLLoader.cpp       | 17 +++++++++++++----
 .../xmlextras/wsdl/src/nsWSDLLoader.cpp         | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
index dac080b8819..5c261ad4a57 100644
--- a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
+++ b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
@@ -382,7 +382,9 @@ nsWSDLLoadRequest::LoadDefinition(const nsAReadableString& aURI)
         }
       }
       else if (IsElementOfNamespace(element,
-                                    NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE))) {
+                             NS_LITERAL_STRING(SCHEMA_2001_NAMESPACE)) ||
+               IsElementOfNamespace(element,
+                             NS_LITERAL_STRING(SCHEMA_1999_NAMESPACE))) {
         nsCOMPtr<nsISchema> schema;
         rv = mSchemaLoader->ProcessSchemaElement(element, 
                                                  getter_AddRefs(schema));
@@ -467,7 +469,9 @@ nsWSDLLoadRequest::HandleEvent(nsIDOMEvent *event)
           }
         }
         else if (IsElementOfNamespace(element,
-                                      NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE))) {
+                                NS_LITERAL_STRING(SCHEMA_2001_NAMESPACE)) ||
+                 IsElementOfNamespace(element,
+                                NS_LITERAL_STRING(SCHEMA_1999_NAMESPACE))) {
           nsCOMPtr<nsISchema> schema;
           rv = mSchemaLoader->ProcessSchemaElement(element, 
                                                    getter_AddRefs(schema));
@@ -679,7 +683,8 @@ nsWSDLLoadRequest::GetSchemaType(const nsAReadableString& aName,
                                  const nsAReadableString& aNamespace,
                                  nsISchemaType** aSchemaComponent)
 {
-  if (aNamespace.Equals(NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE))) {
+  if (aNamespace.Equals(NS_LITERAL_STRING(SCHEMA_2001_NAMESPACE)) ||
+      aNamespace.Equals(NS_LITERAL_STRING(SCHEMA_1999_NAMESPACE))) {
     nsCOMPtr<nsISchemaCollection> collection(do_QueryInterface(mSchemaLoader));
     return collection->GetType(aName, aNamespace, aSchemaComponent);
   }
@@ -822,13 +827,17 @@ nsWSDLLoadRequest::ProcessImportElement(nsIDOMElement* aElement,
   return NS_OK;
 }
 
+static const char* kSchemaNamespaces[] = {SCHEMA_1999_NAMESPACE, 
+                                          SCHEMA_2001_NAMESPACE};
+static PRUint32 kSchemaNamespacesLength = sizeof(kSchemaNamespaces) / sizeof(const char*);
+
 nsresult
 nsWSDLLoadRequest::ProcessTypesElement(nsIDOMElement* aElement)
 {
   nsresult rv = NS_OK;
 
   nsChildElementIterator iterator(aElement, 
-                                  NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE));
+                                  kSchemaNamespaces, kSchemaNamespacesLength);
   nsCOMPtr<nsIDOMElement> childElement;
   nsCOMPtr<nsIAtom> tagName;
   
diff --git a/mozilla/extensions/xmlextras/wsdl/src/nsWSDLLoader.cpp b/mozilla/extensions/xmlextras/wsdl/src/nsWSDLLoader.cpp
index dac080b8819..5c261ad4a57 100644
--- a/mozilla/extensions/xmlextras/wsdl/src/nsWSDLLoader.cpp
+++ b/mozilla/extensions/xmlextras/wsdl/src/nsWSDLLoader.cpp
@@ -382,7 +382,9 @@ nsWSDLLoadRequest::LoadDefinition(const nsAReadableString& aURI)
         }
       }
       else if (IsElementOfNamespace(element,
-                                    NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE))) {
+                             NS_LITERAL_STRING(SCHEMA_2001_NAMESPACE)) ||
+               IsElementOfNamespace(element,
+                             NS_LITERAL_STRING(SCHEMA_1999_NAMESPACE))) {
         nsCOMPtr<nsISchema> schema;
         rv = mSchemaLoader->ProcessSchemaElement(element, 
                                                  getter_AddRefs(schema));
@@ -467,7 +469,9 @@ nsWSDLLoadRequest::HandleEvent(nsIDOMEvent *event)
           }
         }
         else if (IsElementOfNamespace(element,
-                                      NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE))) {
+                                NS_LITERAL_STRING(SCHEMA_2001_NAMESPACE)) ||
+                 IsElementOfNamespace(element,
+                                NS_LITERAL_STRING(SCHEMA_1999_NAMESPACE))) {
           nsCOMPtr<nsISchema> schema;
           rv = mSchemaLoader->ProcessSchemaElement(element, 
                                                    getter_AddRefs(schema));
@@ -679,7 +683,8 @@ nsWSDLLoadRequest::GetSchemaType(const nsAReadableString& aName,
                                  const nsAReadableString& aNamespace,
                                  nsISchemaType** aSchemaComponent)
 {
-  if (aNamespace.Equals(NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE))) {
+  if (aNamespace.Equals(NS_LITERAL_STRING(SCHEMA_2001_NAMESPACE)) ||
+      aNamespace.Equals(NS_LITERAL_STRING(SCHEMA_1999_NAMESPACE))) {
     nsCOMPtr<nsISchemaCollection> collection(do_QueryInterface(mSchemaLoader));
     return collection->GetType(aName, aNamespace, aSchemaComponent);
   }
@@ -822,13 +827,17 @@ nsWSDLLoadRequest::ProcessImportElement(nsIDOMElement* aElement,
   return NS_OK;
 }
 
+static const char* kSchemaNamespaces[] = {SCHEMA_1999_NAMESPACE, 
+                                          SCHEMA_2001_NAMESPACE};
+static PRUint32 kSchemaNamespacesLength = sizeof(kSchemaNamespaces) / sizeof(const char*);
+
 nsresult
 nsWSDLLoadRequest::ProcessTypesElement(nsIDOMElement* aElement)
 {
   nsresult rv = NS_OK;
 
   nsChildElementIterator iterator(aElement, 
-                                  NS_LITERAL_STRING(NS_WSDL_SCHEMA_NAMESPACE));
+                                  kSchemaNamespaces, kSchemaNamespacesLength);
   nsCOMPtr<nsIDOMElement> childElement;
   nsCOMPtr<nsIAtom> tagName;