dblevins 2005/09/29 04:02:23
Modified: modules/core/src/java/org/openejb/client Tag: v2_0_G1M5
Client.java ServerMetaData.java
Added: modules/core/src/java/org/openejb/client Tag: v2_0_G1M5
ProtocolMetaData.java
Log:
Merging head back into v2_0_G1M5 branch
Revision Changes Path
No revision
No revision
1.2.8.1 +36 -10
openejb/modules/core/src/java/org/openejb/client/Client.java
Index: Client.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/Client.java,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -r1.2 -r1.2.8.1
--- Client.java 29 Sep 2004 03:39:44 -0000 1.2
+++ Client.java 29 Sep 2005 08:02:23 -0000 1.2.8.1
@@ -55,6 +55,8 @@
*/
public class Client {
+ private static final ProtocolMetaData PROTOCOL_VERSION = new
ProtocolMetaData("2.0");
+
public static Response request(Request req, Response res, ServerMetaData
server) throws RemoteException {
if ( server == null ) throw new IllegalArgumentException("Server
instance cannot be null");
@@ -82,11 +84,19 @@
out = conn.getOuputStream();
- } catch (IOException e){
+ } catch (Throwable e){
throw new RemoteException("Cannot open output stream to
server: " , e );
+ }
+
+ /*----------------------------------*/
+ /* Write the protocol magic */
+ /*----------------------------------*/
+ try{
+
+ PROTOCOL_VERSION.writeExternal(out);
} catch (Throwable e){
- throw new RemoteException("Cannot open output stream to
server: " , e );
+ throw new RemoteException("Cannot write the protocol
metadata to the server: " , e );
}
/*----------------------------------*/
@@ -142,15 +152,31 @@
/*----------------------------------*/
/* Get input streams */
/*----------------------------------*/
- try{
+ InputStream in = null;
+ try {
- objectIn = new EJBObjectInputStream(conn.getInputStream());
+ in = conn.getInputStream();
- } catch (IOException e){
- throw new RemoteException("Cannot open object input stream
to server: " , e );
+ } catch (IOException e) {
+ throw new RemoteException("Cannot open input stream to
server: " , e );
+ }
+
+ ProtocolMetaData protocolMetaData = null;
+ try {
+
+ protocolMetaData = new ProtocolMetaData();
+ protocolMetaData.readExternal(in);
+
+ } catch (IOException e) {
+ throw new RemoteException("Cannot deternmine server protocol
version: Received "+protocolMetaData.getSpec() , e );
+ }
+
+ try{
+
+ objectIn = new EJBObjectInputStream(in);
} catch (Throwable e){
- throw new RemoteException("Cannot open object input stream
to server: " , e );
+ throw new RemoteException("Cannot open object input stream
to server ("+protocolMetaData.getSpec() +") : "+e.getMessage() , e );
}
/*----------------------------------*/
@@ -163,10 +189,10 @@
throw new RemoteException("Cannot read the response from the
server. The class for an object being returned is not located in this system:"
, e );
} catch (IOException e){
- throw new RemoteException("Cannot read the response from the
server." , e );
+ throw new RemoteException("Cannot read the response from the
server ("+protocolMetaData.getSpec() +") : "+e.getMessage() , e );
} catch (Throwable e){
- throw new RemoteException("Error reading response from
server: " , e );
+ throw new RemoteException("Error reading response from
server ("+protocolMetaData.getSpec() +") : "+e.getMessage() , e );
}
} finally {
1.1.8.1 +1 -2
openejb/modules/core/src/java/org/openejb/client/ServerMetaData.java
Index: ServerMetaData.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/ServerMetaData.java,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- ServerMetaData.java 1 Mar 2004 07:14:43 -0000 1.1
+++ ServerMetaData.java 29 Sep 2005 08:02:23 -0000 1.1.8.1
@@ -58,7 +58,6 @@
*/
public class ServerMetaData implements Externalizable{
-
transient int port;
/**
No revision
Index: ServerMetaData.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/ServerMetaData.java,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- ServerMetaData.java 1 Mar 2004 07:14:43 -0000 1.1
+++ ServerMetaData.java 29 Sep 2005 08:02:23 -0000 1.1.8.1
@@ -58,7 +58,6 @@
*/
public class ServerMetaData implements Externalizable{
-
transient int port;
/**
No revision
Index: ServerMetaData.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/ServerMetaData.java,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- ServerMetaData.java 1 Mar 2004 07:14:43 -0000 1.1
+++ ServerMetaData.java 29 Sep 2005 08:02:23 -0000 1.1.8.1
@@ -58,7 +58,6 @@
*/
public class ServerMetaData implements Externalizable{
-
transient int port;
/**
1.2.2.1 +2 -2
openejb/modules/core/src/java/org/openejb/client/ProtocolMetaData.java
Index: ProtocolMetaData.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/ProtocolMetaData.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
