Author: ffang
Date: Sat Sep 25 10:07:30 2010
New Revision: 1001183
URL: http://svn.apache.org/viewvc?rev=1001183&view=rev
Log:
[SMXCOMP-808]Duplicate declaration for namespace prefix 'xsd' and xsi if have
xsd/xsi in soap env
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/StaxJbiWrapper.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/HelloWorld-DOC-Input-extra-namespace.xml
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/StaxJbiWrapper.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/StaxJbiWrapper.java?rev=1001183&r1=1001182&r2=1001183&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/StaxJbiWrapper.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/StaxJbiWrapper.java
Sat Sep 25 10:07:30 2010
@@ -116,7 +116,9 @@ public class StaxJbiWrapper implements X
&& !node.getNodeValue().equals(Soap12.SOAP_NAMESPACE))
{
//set extra prefix
nsMap.put(node.getLocalName(), node.getNodeValue());
- extraPrefixes.add(new QName(node.getNodeValue(), "",
node.getLocalName()));
+ if
(!node.getNodeValue().equals(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI)
+ &&
!node.getNodeValue().equals(XMLConstants.W3C_XML_SCHEMA_NS_URI))
+ extraPrefixes.add(new QName(node.getNodeValue(), "",
node.getLocalName()));
}
}
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/HelloWorld-DOC-Input-extra-namespace.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/HelloWorld-DOC-Input-extra-namespace.xml?rev=1001183&r1=1001182&r2=1001183&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/HelloWorld-DOC-Input-extra-namespace.xml
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/HelloWorld-DOC-Input-extra-namespace.xml
Sat Sep 25 10:07:30 2010
@@ -17,4 +17,5 @@
limitations under the License.
-->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:ns2="uri:HelloWorld"><soap:Body><ns2:SayHiRequest><text>hello</text></ns2:SayHiRequest></soap:Body></soap:Envelope>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:ns2="uri:HelloWorld"><soap:Body><ns2:SayHiRequest><text>hello</text></ns2:SayHiRequest></soap:Body></soap:Envelope>
