cvs commit: xml-axis-wsif/java/test/docStyle NWBankTest.java

[antelder]

antelder    2003/01/22 08:39:08

  Modified:    java/src/org/apache/wsif/providers/soap/apacheaxis
                        WSIFOperation_ApacheAxis.java
               java/test/docStyle NWBankTest.java
  Log:
  Fix bugzilla 16334 - change the AXIS provider to correctly work out that a 
non-wrapped document style service is not wrapped
  
  Revision  Changes    Path
  1.69      +2 -0      
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
  
  Index: WSIFOperation_ApacheAxis.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- WSIFOperation_ApacheAxis.java     21 Jan 2003 17:34:09 -0000      1.68
  +++ WSIFOperation_ApacheAxis.java     22 Jan 2003 16:39:08 -0000      1.69
  @@ -1474,6 +1474,8 @@
                                        unWrapped = false;
                                }
                        }
  +        } else {
  +             unWrapped = false;
                }
   
                return unWrapped;
  
  
  
  1.7       +11 -2     xml-axis-wsif/java/test/docStyle/NWBankTest.java
  
  Index: NWBankTest.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/docStyle/NWBankTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NWBankTest.java   13 Dec 2002 12:17:52 -0000      1.6
  +++ NWBankTest.java   22 Jan 2003 16:39:08 -0000      1.7
  @@ -67,6 +67,7 @@
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
  +import org.apache.wsif.WSIFConstants;
   import org.apache.wsif.WSIFMessage;
   import org.apache.wsif.WSIFOperation;
   import org.apache.wsif.WSIFPort;
  @@ -76,8 +77,6 @@
   import org.apache.xml.serialize.OutputFormat;
   import org.apache.xml.serialize.XMLSerializer;
   import org.w3c.dom.Element;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NodeList;
   import org.xml.sax.InputSource;
   import util.TestUtilities;
   
  @@ -164,6 +163,11 @@
                  new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", 
"currency"),
                  Currency.class);
   
  +            // force to use a 'wrapped' type operation
  +            WSIFMessage context = service.getContext();
  +            context.setObjectPart(WSIFConstants.CONTEXT_OPERATION_STYLE, 
WSIFConstants.CONTEXT_OPERATION_STYLE_WRAPPED);
  +            service.setContext(context);
  +
                        WSIFPort port = service.getPort(portName);
   
                        WSIFOperation operation = port.createOperation("GetRatesXML");
  @@ -212,6 +216,11 @@
                                        null,
                                        "http/www.pointwsp.net/ws/finance",
                                        "pwspNoCentrbankCurRatesSoap");
  +
  +            // force to use a 'wrapped' type operation
  +            WSIFMessage context = service.getContext();
  +            context.setObjectPart(WSIFConstants.CONTEXT_OPERATION_STYLE, 
WSIFConstants.CONTEXT_OPERATION_STYLE_WRAPPED);
  +            service.setContext(context);
   
               PwspNoCentrbankCurRatesSoap stub = (PwspNoCentrbankCurRatesSoap) 
service.getStub(portName, PwspNoCentrbankCurRatesSoap.class);