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

[ammulder]

ammulder    2005/07/04 21:45:45

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

  Add InetSocketAddress attributes to GBeans that open network ports
  
  Revision  Changes    Path
  1.6       +4 -2      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StandardServiceStackGBean.java    31 Mar 2005 10:29:27 -0000      1.5
  +++ StandardServiceStackGBean.java    5 Jul 2005 01:45:45 -0000       1.6
  @@ -46,6 +46,7 @@
   package org.openejb.server;
   
   import java.net.InetAddress;
  +import java.net.InetSocketAddress;
   import javax.management.ObjectName;
   
   import org.apache.geronimo.gbean.GBeanData;
  @@ -64,12 +65,13 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(StandardServiceStack.class);
  +        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("OpenEJB 
Connector", StandardServiceStack.class);
   
           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("fullAddress", InetSocketAddress.class, 
false);
           infoFactory.addAttribute("allowHosts", 
ServiceAccessController.IPAddressPermission[].class, true);
           infoFactory.addAttribute("logOnSuccess", String[].class, true);
           infoFactory.addAttribute("logOnFailure", String[].class, true);
  
  
  
  1.7       +6 -1      
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StandardServiceStack.java 31 Mar 2005 10:29:27 -0000      1.6
  +++ StandardServiceStack.java 5 Jul 2005 01:45:45 -0000       1.7
  @@ -46,6 +46,7 @@
   
   import java.net.InetAddress;
   import java.net.SocketException;
  +import java.net.InetSocketAddress;
   import java.io.IOException;
   
   import org.apache.geronimo.gbean.GBeanLifecycle;
  @@ -78,6 +79,10 @@
   
       public InetAddress getAddress() {
           return daemon.getAddress();
  +    }
  +
  +    public InetSocketAddress getFullAddress() {
  +        return new InetSocketAddress(getAddress(), getPort());
       }
   
       public int getPort() {