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 AxisEngine.java
Date Mon, 18 Jun 2001 15:43:32 GMT
gdaniels    01/06/18 08:43:32

  Modified:    java/src/org/apache/axis AxisEngine.java
  Log:
  Clean up initialization a bit, get rid of unnecessary fields.
  
  Revision  Changes    Path
  1.9       +18 -24    xml-axis/java/src/org/apache/axis/AxisEngine.java
  
  Index: AxisEngine.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisEngine.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AxisEngine.java	2001/06/15 00:01:06	1.8
  +++ AxisEngine.java	2001/06/18 15:43:30	1.9
  @@ -84,11 +84,9 @@
   {
       /** The handler registry this Engine uses. */
       protected HandlerRegistry _handlerRegistry;
  -    protected String handlerRegFilename;
       
       /** The service registry this Engine uses. */
       protected HandlerRegistry _serviceRegistry;
  -    protected String serviceRegFilename;
       
       /** This Engine's global type mappings     */
       protected TypeMappingRegistry _typeMappingRegistry =
  @@ -156,6 +154,8 @@
           services.init();
           setHandlerRegistry(handlers);
           setServiceRegistry(services);
  +        
  +        init();
       }
   
       /**
  @@ -167,8 +167,21 @@
       public AxisEngine(String handlerRegFilename, String serviceRegFilename)
       {
           this();
  -        this.handlerRegFilename = handlerRegFilename;
  -        this.serviceRegFilename = serviceRegFilename;
  +        DefaultHandlerRegistry  hr =
  +                                    new DefaultHandlerRegistry(handlerRegFilename);
  +        hr.setOnServer( isOnServer() );
  +        hr.init();
  +        setHandlerRegistry( hr );
  +        
  +        // Load the simple deployed services registry and init it
  +        DefaultServiceRegistry  sr =
  +                                    new DefaultServiceRegistry(serviceRegFilename);
  +        sr.setHandlerRegistry( getHandlerRegistry() ); // needs to know about 'hr'
  +        sr.setOnServer( isOnServer() );
  +        sr.init();
  +        setServiceRegistry( sr );
  +        
  +        init();
       }
   
   
  @@ -178,8 +191,7 @@
       abstract public boolean isOnServer();
   
       /**
  -     * Find/load the registries and save them so we don't need to do this
  -     * each time we're called.
  +     * (re)initialize - What should really go in here???
        */
       public void init() {
           // Load the simple handler registry and init it
  @@ -188,24 +200,6 @@
           String propVal = props.getProperty("debugLevel", "0");
           Debug.setDebugLevel(Integer.parseInt(propVal));
           
  -        if (getHandlerRegistry() == null) {
  -            DefaultHandlerRegistry  hr =
  -                         new DefaultHandlerRegistry(handlerRegFilename);
  -            hr.setOnServer( isOnServer() );
  -            hr.init();
  -            setHandlerRegistry( hr );
  -        }
  -        
  -        if (getServiceRegistry() == null) {
  -            // Load the simple deployed services registry and init it
  -            DefaultServiceRegistry  sr =
  -                         new DefaultServiceRegistry(serviceRegFilename);
  -            sr.setHandlerRegistry( getHandlerRegistry() ); // needs to know about 'hr'
  -            sr.setOnServer( isOnServer() );
  -            sr.init();
  -            setServiceRegistry( sr );
  -        }
  -
           // Load the registry of deployed types
           TypeMappingRegistry tmr = new TypeMappingRegistry("typemap-supp.reg");
           tmr.setParent(new SOAPTypeMappingRegistry());
  
  
  

Mime
View raw message