axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis Constants.java
Date Wed, 16 Oct 2002 16:36:41 GMT
gdaniels    2002/10/16 09:36:41

  Modified:    java/src/org/apache/axis/message SOAPHeader.java
                        SOAPEnvelope.java
               java/src/org/apache/axis Constants.java
  Log:
  Enable SOAP 1.2 ultimateReceiver role
  
  Revision  Changes    Path
  1.63      +7 -1      xml-axis/java/src/org/apache/axis/message/SOAPHeader.java
  
  Index: SOAPHeader.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- SOAPHeader.java	16 Oct 2002 15:03:04 -0000	1.62
  +++ SOAPHeader.java	16 Oct 2002 16:36:41 -0000	1.63
  @@ -169,12 +169,18 @@
       Vector getHeadersByActor(ArrayList actors) {
           Vector results = new Vector();
           Iterator i = headers.iterator();
  -        String nextActor = getEnvelope().getSOAPConstants().getNextRoleURI();
  +        SOAPConstants soapVer = getEnvelope().getSOAPConstants();
  +        boolean isSOAP12 = soapVer == SOAPConstants.SOAP12_CONSTANTS;
  +        String nextActor = soapVer.getNextRoleURI();
           while (i.hasNext()) {
               SOAPHeaderElement header = (SOAPHeaderElement)i.next();
               
               // Always process NEXT's, and then anything else in our list
  +            // For now, also always process ultimateReceiver role if SOAP 1.2
               if (nextActor.equals(header.getActor()) ||
  +                (isSOAP12 && 
  +                    Constants.URI_SOAP12_ULTIMATE_ROLE.equals(
  +                                                        header.getActor())) ||
                   (actors != null && actors.contains(header.getActor()))) {
                   results.add(header);
               }
  
  
  
  1.82      +0 -1      xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java
  
  Index: SOAPEnvelope.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- SOAPEnvelope.java	15 Oct 2002 21:15:42 -0000	1.81
  +++ SOAPEnvelope.java	16 Oct 2002 16:36:41 -0000	1.82
  @@ -64,7 +64,6 @@
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.DeserializationContextImpl;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.Mapping;
   import org.apache.axis.utils.Messages;
   
  
  
  
  1.93      +6 -1      xml-axis/java/src/org/apache/axis/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Constants.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- Constants.java	16 Oct 2002 15:09:37 -0000	1.92
  +++ Constants.java	16 Oct 2002 16:36:41 -0000	1.93
  @@ -260,7 +260,7 @@
           return false;
       }
   
  -    // Misc SOAP Namespaces
  +    // Misc SOAP Namespaces / URIs
       public static final String URI_SOAP11_NEXT_ACTOR =
                                        "http://schemas.xmlsoap.org/soap/actor/next" ;
       public static final String URI_SOAP12_NEXT_ACTOR =
  @@ -274,6 +274,11 @@
   
       public static final String URI_SOAP12_RPC =
                                        "http://www.w3.org/2002/06/soap-rpc";
  +    
  +    public static final String URI_SOAP12_NONE_ROLE =
  +                         "http://www.w3.org/2002/06/soap-envelope/role/none";    
  +    public static final String URI_SOAP12_ULTIMATE_ROLE =
  +             "http://www.w3.org/2002/06/soap-envelope/role/ultimateReceiver";    
   
       public static final String URI_SOAP11_HTTP =
                                        "http://schemas.xmlsoap.org/soap/http";
  
  
  

Mime
View raw message