You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by du...@apache.org on 2001/02/18 20:13:22 UTC

cvs commit: xml-axis/java/src/org/apache/axis/transport/http AxisServlet.java HTTPConstants.java

dug         01/02/18 11:13:22

  Modified:    java/src/org/apache/axis MessageContext.java
               java/src/org/apache/axis/transport/http AxisServlet.java
                        HTTPConstants.java
  Log:
  Just some minor updates - added more objects to the MessageContext.
  
  Revision  Changes    Path
  1.10      +0 -2      xml-axis/java/src/org/apache/axis/MessageContext.java
  
  Index: MessageContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MessageContext.java	2001/02/17 18:02:16	1.9
  +++ MessageContext.java	2001/02/18 19:13:21	1.10
  @@ -163,7 +163,6 @@
        */
       public static String TRANS_ID            = "transport.id";
   
  -   
       /** A String with the user's ID (if available)
        */
       public static String USERID              = "user.id";
  @@ -172,7 +171,6 @@
        */
       public static String PASSWORD            = "user.password";
   
  -   
       public Object getProperty(String propName) {
           if ( bag == null ) return( null );
           return( bag.get(propName) );
  
  
  
  1.6       +9 -3      xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
  
  Index: AxisServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AxisServlet.java	2001/02/17 18:02:17	1.5
  +++ AxisServlet.java	2001/02/18 19:13:22	1.6
  @@ -109,6 +109,9 @@
       Message           msg        = new Message( req, "ServletRequest" );
   
       msgContext.setProperty(MessageContext.TRANS_ID, HTTPConstants.TRANSPORT_ID);
  +    msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLET, this );
  +    msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST, req );
  +    msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETRESPONSE, res );
       
       msgContext.setIncomingMessage( msg );
       
  @@ -132,8 +135,11 @@
       tmp = (String) req.getHeader( HTTPConstants.HEADER_SOAP_ACTION );
       if ( tmp != null && "".equals(tmp) )
         tmp = req.getContextPath(); // Is this right?
  -    if ( tmp != null ) msgContext.setProperty( HTTPConstants.MC_HTTP_SOAPACTION, tmp );
  +    if ( tmp != null ) 
  +      msgContext.setProperty( HTTPConstants.MC_HTTP_SOAPACTION, tmp );
   
  +    /* Process the Basic Auth stuff in the headers */
  +    /***********************************************/
       tmp = (String) req.getHeader( HTTPConstants.HEADER_AUTHORIZATION );
       if ( tmp != null ) tmp = tmp.trim();
       if ( tmp != null && tmp.startsWith("Basic ") ) {
  @@ -153,7 +159,8 @@
         }
       }
   
  -    // Invoke the Axis engine...
  +    /* Invoke the Axis engine... */
  +    /*****************************/
       try {
         engine.invoke( msgContext );
       }
  @@ -167,7 +174,6 @@
         }
         else 
           res.setStatus( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
  -      // msgContext.setOutgoingMessage( new Message(e.toString(), "String" ) );
         if ( !(e instanceof AxisFault) )
           e = new AxisFault( e );
         msgContext.setOutgoingMessage( new Message(e, "AxisFault") );
  
  
  
  1.4       +11 -0     xml-axis/java/src/org/apache/axis/transport/http/HTTPConstants.java
  
  Index: HTTPConstants.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPConstants.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HTTPConstants.java	2001/02/12 01:11:17	1.3
  +++ HTTPConstants.java	2001/02/18 19:13:22	1.4
  @@ -91,4 +91,15 @@
        *  have it.
        */
       public static String MC_HTTP_SOAPACTION     = "transport.http.soapAction";
  +
  +    /** HttpServlet
  +     */
  +    public static String MC_HTTP_SERVLET        = "transport.http.servlet" ;
  +
  +    /** HttpServletRequest
  +     */
  +    public static String MC_HTTP_SERVLETREQUEST = "transport.http.servletRequest";
  +    /** HttpServletResponse
  +     */
  +    public static String MC_HTTP_SERVLETRESPONSE= "transport.http.servletRessponse";
   }