Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for both schema namespaces. This is not part of the default build.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@113830 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
vidur%netscape.com 2002-02-06 22:09:22 +00:00
parent e0dcd8874f
commit 00a70b9855
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
View File

@ -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;

17
mozilla/extensions/xmlextras/wsdl/src/nsWSDLLoader.cpp
View File

@ -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;