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 di...@apache.org on 2004/10/20 15:48:16 UTC

cvs commit: ws-axis/java/src/org/apache/axis/transport/http SimpleAxisServer.java

dims        2004/10/20 06:48:16

  Modified:    java/src/org/apache/axis/management ServiceAdmin.java
               java/src/org/apache/axis/management/jmx
                        ServiceAdministrator.java
                        ServiceAdministratorMBean.java
               java/src/org/apache/axis/transport/http
                        SimpleAxisServer.java
  Log:
  Changing listServices to return a ArrayList of service names
  
  Revision  Changes    Path
  1.2       +2 -1      ws-axis/java/src/org/apache/axis/management/ServiceAdmin.java
  
  Index: ServiceAdmin.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/management/ServiceAdmin.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceAdmin.java	19 Oct 2004 15:11:59 -0000	1.1
  +++ ServiceAdmin.java	20 Oct 2004 13:48:16 -0000	1.2
  @@ -17,6 +17,7 @@
   
   import org.apache.axis.AxisFault;
   import org.apache.axis.ConfigurationException;
  +import org.apache.axis.management.jmx.ServiceAdministrator;
   import org.apache.axis.description.ServiceDesc;
   import org.apache.axis.handlers.soap.SOAPService;
   import org.apache.axis.server.AxisServer;
  @@ -104,7 +105,6 @@
           while (iter.hasNext()) {
               ServiceDesc sd = (ServiceDesc) iter.next();
               String name = sd.getName();
  -            System.out.println("Service Name is : " + name);
               SOAPService service = server.getConfig().getService(
                       new QName("", name));
               serviceMap.put(name, service);
  @@ -133,6 +133,7 @@
        */ 
       static public void setEngine(AxisServer axisSrv) {
           ServiceAdmin.axisServer = axisSrv;
  +        //Registrar.register(new ServiceAdministrator(), "AxisServer:name=localhost,port=8080", "AxisServerContext");
       }
   
   }
  
  
  
  1.2       +3 -2      ws-axis/java/src/org/apache/axis/management/jmx/ServiceAdministrator.java
  
  Index: ServiceAdministrator.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/management/jmx/ServiceAdministrator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceAdministrator.java	19 Oct 2004 15:11:59 -0000	1.1
  +++ ServiceAdministrator.java	20 Oct 2004 13:48:16 -0000	1.2
  @@ -19,6 +19,7 @@
   import org.apache.axis.ConfigurationException;
   
   import java.util.HashMap;
  +import java.util.ArrayList;
   
   /**
    * The ServiceAdmininstrator MBean exposes the
  @@ -63,8 +64,8 @@
        * @return Map of Services (SOAPService objects, Key is the ServiceName)
        * @throws AxisFault ConfigurationException
        */
  -    public HashMap listServices()
  +    public ArrayList listServices()
               throws AxisFault, ConfigurationException {
  -        return org.apache.axis.management.ServiceAdmin.listServices();
  +        return new ArrayList (org.apache.axis.management.ServiceAdmin.listServices().keySet());
       }
   }
  
  
  
  1.2       +2 -1      ws-axis/java/src/org/apache/axis/management/jmx/ServiceAdministratorMBean.java
  
  Index: ServiceAdministratorMBean.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/management/jmx/ServiceAdministratorMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceAdministratorMBean.java	19 Oct 2004 15:11:59 -0000	1.1
  +++ ServiceAdministratorMBean.java	20 Oct 2004 13:48:16 -0000	1.2
  @@ -19,6 +19,7 @@
   import org.apache.axis.ConfigurationException;
   
   import java.util.HashMap;
  +import java.util.ArrayList;
   
   /**
    * The ServiceAdministrator MBean exposes the
  @@ -54,6 +55,6 @@
        * @throws AxisFault,ConfigurationException
        *
        */
  -    public HashMap listServices() throws AxisFault, ConfigurationException;
  +    public ArrayList listServices() throws AxisFault, ConfigurationException;
   
   }
  
  
  
  1.84      +3 -0      ws-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
  
  Index: SimpleAxisServer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- SimpleAxisServer.java	26 Mar 2004 16:44:16 -0000	1.83
  +++ SimpleAxisServer.java	20 Oct 2004 13:48:16 -0000	1.84
  @@ -25,6 +25,8 @@
   import org.apache.axis.utils.Options;
   import org.apache.axis.collections.LRUMap;
   import org.apache.axis.EngineConfiguration;
  +import org.apache.axis.AxisFault;
  +import org.apache.axis.management.ServiceAdmin;
   import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
   import org.apache.commons.logging.Log;
   
  @@ -205,6 +207,7 @@
                   myConfig = EngineConfigurationFactoryFinder.newFactory().getServerEngineConfig();
               }
               myAxisServer = new AxisServer(myConfig);
  +            ServiceAdmin.setEngine(myAxisServer);
           }
           return myAxisServer;
       }