svn commit: r356577 - /geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java

[am...@apache.org]

Author: ammulder
Date: Tue Dec 13 11:14:04 2005
New Revision: 356577

URL: http://svn.apache.org/viewcvs?rev=356577&view=rev
Log:
Merge directory change from branch

Modified:
    geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java

Modified: geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java?rev=356577&r1=356576&r2=356577&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java (original)
+++ geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java Tue Dec 13 11:14:04 2005
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.Properties;
 import javax.naming.Context;
 import javax.naming.directory.InitialDirContext;
@@ -157,6 +158,10 @@
         //Insert failure code here
     }
 
+    public InetSocketAddress getListenAddress() {
+        return new InetSocketAddress(getHost(), getPort());
+    }
+
     private void setEnvironment(Properties env){
 
         if (providerURL != null){
@@ -233,7 +238,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("DirectoryGBean", DirectoryGBean.class);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Apache Directory LDAP", DirectoryGBean.class);
 
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
         
@@ -243,6 +248,7 @@
         infoFactory.addAttribute("securityCredentials", String.class, true, true);
         infoFactory.addAttribute("port", int.class, true, true);
         infoFactory.addAttribute("host", String.class, true, true);
+        infoFactory.addAttribute("listenAddress", InetSocketAddress.class, false, false);
         infoFactory.addAttribute("enableNetworking", boolean.class, true, true);
         
         infoFactory.addAttribute("workingDir", String.class, true);