djencks 2004/09/24 03:18:55
Modified: modules/core/src/java/org/openejb/client
AppClientJNDIContext.java JNDIContext.java
JNDIRequest.java
Log:
Use namespace rewriting to eliminate refAdapter use. Fix broken jndi for
non-app-client clients. Clean up exception handling. Fix invalid openejb-dd
Revision Changes Path
1.3 +3 -5
openejb/modules/core/src/java/org/openejb/client/AppClientJNDIContext.java
Index: AppClientJNDIContext.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/AppClientJNDIContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AppClientJNDIContext.java 23 Sep 2004 23:53:52 -0000 1.2
+++ AppClientJNDIContext.java 24 Sep 2004 07:18:55 -0000 1.3
@@ -70,9 +70,7 @@
ServerMetaData serverMetaData = new ServerMetaData(host, port);
JNDIResponse res = new JNDIResponse(serverMetaData);
- JNDIRequest req = new JNDIRequest(JNDIRequest.JNDI_LOOKUP, "");
-
- req.setClientModuleID(appClientModuleName.toString());
+ JNDIRequest req = new JNDIRequest(JNDIRequest.JNDI_LOOKUP,
appClientModuleName.toString(), "");
Client.request(req, res, serverMetaData);
1.4 +3 -6
openejb/modules/core/src/java/org/openejb/client/JNDIContext.java
Index: JNDIContext.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/JNDIContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JNDIContext.java 23 Sep 2004 19:23:18 -0000 1.3
+++ JNDIContext.java 24 Sep 2004 07:18:55 -0000 1.4
@@ -230,16 +230,13 @@
else if ( name.equals("") ) return new JNDIContext(this);
else if ( !name.startsWith("/") ) name = tail+name;
- JNDIRequest req = new JNDIRequest();
- req.setRequestMethod( JNDIRequest.JNDI_LOOKUP );
- req.setRequestString( name );
+ JNDIRequest req = new JNDIRequest(JNDIRequest.JNDI_LOOKUP, "", name);
JNDIResponse res = null;
try{
res = request(req);
} catch (Exception e){
- // TODO:1: Better exception handling
- throw new javax.naming.NamingException("Cannot lookup "+name+":
Received error: "+e.getMessage());
+ throw (NamingException)new NamingException("Cannot lookup " +
name).initCause(e);
}
switch ( res.getResponseCode() ) {
1.3 +5 -16
openejb/modules/core/src/java/org/openejb/client/JNDIRequest.java
Index: JNDIRequest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/JNDIRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JNDIRequest.java 23 Sep 2004 19:23:18 -0000 1.2
+++ JNDIRequest.java 24 Sep 2004 07:18:55 -0000 1.3
@@ -55,20 +55,17 @@
public class JNDIRequest implements Request {
private transient int requestMethod = -1;
-
-
- public void setClientModuleID(String clientModuleID) {
- this.clientModuleID = clientModuleID;
- }
-
private transient String clientModuleID;
private transient String requestString;
public JNDIRequest() {
}
- public JNDIRequest(int requestMethod, String requestString) {
+ public JNDIRequest(int requestMethod, String clientModuleID, String
requestString) {
+ assert clientModuleID != null;
+ assert requestString != null;
this.requestMethod = requestMethod;
+ this.clientModuleID = clientModuleID;
this.requestString = requestString;
}
@@ -82,14 +79,6 @@
public String getRequestString(){
return requestString;
- }
-
- public void setRequestMethod(int requestMethod){
- this.requestMethod = requestMethod;
- }
-
- public void setRequestString(String requestString){
- this.requestString = requestString;
}
public String getClientModuleID() {
