[openejb-scm] openejb/modules/core/src/java/org/openejb/server StandardServiceStack.java StandardServiceStackGBean.java

[ammulder]

ammulder    2005/08/06 17:33:55

  Modified:    modules/core/src/java/org/openejb/server
                        StandardServiceStack.java
                        StandardServiceStackGBean.java
  Log:

  Update to latest Geronimo management API
   - change "address" property to "host" for network listeners
   - provide an ObjectName for thread pools
  
  Revision  Changes    Path
  1.8       +10 -2     
openejb/modules/core/src/java/org/openejb/server/StandardServiceStack.java
  
  Index: StandardServiceStack.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/StandardServiceStack.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StandardServiceStack.java 5 Jul 2005 01:45:45 -0000       1.7
  +++ StandardServiceStack.java 6 Aug 2005 21:33:55 -0000       1.8
  @@ -47,6 +47,7 @@
   import java.net.InetAddress;
   import java.net.SocketException;
   import java.net.InetSocketAddress;
  +import java.net.UnknownHostException;
   import java.io.IOException;
   
   import org.apache.geronimo.gbean.GBeanLifecycle;
  @@ -62,10 +63,13 @@
       private ServiceAccessController hba;
       private ServicePool pool;
       private ServerService server;
  +    private String host;
   
  -    public StandardServiceStack(String name, int port, InetAddress address, 
ServiceAccessController.IPAddressPermission[] allowHosts, String[] 
logOnSuccess, String[] logOnFailure, Executor executor, ServerService server) {
  +    public StandardServiceStack(String name, int port, String host, 
ServiceAccessController.IPAddressPermission[] allowHosts, String[] 
logOnSuccess, String[] logOnFailure, Executor executor, ServerService server) 
throws UnknownHostException {
           this.server = server;
           this.name = name;
  +        this.host = host;
  +        InetAddress address = InetAddress.getByName(host);
           this.pool = new ServicePool(server, executor);
           this.hba = new ServiceAccessController(name, pool, allowHosts);
           this.logger = new ServiceLogger(name, hba, logOnSuccess, 
logOnFailure);
  @@ -83,6 +87,10 @@
   
       public InetSocketAddress getFullAddress() {
           return new InetSocketAddress(getAddress(), getPort());
  +    }
  +
  +    public String getHost() {
  +        return host;
       }
   
       public int getPort() {
  
  
  
  1.7       +5 -5      
openejb/modules/core/src/java/org/openejb/server/StandardServiceStackGBean.java
  
  Index: StandardServiceStackGBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/StandardServiceStackGBean.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StandardServiceStackGBean.java    5 Jul 2005 01:45:45 -0000       1.6
  +++ StandardServiceStackGBean.java    6 Aug 2005 21:33:55 -0000       1.7
  @@ -70,7 +70,7 @@
           infoFactory.addAttribute("name", String.class, true);
           infoFactory.addAttribute("port", int.class, true);
           infoFactory.addAttribute("soTimeout", int.class, true);
  -        infoFactory.addAttribute("address", InetAddress.class, true);
  +        infoFactory.addAttribute("host", String.class, true);
           infoFactory.addAttribute("fullAddress", InetSocketAddress.class, 
false);
           infoFactory.addAttribute("allowHosts", 
ServiceAccessController.IPAddressPermission[].class, true);
           infoFactory.addAttribute("logOnSuccess", String[].class, true);
  @@ -82,7 +82,7 @@
           infoFactory.setConstructor(new String[]{
               "name",
               "port",
  -            "address",
  +            "host",
               "allowHosts",
               "logOnSuccess",
               "logOnFailure",
  @@ -96,7 +96,7 @@
           return GBEAN_INFO;
       }
   
  -    public static ObjectName addGBean(Kernel kernel, String name, int port, 
InetAddress address, InetAddress[] allowHosts, String[] logOnSuccess, String[] 
logOnFailure, ObjectName executor, ObjectName server) throws 
GBeanAlreadyExistsException, GBeanNotFoundException {
  +    public static ObjectName addGBean(Kernel kernel, String name, int port, 
String host, InetAddress[] allowHosts, String[] logOnSuccess, String[] 
logOnFailure, ObjectName executor, ObjectName server) throws 
GBeanAlreadyExistsException, GBeanNotFoundException {
           ClassLoader classLoader = 
StandardServiceStack.class.getClassLoader();
           ObjectName SERVICE_NAME = 
JMXUtil.getObjectName("openejb:type=StandardServiceStack,name=" + name);
   
  @@ -104,7 +104,7 @@
   
           gbean.setAttribute("name", name);
           gbean.setAttribute("port", new Integer(port));
  -        gbean.setAttribute("address", address);
  +        gbean.setAttribute("host", host);
           gbean.setAttribute("allowHosts", allowHosts);
           gbean.setAttribute("logOnSuccess", logOnSuccess);
           gbean.setAttribute("logOnFailure", logOnFailure);