dblevins 2005/07/24 06:48:53
Modified: modules/core/src/java/org/openejb/client Client.java
JNDIContext.java ServerMetaData.java
SocketConnectionFactory.java
Log:
Encapsulated variables in ServerMetaData
Put in support for guessing Tomcat4 vs Tomcat5
Revision Changes Path
1.3 +3 -3
openejb1/modules/core/src/java/org/openejb/client/Client.java
Index: Client.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/client/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Client.java 16 Jun 2005 22:29:50 -0000 1.2
+++ Client.java 24 Jul 2005 10:48:53 -0000 1.3
@@ -74,9 +74,9 @@
try{
conn = ConnectionManager.getConnection( server );
} catch (IOException e){
- throw new RemoteException("Cannot access server:
"+server.address+":"+server.port+" Exception: ", e );
+ throw new RemoteException("Cannot access server:
"+server.getAddress()+":"+server.getPort()+" Exception: ", e );
} catch (Throwable e){
- throw new RemoteException("Cannot access server:
"+server.address+":"+server.port+" due to an unkown exception in the OpenEJB
client: ", e );
+ throw new RemoteException("Cannot access server:
"+server.getAddress()+":"+server.getPort()+" due to an unkown exception in the
OpenEJB client: ", e );
}
/*----------------------------------*/
1.6 +3 -3
openejb1/modules/core/src/java/org/openejb/client/JNDIContext.java
Index: JNDIContext.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/client/JNDIContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JNDIContext.java 19 Jun 2005 22:40:30 -0000 1.5
+++ JNDIContext.java 24 Jul 2005 10:48:53 -0000 1.6
@@ -184,8 +184,8 @@
try {
server = new ServerMetaData();
- server.address = InetAddress.getByName( url.getHost() );
- server.port = url.getPort();
+ server.setAddress(InetAddress.getByName( url.getHost() ));
+ server.setPort(url.getPort());
} catch (UnknownHostException e){
throw new ConfigurationException("Invalid provider
URL:"+serverURL+": host unkown: "+e.getMessage());
}
1.3 +9 -9
openejb1/modules/core/src/java/org/openejb/client/ServerMetaData.java
Index: ServerMetaData.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/client/ServerMetaData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerMetaData.java 16 Jun 2005 22:29:50 -0000 1.2
+++ ServerMetaData.java 24 Jul 2005 10:48:53 -0000 1.3
@@ -60,22 +60,22 @@
public class ServerMetaData implements Externalizable{
- transient int port;
+ private transient int port;
/**
* Stores the server's IP as an InetAddress instead of a String.
Creating a
* socket with a string creates a new InetAddress object anyway.
Storing it
* here save us from having to do it more than once
*/
- transient InetAddress address;
+ private transient InetAddress address;
public ServerMetaData(){
}
public ServerMetaData(String host, int port) throws UnknownHostException{
- this.address = InetAddress.getByName( host );
- this.port = port;
+ this.setAddress(InetAddress.getByName( host ));
+ this.setPort(port);
}
public int getPort(){
@@ -132,12 +132,12 @@
///IP += in.readUnsignedByte();
// System.out.println(IP.toString());
try{
- address = InetAddress.getByName( IP.toString() );
+ setAddress(InetAddress.getByName( IP.toString() ));
} catch (java.net.UnknownHostException e){
throw new IOException("Cannot read in the host address "+IP+":
The host is unknown");
}
- port = in.readInt();
+ setPort(in.readInt());
}
@@ -157,14 +157,14 @@
* @exception IOException Includes any I/O exceptions that may occur
*/
public void writeExternal(ObjectOutput out) throws IOException {
- byte[] addr = address.getAddress();
+ byte[] addr = getAddress().getAddress();
out.writeByte(addr[0]);
out.writeByte(addr[1]);
out.writeByte(addr[2]);
out.writeByte(addr[3]);
- out.writeInt(port);
+ out.writeInt(getPort());
}
}
1.6 +5 -5
openejb1/modules/core/src/java/org/openejb/client/SocketConnectionFactory.java
Index: SocketConnectionFactory.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/client/SocketConnectionFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketConnectionFactory.java 1 Jul 2005 09:44:06 -0000 1.5
+++ SocketConnectionFactory.java 24 Jul 2005 10:48:53 -0000 1.6
@@ -94,16 +94,16 @@
/* Open socket to server */
/*-----------------------*/
try{
- socket = new Socket(server.address, server.port);
+ socket = new Socket(server.getAddress(), server.getPort());
socket.setTcpNoDelay(true);
} catch (IOException e){
- throw new IOException("Cannot access server:
"+server.address+":"+server.port+" Exception: "+ e.getClass().getName() +" : "+
e.getMessage());
+ throw new IOException("Cannot access server:
"+server.getAddress()+":"+server.getPort()+" Exception: "+
e.getClass().getName() +" : "+ e.getMessage());
} catch (SecurityException e){
- throw new IOException("Cannot access server:
"+server.address+":"+server.port+" due to security restrictions in the current
VM: "+ e.getClass().getName() +" : "+ e.getMessage());
+ throw new IOException("Cannot access server:
"+server.getAddress()+":"+server.getPort()+" due to security restrictions in
the current VM: "+ e.getClass().getName() +" : "+ e.getMessage());
} catch (Throwable e){
- throw new IOException("Cannot access server:
"+server.address+":"+server.port+" due to an unkown exception in the OpenEJB
client: "+ e.getClass().getName() +" : "+ e.getMessage());
+ throw new IOException("Cannot access server:
"+server.getAddress()+":"+server.getPort()+" due to an unkown exception in the
OpenEJB client: "+ e.getClass().getName() +" : "+ e.getMessage());
}
}
