svn commit: r661153 - in /ode/branches/APACHE_ODE_1.1: axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java

[mriou]

Author: mriou
Date: Wed May 28 16:55:25 2008
New Revision: 661153

URL: http://svn.apache.org/viewvc?rev=661153&view=rev
Log:
Sanitizing Axiom namespace prefixes creation.

Modified:
    
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
    
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java

Modified: 
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java?rev=661153&r1=661152&r2=661153&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
 Wed May 28 16:55:25 2008
@@ -334,7 +334,8 @@
     @SuppressWarnings("unchecked")
     public void createSoapBody(org.apache.axiom.soap.SOAPBody sb, SOAPBody 
soapBody, Message msgDef,
                                Element message, String rpcWrapper) throws 
AxisFault {
-        OMElement partHolder = _isRPC ? _soapFactory.createOMElement(new 
QName(soapBody.getNamespaceURI(),rpcWrapper), sb) : sb;
+        OMElement partHolder = _isRPC ? _soapFactory
+                .createOMElement(new QName(soapBody.getNamespaceURI(), 
rpcWrapper, "odens"), sb) : sb;
 
         List<Part> parts = msgDef.getOrderedParts(soapBody.getParts());
         for (Part part : parts) {

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java?rev=661153&r1=661152&r2=661153&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
 Wed May 28 16:55:25 2008
@@ -134,12 +134,13 @@
     }
 
     public static OMElement toOM(Element src, OMFactory omf, OMContainer 
parent) {
-        OMNamespace elns = null;
+        OMElement omElement = parent == null ? 
omf.createOMElement(src.getLocalName(), null) :
+                omf.createOMElement(src.getLocalName(), null, parent);
         if (src.getNamespaceURI() != null) {
-            elns = omf.createOMNamespace(src.getNamespaceURI(), 
src.getPrefix());
+            if (src.getPrefix() != null)
+                
omElement.setNamespace(omf.createOMNamespace(src.getNamespaceURI(), 
src.getPrefix()));
+            else omElement.declareDefaultNamespace(src.getNamespaceURI());
         }
-        OMElement omElement = parent == null ? 
omf.createOMElement(src.getLocalName(),elns) :
-        omf.createOMElement(src.getLocalName(),elns,parent);
         
         if (parent == null) {
             NSContext nscontext = DOMUtils.getMyNSContext(src);