svn commit: r499302 - in /webservices/synapse/trunk/java/modules/core/src: main/java/org/apache/synapse/config/xml/ test/java/org/apache/synapse/config/xml/

[ruwan]

Author: ruwan
Date: Tue Jan 23 23:59:21 2007
New Revision: 499302

URL: http://svn.apache.org/viewvc?view=rev&rev=499302
Log:
fixing bug in jira SYNAPSE-53

Modified:
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java
    
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/FaultMediatorSerializationTest.java

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java?view=diff&rev=499302&r1=499301&r2=499302
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
 Tue Jan 23 23:59:21 2007
@@ -99,7 +99,7 @@
                     throw new SynapseException(msg);
                 }
                 faultMediator.setFaultCodeValue(
-                    new QName(OMElementUtils.getNameSpaceWithPrefix(prefix, 
code), name));
+                    new QName(OMElementUtils.getNameSpaceWithPrefix(prefix, 
code), name, prefix));
                 
             } else if (expression != null) {
                 try {

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java?view=diff&rev=499302&r1=499301&r2=499302
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
 Tue Jan 23 23:59:21 2007
@@ -26,6 +26,8 @@
 import org.apache.synapse.Mediator;
 import org.apache.synapse.mediators.transform.FaultMediator;
 
+import javax.xml.namespace.QName;
+
 /**
  * <pre>
  * &lt;makefault [version="soap11|soap12"]&gt;
@@ -67,7 +69,10 @@
         OMElement code = fac.createOMElement("code", synNS, fault);
         if (mediator.getFaultCodeValue() != null) {
             code.addAttribute(fac.createOMAttribute(
-                "value", nullNS, mediator.getFaultCodeValue().toString()));
+                "value", nullNS, mediator.getFaultCodeValue().getPrefix() + ":"
+                    + mediator.getFaultCodeValue().getLocalPart()));
+            
code.declareNamespace(mediator.getFaultCodeValue().getNamespaceURI(),
+                    mediator.getFaultCodeValue().getPrefix());
 
         } else if (mediator.getFaultCodeExpr() != null) {
             code.addAttribute(fac.createOMAttribute(

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java?view=diff&rev=499302&r1=499301&r2=499302
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java
 Tue Jan 23 23:59:21 2007
@@ -52,7 +52,7 @@
         while (iter.hasNext()) {
             OMNamespace ns = (OMNamespace) iter.next();
             if (prefix.equals(ns.getPrefix())) {
-                return ns.getName();
+                return ns.getNamespaceURI();     
             }
         }
         return null;

Modified: 
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/FaultMediatorSerializationTest.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/FaultMediatorSerializationTest.java?view=diff&rev=499302&r1=499301&r2=499302
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/FaultMediatorSerializationTest.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/FaultMediatorSerializationTest.java
 Tue Jan 23 23:59:21 2007
@@ -35,7 +35,7 @@
     }
 
     public void testFaultMediatorSerializationSOAP11() throws Exception {
-        String inputXml = getXmlOfMediatorForSOAP11(SOAP11, "syn:Client", 
"reason", EMPTY, EMPTY);
+        String inputXml = getXmlOfMediatorForSOAP11(SOAP11, "ns2:Client", 
"reason", EMPTY, EMPTY);
         assertTrue(serialization(inputXml, faultMediatorFactory, 
faultMediatorSerializer));
         assertTrue(serialization(inputXml, faultMediatorSerializer));
     }
@@ -48,7 +48,7 @@
 
     private String getXmlOfMediatorForSOAP11(String version, String 
attrOfCode, String attrOfReasion
             , String role, String details) throws Exception {
-        return "<makefault  version=\"" + version + "\" 
xmlns=\"http://ws.apache.org/ns/synapse\";><code value=\"" + attrOfCode + "\" 
xmlns:syn=\"http://ws.apache.org/ns/synapse\"/><reason value=\"" + 
attrOfReasion + "\"/>" +
+        return "<makefault  version=\"" + version + "\" 
xmlns=\"http://ws.apache.org/ns/synapse\";><code value=\"" + attrOfCode + "\" 
xmlns:ns2=\"http://ws.apache.org/ns/synapse\"/><reason value=\"" + 
attrOfReasion + "\"/>" +
                 "<role>" + role + "</role><detail>" + details + 
"</detail></makefault>";
 
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]