[openejb-scm] openejb/modules/core/src/java/org/openejb/client/naming RemoteEJBObjectFactory.java

[jcscoobyrs]

jcscoobyrs    2005/12/07 23:43:40

  Modified:    modules/core/src/java/org/openejb/client/naming
                        RemoteEJBObjectFactory.java
  Log:

  Updated to look for system properties for ip and port before using defaults.
  
  Revision  Changes    Path
  1.2       +26 -2     
openejb/modules/core/src/java/org/openejb/client/naming/RemoteEJBObjectFactory.java
  
  Index: RemoteEJBObjectFactory.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/core/src/java/org/openejb/client/naming/RemoteEJBObjectFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RemoteEJBObjectFactory.java       29 Sep 2004 19:35:59 -0000      1.1
  +++ RemoteEJBObjectFactory.java       8 Dec 2005 04:43:40 -0000       1.2
  @@ -48,6 +48,7 @@
   package org.openejb.client.naming;
   
   import java.util.Hashtable;
  +
   import javax.naming.Context;
   import javax.naming.Name;
   import javax.naming.NameNotFoundException;
  @@ -56,6 +57,8 @@
   import javax.naming.Reference;
   import javax.naming.spi.ObjectFactory;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   import org.openejb.client.Client;
   import org.openejb.client.EJBHomeHandler;
   import org.openejb.client.EJBHomeProxy;
  @@ -69,6 +72,27 @@
    * @version $Revision$ $Date$
    */
   public class RemoteEJBObjectFactory implements ObjectFactory {
  +     private static Log log = 
LogFactory.getLog(RemoteEJBObjectFactory.class);
  +     private static final int PORT;
  +     private static final String IP;
  +     
  +     static {
  +             int port;
  +             
  +             try {
  +                     port = 
Integer.parseInt(System.getProperty("openejb.server.port", "4201"));
  +             } catch (NumberFormatException nfe) {
  +                     port = 4201;
  +                     
  +                     log.warn("openejb.server.port [" + 
  +                             System.getProperty("openejb.server.port") + 
  +                             "] is invalid.  Using the default [" + port + 
"].");
  +             }
  +             
  +             PORT = port;
  +             IP = System.getProperty("openejb.server.ip", "127.0.0.1");
  +     }
  +     
       public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment) throws Exception {
           if (!(obj instanceof Reference)) {
               return null;
  @@ -85,7 +109,7 @@
           JNDIResponse res = null;
           ServerMetaData server;
           try{
  -            server = new ServerMetaData("127.0.0.1", 4201);
  +            server = new ServerMetaData(RemoteEJBObjectFactory.IP, 
RemoteEJBObjectFactory.PORT);
               res = (JNDIResponse) Client.request(req, new JNDIResponse(), 
server);
           } catch (Exception e){
               throw (NamingException)new NamingException("Cannot lookup " + 
containerId).initCause(e);