axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r331944 - in /webservices/axis2/trunk/java/modules: saaj/test-resources/soap/ xml/src/org/apache/axis2/om/impl/llom/ xml/src/org/apache/axis2/soap/impl/llom/builder/ xml/test-resources/soap/ xml/test/org/apache/axis2/om/ xml/test/org/apache...
Date Wed, 09 Nov 2005 04:16:37 GMT
Author: chinthaka
Date: Tue Nov  8 20:16:09 2005
New Revision: 331944

URL: http://svn.apache.org/viewcvs?rev=331944&view=rev
Log:
Trying to fix the build. Fixed most of the test case but still two more test cases are failing.
Its due to the recent dafault namespace changes. Please give us some more time to figure it
out.

Modified:
    webservices/axis2/trunk/java/modules/saaj/test-resources/soap/soap12message.xml
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
    webservices/axis2/trunk/java/modules/xml/test-resources/soap/soap12message.xml
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultSubCodeTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultValueTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java

Modified: webservices/axis2/trunk/java/modules/saaj/test-resources/soap/soap12message.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test-resources/soap/soap12message.xml?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test-resources/soap/soap12message.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/test-resources/soap/soap12message.xml Tue Nov
 8 20:16:09 2005
@@ -23,15 +23,15 @@
         <env:Fault>
             <env:Code>
                 <env:Value>env:Sender</env:Value>
-                <env:SubCode>
-                    <env:Value>m:MessageTimeout In First SubCode</env:Value>
-                    <env:SubCode>
-                        <env:Value>m:MessageTimeout In Second SubCode</env:Value>
-                        <env:SubCode>
-                            <env:Value>m:MessageTimeout In Third SubCode</env:Value>
-                        </env:SubCode>
-                    </env:SubCode>
-                </env:SubCode>
+                <env:Subcode>
+                    <env:Value>m:MessageTimeout In First Subcode</env:Value>
+                    <env:Subcode>
+                        <env:Value>m:MessageTimeout In Second Subcode</env:Value>
+                        <env:Subcode>
+                            <env:Value>m:MessageTimeout In Third Subcode</env:Value>
+                        </env:Subcode>
+                    </env:Subcode>
+                </env:Subcode>
             </env:Code>
             <env:Reason>
                 <env:Text xml:lang="en">Sender Timeout</env:Text>

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
Tue Nov  8 20:16:09 2005
@@ -17,7 +17,6 @@
 package org.apache.axis2.om.impl.llom;
 
 import org.apache.axis2.om.*;
-import org.apache.axis2.om.util.ElementHelper;
 import org.apache.axis2.om.impl.OMContainerEx;
 import org.apache.axis2.om.impl.OMNodeEx;
 import org.apache.axis2.om.impl.OMOutputImpl;
@@ -25,6 +24,7 @@
 import org.apache.axis2.om.impl.llom.traverse.OMChildrenIterator;
 import org.apache.axis2.om.impl.llom.traverse.OMChildrenQNameIterator;
 import org.apache.axis2.om.impl.llom.util.EmptyIterator;
+import org.apache.axis2.om.util.ElementHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -319,12 +319,9 @@
             }
         }
 
-        if (namespace == null && uri != null && prefix != null
-                && prefix.equals(OMConstants.XMLNS_PREFIX)
-                && uri.equals(OMConstants.XMLNS_URI)) {
-            declareNamespace(OMConstants.XMLNS_URI, OMConstants.XMLNS_PREFIX);
-            namespace = findNamespace(uri, prefix);
-        }
+//        if (namespace == null && uri != null && prefix != null) {
+//            namespace = declareNamespace(uri, prefix);
+//        }
         return namespace;
     }
 

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
Tue Nov  8 20:16:09 2005
@@ -24,15 +24,7 @@
 import org.apache.axis2.om.OMNode;
 import org.apache.axis2.om.impl.OMNodeEx;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPConstants;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPMessage;
-import org.apache.axis2.soap.SOAPProcessingException;
+import org.apache.axis2.soap.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -392,6 +384,9 @@
                 }
             } else {
                 namespace = node.findNamespace(namespaceURI, prefix);
+                if(namespace == null){
+                    namespace = node.declareNamespace(namespaceURI, prefix);
+                }
             }
             node.setNamespace(namespace);
         }

Modified: webservices/axis2/trunk/java/modules/xml/test-resources/soap/soap12message.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test-resources/soap/soap12message.xml?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test-resources/soap/soap12message.xml (original)
+++ webservices/axis2/trunk/java/modules/xml/test-resources/soap/soap12message.xml Tue Nov
 8 20:16:09 2005
@@ -23,15 +23,15 @@
         <env:Fault>
             <env:Code>
                 <env:Value>env:Sender</env:Value>
-                <env:SubCode>
-                    <env:Value>m:MessageTimeout In First SubCode</env:Value>
-                    <env:SubCode>
-                        <env:Value>m:MessageTimeout In Second SubCode</env:Value>
-                        <env:SubCode>
-                            <env:Value>m:MessageTimeout In Third SubCode</env:Value>
-                        </env:SubCode>
-                    </env:SubCode>
-                </env:SubCode>
+                <env:Subcode>
+                    <env:Value>m:MessageTimeout In First Subcode</env:Value>
+                    <env:Subcode>
+                        <env:Value>m:MessageTimeout In Second Subcode</env:Value>
+                        <env:Subcode>
+                            <env:Value>m:MessageTimeout In Third Subcode</env:Value>
+                        </env:Subcode>
+                    </env:Subcode>
+                </env:Subcode>
             </env:Code>
             <env:Reason>
                 <env:Text xml:lang="en">Sender Timeout</env:Text>

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java
Tue Nov  8 20:16:09 2005
@@ -41,6 +41,7 @@
             for (int i = 0; i < files.length; i++) {
 //                System.out.println("Processing files:" + files[i].getAbsolutePath());
                 if (files[i].isFile() && files[i].getName().endsWith(".xml") &&
!files[i].getName().startsWith("wrong")) {
+
                     SOAPEnvelope soapEnvelope = (SOAPEnvelope) OMTestUtils.getOMBuilder(
                             files[i])
                             .getDocumentElement();

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultSubCodeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultSubCodeTest.java?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultSubCodeTest.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultSubCodeTest.java
Tue Nov  8 20:16:09 2005
@@ -142,7 +142,7 @@
         assertTrue(
                 "SOAP 1.2 SOAPFaultSubCode Test In FaultCode With Parser : - Value text mismatch",
                 soap12FaultSubCodeInFaultCodeWithParser.getValue().getText()
-                .equals("m:MessageTimeout In First SubCode"));
+                .equals("m:MessageTimeout In First Subcode"));
     }
 
     public void testGetSubCodeInFaultCodeWithParser() {
@@ -164,7 +164,7 @@
         assertTrue(
                 "SOAP 1.2 SOAPFaultSubCode Test In FaultSubCode With Parser : - Value text
mismatch",
                 soap12FaultSubCodeInSubCodeWithParser.getValue().getText()
-                .equals("m:MessageTimeout In Second SubCode"));
+                .equals("m:MessageTimeout In Second Subcode"));
     }
 
     public void testGetSubCodeInFaultSubCodeWithParser() {

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultValueTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultValueTest.java?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultValueTest.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultValueTest.java
Tue Nov  8 20:16:09 2005
@@ -113,6 +113,6 @@
         assertTrue(
                 "SOAP 1.2 Fault Value Test with parser in Fault SubCode : - value text mismatch",
                 soap12FaultValueInFaultSubCodeWithParser.getText().equals(
-                        "m:MessageTimeout In First SubCode"));
+                        "m:MessageTimeout In First Subcode"));
     }
 }

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java
Tue Nov  8 20:16:09 2005
@@ -53,7 +53,7 @@
                         "http://testing.axis2.org", "axis2");
         firstElement = factory.createOMElement("FirstElement", testingNamespace);
         secondElement = factory.createOMElement("SecondElement", factory.createOMNamespace(
-                                "http://testing.axis2.org", "axis2"), firstElement);
+                                "http://moretesting.axis2.org", "axis2"), firstElement);
     }
 
     public void testGetText() {

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java?rev=331944&r1=331943&r2=331944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java
Tue Nov  8 20:16:09 2005
@@ -1,35 +1,18 @@
 package org.apache.axis2.soap.impl.llom.builder;
 
+import junit.framework.TestCase;
 import org.apache.axis2.om.OMAttribute;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMXMLParserWrapper;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPConstants;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFault;
-import org.apache.axis2.soap.SOAPFaultCode;
-import org.apache.axis2.soap.SOAPFaultDetail;
-import org.apache.axis2.soap.SOAPFaultNode;
-import org.apache.axis2.soap.SOAPFaultReason;
-import org.apache.axis2.soap.SOAPFaultRole;
-import org.apache.axis2.soap.SOAPFaultSubCode;
-import org.apache.axis2.soap.SOAPFaultText;
-import org.apache.axis2.soap.SOAPFaultValue;
-import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPHeaderBlock;
+import org.apache.axis2.soap.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.StringReader;
-import java.util.Iterator;
-
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
+import java.io.StringReader;
+import java.util.Iterator;
 
 public class StAXSOAPModelBuilderTest extends TestCase {
 
@@ -52,12 +35,12 @@
                 "       <env:Fault>\n" +
                 "           <env:Code>\n" +
                 "               <env:Value>env:Sender</env:Value>\n" +
-                "               <env:SubCode>\n" +
+                "               <env:Subcode>\n" +
                 "                   <env:Value>m:MessageTimeout</env:Value>\n"
+
-                "                   <env:SubCode>\n" +
+                "                   <env:Subcode>\n" +
                 "                       <env:Value>m:MessageTimeout</env:Value>\n"
+
-                "                   </env:SubCode>\n" +
-                "               </env:SubCode>\n" +
+                "                   </env:Subcode>\n" +
+                "               </env:Subcode>\n" +
                 "           </env:Code>\n" +
                 "           <env:Reason>\n" +
                 "               <env:Text>Sender Timeout</env:Text>\n" +



Mime
View raw message