You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/08 18:22:50 UTC
svn commit: r516107 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Author: dims
Date: Thu Mar 8 09:22:49 2007
New Revision: 516107
URL: http://svn.apache.org/viewvc?view=rev&rev=516107
Log:
- Fix typo in method name
- Make sure that the namespace is set correctly when the type has a prefix not specified at the top schema element
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=516107&r1=516106&r2=516107
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Thu Mar 8 09:22:49 2007
@@ -1341,7 +1341,7 @@
} else {
// i.e this element namespace has not found yet so
// we have to create new schema for it
- Element newSchema = createNewSchemaWithElemet(elementDeclaration,
+ Element newSchema = createNewSchemaWithElement(elementDeclaration,
namespacePrefixMap,
namespaceImportsMap,
namespaceToUse,
@@ -1438,7 +1438,7 @@
} else {
// i.e this element namespace has not found yet so
// we have to create new schema for it
- Element newSchema = createNewSchemaWithElemet(elementDeclaration,
+ Element newSchema = createNewSchemaWithElement(elementDeclaration,
namespacePrefixMap,
namespaceImportsMap,
namespaceToUse,
@@ -1492,7 +1492,7 @@
}
- private Element createNewSchemaWithElemet(Element newElement,
+ private Element createNewSchemaWithElement(Element newElement,
Map namespacePrefixMap,
Map namespaceImportsMap,
String targetNamespace,
@@ -1678,10 +1678,10 @@
// A prefix must be found at this point!
String existingURL = schemaElement.getAttributeNS(XML_NAMESPACE_URI,
NAMESPACE_DECLARATION_PREFIX + prefix);
- if (existingURL == null) {
+ if (existingURL == null || existingURL.length()==0) {
// there is no existing URL by that prefix - declare a new namespace
- schemaElement.setAttributeNS(XML_NAMESPACE_URI,
- NAMESPACE_DECLARATION_PREFIX + prefix, namespace);
+ schemaElement.setAttributeNS(XML_NAMESPACE_URI,
+ NAMESPACE_DECLARATION_PREFIX + prefix, namespace);
} else if (existingURL.equals(namespace)) {
// this namespace declaration is already there with the same prefix
// ignore it
@@ -1697,7 +1697,7 @@
schemaElement.setAttributeNS(XML_NAMESPACE_URI,
NAMESPACE_DECLARATION_PREFIX + generatedPrefix, namespace);
// add to the map
- prefixMap.put(generatedPrefix, namespace);
+ prefixMap.put(namespace, generatedPrefix);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org