cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap WSIFOperation_ApacheSOAP.java

[owenb]

owenb       2002/12/16 07:45:50

  Modified:    java/src/org/apache/wsif/providers/soap/apachesoap
                        WSIFOperation_ApacheSOAP.java
  Log:
  When mapping types in prepare() and mapSubtypes(), use the inputUse or outputUse 
values to determine whether or not to use "literal" for the encoding.
  
  Revision  Changes    Path
  1.34      +8 -7      
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java
  
  Index: WSIFOperation_ApacheSOAP.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- WSIFOperation_ApacheSOAP.java     7 Dec 2002 12:33:59 -0000       1.33
  +++ WSIFOperation_ApacheSOAP.java     16 Dec 2002 15:45:50 -0000      1.34
  @@ -341,7 +341,7 @@
                                                   .getContextClassLoader());
                                   }
                                   types[i] = inputClass;
  -                                if (inputEncodingStyle.equals("literal")) {
  +                                if ("literal".equals(inputUse)) {
                                        smr.mapTypes("literal", qname, inputClass, 
partSer, partSer);
                                   } else {
                                   smr.mapTypes(
  @@ -351,7 +351,7 @@
                                       beanSer,
                                       beanSer);
                                   } 
  -                                mapSubtypes(inputClass, beanSer, partSer, smr);
  +                                mapSubtypes(inputClass, beanSer, partSer, smr, 
inputUse);
                               } catch (ClassNotFoundException exn1) {
                                Trc.ignoredException(exn1);
                               }
  @@ -437,7 +437,7 @@
                                                   .currentThread()
                                                   .getContextClassLoader());
                                   }
  -                                if (inputEncodingStyle.equals("literal")) {
  +                                if ("literal".equals(outputUse)) {
                                       smr.mapTypes(
                                           "literal",
                                           qname,
  @@ -452,7 +452,7 @@
                                           beanSer,
                                           beanSer);
                                   }
  -                                mapSubtypes(returnType, beanSer, partSer, smr);
  +                                mapSubtypes(returnType, beanSer, partSer, smr, 
outputUse);
                               } catch (ClassNotFoundException exn1) {
                                   Trc.ignoredException(exn1);
                               }
  @@ -479,7 +479,8 @@
           Class javaType,
           BeanSerializer beanSer,
           PartSerializer partSer,
  -        SOAPMappingRegistry smr) {
  +        SOAPMappingRegistry smr,
  +        String use) {
   
           BeanInfo beanInfo = null;
           try {
  @@ -513,7 +514,7 @@
                                           packageName),
                                       className);
   
  -                            if (inputEncodingStyle.equals("literal")) {
  +                            if ("literal".equals(use)) {
                                   smr.mapTypes(
                                       "literal",
                                       qname,
  @@ -528,7 +529,7 @@
                                       beanSer,
                                       beanSer);
                               }
  -                            mapSubtypes(propType, beanSer, partSer, smr);
  +                            mapSubtypes(propType, beanSer, partSer, smr, use);
                           }
                       }
                   }