axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/utils Admin.java Options.java
Date Wed, 30 May 2001 14:18:30 GMT
dug         01/05/30 07:18:30

  Modified:    java/src/org/apache/axis Constants.java
               java/src/org/apache/axis/client AxisClient.java
                        HTTPCall.java
               java/src/org/apache/axis/server AxisServer.java
               java/src/org/apache/axis/utils Admin.java Options.java
  Log:
  Use a different name for the *.reg files on the client and server.
  Added easier support client side transport chain defs
  little bit of clean-up
  
  Revision  Changes    Path
  1.15      +5 -0      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Constants.java	2001/05/22 21:26:55	1.14
  +++ Constants.java	2001/05/30 14:18:15	1.15
  @@ -145,4 +145,9 @@
     public static String GLOBAL_OUTPUT       = "global.output" ;
     
     public static String JWSPROCESSOR_TARGET = "JWSProcessor" ;
  +
  +  public static String CLIENT_HANDLER_REGISTRY = "handler-client.reg" ;
  +  public static String SERVER_HANDLER_REGISTRY = "handler-server.reg" ;
  +  public static String CLIENT_SERVICE_REGISTRY = "service-client.reg" ;
  +  public static String SERVER_SERVICE_REGISTRY = "service-server.reg" ;
   }
  
  
  
  1.6       +2 -4      xml-axis/java/src/org/apache/axis/client/AxisClient.java
  
  Index: AxisClient.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AxisClient.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AxisClient.java	2001/03/31 00:53:09	1.5
  +++ AxisClient.java	2001/05/30 14:18:18	1.6
  @@ -91,17 +91,15 @@
       public void init() {
           // Load the simple handler registry and init it
           Debug.Print( 1, "Enter: AxisClient::init" );
  -        //HandlerRegistry  hr = new SimpleRegistry("handlers.reg");
           DefaultHandlerRegistry  hr = 
  -          new DefaultHandlerRegistry("handlers-supp.reg");
  +          new DefaultHandlerRegistry(Constants.CLIENT_HANDLER_REGISTRY);
           hr.setOnServer( false );
           hr.init();
           addOption( Constants.HANDLER_REGISTRY, hr );
   
           // Load the simple deployed services registry and init it
  -        //HandlerRegistry  sr = new SimpleRegistry("services.reg");
           DefaultServiceRegistry  sr = 
  -          new DefaultServiceRegistry("services-supp.reg");
  +          new DefaultServiceRegistry(Constants.CLIENT_SERVICE_REGISTRY);
           sr.setHandlerRegistry( hr ); // Needs to know about 'hr'
           sr.setOnServer( false );
           sr.init();
  
  
  
  1.28      +10 -2     xml-axis/java/src/org/apache/axis/client/HTTPCall.java
  
  Index: HTTPCall.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/HTTPCall.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- HTTPCall.java	2001/05/30 01:31:53	1.27
  +++ HTTPCall.java	2001/05/30 14:18:19	1.28
  @@ -86,7 +86,6 @@
   
   
   // Need to add proxy, ssl.... other cool things - but it's a start
  -// Only supports String
   
   public class HTTPCall {
     private String  url ;
  @@ -147,6 +146,14 @@
     public String getEncodingStyleURI() {
       return( encodingStyleURI );
     }
  +
  +  public void setTransportInput(String handlerName) {
  +    msgContext.setProperty( MessageContext.TRANS_INPUT, handlerName );
  +  }
  +
  +  public void setTransportOutput(String handlerName) {
  +    msgContext.setProperty( MessageContext.TRANS_OUTPUT, handlerName );
  +  }
     
     public void setServiceDescription(ServiceDescription serviceDesc)
     {
  @@ -173,7 +180,8 @@
       return( ahc.invoke( null, m, args ) );
     }
   
  -  public Object invoke( String namespace, String method, Object[] args ) throws AxisFault
{
  +  public Object invoke( String namespace, String method, Object[] args ) 
  +      throws AxisFault {
       RPCElement  body  = new RPCElement( method, args );
       body.setNamespaceURI(namespace);
       return( invoke( body ) );
  
  
  
  1.10      +2 -4      xml-axis/java/src/org/apache/axis/server/AxisServer.java
  
  Index: AxisServer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/AxisServer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AxisServer.java	2001/05/22 13:41:20	1.9
  +++ AxisServer.java	2001/05/30 14:18:22	1.10
  @@ -93,17 +93,15 @@
       public void init() {
           // Load the simple handler registry and init it
           Debug.Print( 1, "Enter: AxisServer::init" );
  -        //HandlerRegistry  hr = new SimpleRegistry("handlers.reg");
           DefaultHandlerRegistry  hr = 
  -          new DefaultHandlerRegistry("handlers-supp.reg");
  +          new DefaultHandlerRegistry(Constants.SERVER_HANDLER_REGISTRY);
           hr.setOnServer( true );
           hr.init();
           addOption( Constants.HANDLER_REGISTRY, hr );
   
           // Load the simple deployed services registry and init it
  -        //HandlerRegistry  sr = new SimpleRegistry("services.reg");
           DefaultServiceRegistry  sr = 
  -          new DefaultServiceRegistry("services-supp.reg");
  +          new DefaultServiceRegistry(Constants.SERVER_SERVICE_REGISTRY);
           sr.setHandlerRegistry( hr ); // needs to know about 'hr'
           sr.setOnServer( true );
           sr.init();
  
  
  
  1.31      +8 -3      xml-axis/java/src/org/apache/axis/utils/Admin.java
  
  Index: Admin.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Admin.java	2001/05/22 21:27:10	1.30
  +++ Admin.java	2001/05/30 14:18:25	1.31
  @@ -79,14 +79,19 @@
   
     private void init() {
       if ( hr == null ) {
  -      // hr = new SimpleRegistry("handlers.reg");
  -      hr = new DefaultHandlerRegistry("handlers-supp.reg");
  +      if ( onServer )
  +        hr = new DefaultHandlerRegistry(Constants.SERVER_HANDLER_REGISTRY);
  +      else
  +        hr = new DefaultHandlerRegistry(Constants.CLIENT_HANDLER_REGISTRY);
         hr.setOnServer( onServer );
         hr.init();
       }
       if ( sr == null ) {
         // sr = new SimpleRegistry("services.reg");
  -      sr = new DefaultServiceRegistry("services-supp.reg");
  +      if ( onServer )
  +        sr = new DefaultServiceRegistry(Constants.SERVER_SERVICE_REGISTRY);
  +      else
  +        sr = new DefaultServiceRegistry(Constants.CLIENT_SERVICE_REGISTRY);
         hr.setOnServer( onServer );
         sr.init();
       }
  
  
  
  1.9       +1 -1      xml-axis/java/src/org/apache/axis/utils/Options.java
  
  Index: Options.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Options.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Options.java	2001/04/10 11:27:05	1.8
  +++ Options.java	2001/05/30 14:18:27	1.9
  @@ -250,7 +250,7 @@
         if ( port != null ) tmp += ":" + port ;
         if ( servlet != null ) tmp += servlet ;
       } else tmp = url.toString();
  -    Debug.Print( 1, "getURL returned: " + tmp );
  +    Debug.Print( 3, "getURL returned: " + tmp );
       return( tmp );
     }
   
  
  
  

Mime
View raw message