You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2008/07/09 01:06:17 UTC

svn commit: r675032 - in /ode/branches/APACHE_ODE_1.1/axis2-war/src/test: java/org/apache/ode/axis2/httpbinding/JettyWrapper.java resources/TestHttpBinding/Arithmetics.wsdl resources/TestHttpBinding/http-binding-test.bpel

Author: midon
Date: Tue Jul  8 16:06:17 2008
New Revision: 675032

URL: http://svn.apache.org/viewvc?rev=675032&view=rev
Log:
complex types not supported, use elements instead

Modified:
    ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/JettyWrapper.java
    ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl
    ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/http-binding-test.bpel

Modified: ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/JettyWrapper.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/JettyWrapper.java?rev=675032&r1=675031&r2=675032&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/JettyWrapper.java (original)
+++ ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/JettyWrapper.java Tue Jul  8 16:06:17 2008
@@ -202,15 +202,15 @@
                             Document bodyDoc = parseBody(request.getInputStream(), response);
                             if (bodyDoc != null) {
                                 Element firstOperand = DOMUtils.getFirstChildElement(bodyDoc.getDocumentElement());
-                                Element secondElement = DOMUtils.getNextSiblingElement(firstOperand);
+                                Element secondOperand = DOMUtils.getNextSiblingElement(firstOperand);
                                 int left = Integer.valueOf(DOMUtils.getTextContent(firstOperand));
-                                int right = Integer.valueOf(DOMUtils.getTextContent(secondElement));
+                                int right = Integer.valueOf(DOMUtils.getTextContent(secondOperand));
 
                                 int min = Math.min(left,right);
                                 int max = Math.max(left,right);
 //                                Element arrayElt = bodyDoc.createElement("sumOfInteger");
                                 Element anElt = bodyDoc.createElementNS("http://ode/bpel/test/arithmetics", "sumOfInteger");
-                                Element msg = bodyDoc.createElement("msg");
+                                Element msg = bodyDoc.createElement("theresult");
                                 Element resultIs = bodyDoc.createElement("resultIs");
                                 msg.setTextContent("A dummy message we don't care about. Only purpose is to have a complex type");
                                 resultIs.setTextContent(String.valueOf((max*(max+1)-min*(min+1))/2));
@@ -292,7 +292,7 @@
 
 
         private void doPut(HttpServletRequest request, HttpServletResponse response, String articleId) throws IOException {
-            String faultType = request.getHeader("Fault-Type");
+            String faultType = request.getHeader("Fault-Type")!=null?request.getHeader("Fault-Type"):"";
             if (faultType.startsWith("500_no_body")) {
                 response.setStatus(500);
             } else if (faultType.startsWith("500_text_body")) {

Modified: ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl?rev=675032&r1=675031&r2=675032&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl (original)
+++ ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl Tue Jul  8 16:06:17 2008
@@ -65,7 +65,7 @@
         <wsdl:part name="result" element="tns:theresult"/>
     </wsdl:message>
     <wsdl:message name="sumOfIntegersRequest">
-        <wsdl:part name="range" type="tns:operandListType"/>
+        <wsdl:part name="range" element="tns:operandList"/>
     </wsdl:message>
     <wsdl:message name="sumOfIntegersResponse">
         <wsdl:part name="result" type="tns:resultType"/>

Modified: ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/http-binding-test.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/http-binding-test.bpel?rev=675032&r1=675031&r2=675032&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/http-binding-test.bpel (original)
+++ ode/branches/APACHE_ODE_1.1/axis2-war/src/test/resources/TestHttpBinding/http-binding-test.bpel Tue Jul  8 16:06:17 2008
@@ -214,10 +214,10 @@
             <copy>
                 <from>
                     <literal>
-                        <dummy:myList>
+                        <dummy:operandList>
                             <dummy:operand>0</dummy:operand>
                             <dummy:operand></dummy:operand>
-                        </dummy:myList>
+                        </dummy:operandList>
                     </literal>
                 </from>
                 <to>$sumOfIntegersInput.range</to>