maguro 2004/07/30 15:03:44
Modified: modules/core/src/java/org/openejb/client
AuthenticationResponse.java EJBHomeHandle.java
EJBHomeHandler.java EJBHomeProxyHandle.java
EJBInvocationHandler.java EJBObjectHandle.java
EJBObjectHandler.java EJBObjectProxyHandle.java
EntityEJBHomeHandler.java
EntityEJBObjectHandler.java JNDIContext.java
StatefulEJBHomeHandler.java
StatefulEJBObjectHandler.java
StatelessEJBHomeHandler.java
StatelessEJBObjectHandler.java
Log:
Client's identity should be associated with the thread, not the JNDI context.
Revision Changes Path
1.2 +1 -20
openejb/modules/core/src/java/org/openejb/client/AuthenticationResponse.java
Index: AuthenticationResponse.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/AuthenticationResponse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AuthenticationResponse.java 1 Mar 2004 07:14:43 -0000 1.1
+++ AuthenticationResponse.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -55,7 +55,6 @@
public class AuthenticationResponse implements Response {
private transient int responseCode = -1;
- private transient ClientMetaData identity;
private transient ServerMetaData server;
public AuthenticationResponse(){
@@ -69,10 +68,6 @@
return responseCode;
}
- public ClientMetaData getIdentity(){
- return identity;
- }
-
public ServerMetaData getServer(){
return server;
}
@@ -81,10 +76,6 @@
this.responseCode = responseCode;
}
- public void setIdentity(ClientMetaData identity){
- this.identity = identity;
- }
-
public void setServer(ServerMetaData server){
this.server = server;
}
@@ -104,13 +95,7 @@
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
responseCode = in.readByte();
switch (responseCode) {
- case AUTH_GRANTED:
- identity = new ClientMetaData();
- identity.readExternal(in);
- break;
case AUTH_REDIRECT:
- identity = new ClientMetaData();
- identity.readExternal(in);
server = new ServerMetaData();
server.readExternal( in );
break;
@@ -137,11 +122,7 @@
public void writeExternal(ObjectOutput out) throws IOException {
out.writeByte((byte)responseCode);
switch (responseCode) {
- case AUTH_GRANTED:
- identity.writeExternal(out);
- break;
case AUTH_REDIRECT:
- identity.writeExternal(out);
server.writeExternal( out );
break;
case AUTH_DENIED:
1.2 +2 -4
openejb/modules/core/src/java/org/openejb/client/EJBHomeHandle.java
Index: EJBHomeHandle.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EJBHomeHandle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBHomeHandle.java 1 Mar 2004 07:14:43 -0000 1.1
+++ EJBHomeHandle.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -91,8 +91,6 @@
public void writeExternal(ObjectOutput out) throws IOException{
// Write the full proxy data
- handler.client.writeExternal( out );
-
EJBMetaDataImpl ejb = handler.ejb;
out.writeObject( ejb.homeClass );
out.writeObject( ejb.remoteClass );
@@ -125,7 +123,7 @@
server.readExternal( in );
- handler = EJBHomeHandler.createEJBHomeHandler(ejb, server, client);
+ handler = EJBHomeHandler.createEJBHomeHandler(ejb, server);
ejbHomeProxy = handler.createEJBHomeProxy();
}
1.4 +11 -9
openejb/modules/core/src/java/org/openejb/client/EJBHomeHandler.java
Index: EJBHomeHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EJBHomeHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EJBHomeHandler.java 4 Jun 2004 22:19:32 -0000 1.3
+++ EJBHomeHandler.java 30 Jul 2004 19:03:44 -0000 1.4
@@ -55,6 +55,8 @@
import org.openejb.EJBComponentType;
+import org.apache.geronimo.security.ContextManager;
+
/**
* Handles invocations from an EJBHomeProxy.
@@ -73,25 +75,25 @@
public EJBHomeHandler() {
}
- public EJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client) {
- super(ejb, server, client);
+ public EJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server) {
+ super(ejb, server);
}
- public static EJBHomeHandler createEJBHomeHandler(EJBMetaDataImpl ejb,
ServerMetaData server, ClientMetaData client) {
+ public static EJBHomeHandler createEJBHomeHandler(EJBMetaDataImpl ejb,
ServerMetaData server) {
switch (ejb.type) {
case EJBComponentType.BMP_ENTITY:
case EJBComponentType.CMP_ENTITY:
- return new EntityEJBHomeHandler(ejb, server, client);
+ return new EntityEJBHomeHandler(ejb, server);
case EJBComponentType.STATEFUL:
- return new StatefulEJBHomeHandler(ejb, server, client);
+ return new StatefulEJBHomeHandler(ejb, server);
case EJBComponentType.STATELESS:
- return new StatelessEJBHomeHandler(ejb, server, client);
+ return new StatelessEJBHomeHandler(ejb, server);
}
return null;
@@ -212,7 +214,7 @@
protected Object create(Method method, Object[] args, Object proxy) throws
Throwable {
EJBRequest req = new EJBRequest(EJB_HOME_CREATE);
- req.setClientIdentity(client.getClientIdentity());
+ req.setClientIdentity(ContextManager.getThreadPrincipal());
req.setContainerCode(ejb.deploymentCode);
req.setContainerID(ejb.deploymentID);
req.setMethodInstance(method);
@@ -230,7 +232,7 @@
case EJB_OK:
// Create the EJBObject proxy
Object primKey = res.getResult();
- EJBObjectHandler handler =
EJBObjectHandler.createEJBObjectHandler(ejb, server, client, primKey);
+ EJBObjectHandler handler =
EJBObjectHandler.createEJBObjectHandler(ejb, server, primKey);
handler.setEJBHomeProxy((EJBHomeProxy) proxy);
//TODO:1: Add the proxy to the handler registry
return handler.createEJBObjectProxy();
1.2 +2 -4
openejb/modules/core/src/java/org/openejb/client/EJBHomeProxyHandle.java
Index: EJBHomeProxyHandle.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EJBHomeProxyHandle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBHomeProxyHandle.java 1 Mar 2004 07:14:43 -0000 1.1
+++ EJBHomeProxyHandle.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -70,8 +70,6 @@
*/
public void writeExternal(ObjectOutput out) throws IOException{
// Write the full proxy data
- handler.client.writeExternal( out );
-
EJBMetaDataImpl ejb = handler.ejb;
out.writeObject( ejb.homeClass );
out.writeObject( ejb.remoteClass );
@@ -105,7 +103,7 @@
server.readExternal( in );
- handler = EJBHomeHandler.createEJBHomeHandler(ejb, server, client);
+ handler = EJBHomeHandler.createEJBHomeHandler(ejb, server);
// handler.primaryKey = in.readObject();
handler.ejb.ejbHomeProxy = handler.createEJBHomeProxy();
1.2 +5 -12
openejb/modules/core/src/java/org/openejb/client/EJBInvocationHandler.java
Index: EJBInvocationHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EJBInvocationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBInvocationHandler.java 1 Mar 2004 07:14:43 -0000 1.1
+++ EJBInvocationHandler.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -128,12 +128,7 @@
* send invokations to the EJB Server.
*/
protected transient ServerMetaData server;
- /**
- * The ClientMetaData object containing the information aquired from
- * the server after authenticating.
- */
- protected transient ClientMetaData client;
-
+
/**
* The primary key of the bean deployment or null if the deployment
* is a bean type that doesn't require a primary key
@@ -146,14 +141,13 @@
public EJBInvocationHandler(){
}
- public EJBInvocationHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client){
+ public EJBInvocationHandler(EJBMetaDataImpl ejb, ServerMetaData server){
this.ejb = ejb;
this.server = server;
- this.client = client;
}
- public EJBInvocationHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client, Object primaryKey){
- this(ejb, server, client);
+ public EJBInvocationHandler(EJBMetaDataImpl ejb, ServerMetaData server, Object
primaryKey){
+ this(ejb, server);
this.primaryKey = primaryKey;
}
@@ -222,7 +216,6 @@
*/
protected void invalidateReference(){
this.server = null;
- this.client = null;
this.ejb = null;
this.inProxyMap = false;
this.isInvalidReference = true;
1.2 +2 -4
openejb/modules/core/src/java/org/openejb/client/EJBObjectHandle.java
Index: EJBObjectHandle.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EJBObjectHandle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBObjectHandle.java 1 Mar 2004 07:14:43 -0000 1.1
+++ EJBObjectHandle.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -103,8 +103,6 @@
public void writeExternal(ObjectOutput out) throws IOException{
// Write the full proxy data
- handler.client.writeExternal( out );
-
EJBMetaDataImpl ejb = handler.ejb;
out.writeObject( ejb.homeClass );
out.writeObject( ejb.remoteClass );
@@ -139,7 +137,7 @@
server.readExternal( in );
Object primaryKey = in.readObject();
- handler = EJBObjectHandler.createEJBObjectHandler(ejb, server, client,
primaryKey);
+ handler = EJBObjectHandler.createEJBObjectHandler(ejb, server, primaryKey);
ejbObjectProxy = handler.createEJBObjectProxy();
}
1.4 +13 -11
openejb/modules/core/src/java/org/openejb/client/EJBObjectHandler.java
Index: EJBObjectHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EJBObjectHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EJBObjectHandler.java 4 Jun 2004 22:19:32 -0000 1.3
+++ EJBObjectHandler.java 30 Jul 2004 19:03:44 -0000 1.4
@@ -50,6 +50,8 @@
import org.openejb.EJBComponentType;
+import org.apache.geronimo.security.ContextManager;
+
/**
* @since 11/25/2001
@@ -84,33 +86,33 @@
public EJBObjectHandler() {
}
- public EJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client) {
- super(ejb, server, client);
+ public EJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server) {
+ super(ejb, server);
}
- public EJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client, Object primaryKey) {
- super(ejb, server, client, primaryKey);
+ public EJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server, Object
primaryKey) {
+ super(ejb, server, primaryKey);
}
protected void setEJBHomeProxy(EJBHomeProxy ejbHome) {
this.ejbHome = ejbHome;
}
- public static EJBObjectHandler createEJBObjectHandler(EJBMetaDataImpl ejb,
ServerMetaData server, ClientMetaData client, Object primaryKey) {
+ public static EJBObjectHandler createEJBObjectHandler(EJBMetaDataImpl ejb,
ServerMetaData server, Object primaryKey) {
switch (ejb.type) {
case EJBComponentType.BMP_ENTITY:
case EJBComponentType.CMP_ENTITY:
- return new EntityEJBObjectHandler(ejb, server, client, primaryKey);
+ return new EntityEJBObjectHandler(ejb, server, primaryKey);
case EJBComponentType.STATEFUL:
- return new StatefulEJBObjectHandler(ejb, server, client,
primaryKey);
+ return new StatefulEJBObjectHandler(ejb, server, primaryKey);
case EJBComponentType.STATELESS:
- return new StatelessEJBObjectHandler(ejb, server, client,
primaryKey);
+ return new StatelessEJBObjectHandler(ejb, server, primaryKey);
}
return null;
}
@@ -226,7 +228,7 @@
protected Object getEJBHome(Method method, Object[] args, Object proxy) throws
Throwable {
if (ejbHome == null) {
- ejbHome = EJBHomeHandler.createEJBHomeHandler(ejb, server,
client).createEJBHomeProxy();
+ ejbHome = EJBHomeHandler.createEJBHomeHandler(ejb,
server).createEJBHomeProxy();
}
return ejbHome;
}
@@ -250,7 +252,7 @@
req.setMethodParameters(args);
req.setMethodInstance(method);
- req.setClientIdentity(client.getClientIdentity());
+ req.setClientIdentity(ContextManager.getThreadPrincipal());
req.setContainerCode(ejb.deploymentCode);
req.setContainerID(ejb.deploymentID);
req.setPrimaryKey(primaryKey);
1.2 +2 -4
openejb/modules/core/src/java/org/openejb/client/EJBObjectProxyHandle.java
Index: EJBObjectProxyHandle.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EJBObjectProxyHandle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBObjectProxyHandle.java 1 Mar 2004 07:14:43 -0000 1.1
+++ EJBObjectProxyHandle.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -70,8 +70,6 @@
*/
public void writeExternal(ObjectOutput out) throws IOException{
// Write the full proxy data
- handler.client.writeExternal( out );
-
EJBMetaDataImpl ejb = handler.ejb;
out.writeObject( ejb.homeClass );
out.writeObject( ejb.remoteClass );
@@ -106,7 +104,7 @@
server.readExternal( in );
Object primaryKey = in.readObject();
- handler = EJBObjectHandler.createEJBObjectHandler(ejb, server, client,
primaryKey);
+ handler = EJBObjectHandler.createEJBObjectHandler(ejb, server, primaryKey);
}
1.2 +9 -7
openejb/modules/core/src/java/org/openejb/client/EntityEJBHomeHandler.java
Index: EntityEJBHomeHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EntityEJBHomeHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityEJBHomeHandler.java 1 Mar 2004 07:14:43 -0000 1.1
+++ EntityEJBHomeHandler.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -50,6 +50,8 @@
import javax.ejb.EJBObject;
import javax.ejb.Handle;
+import org.apache.geronimo.security.ContextManager;
+
/**
*
* @since 11/25/2001
@@ -59,8 +61,8 @@
public EntityEJBHomeHandler(){
}
- public EntityEJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client){
- super(ejb, server, client);
+ public EntityEJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server){
+ super(ejb, server);
}
/**
@@ -121,7 +123,7 @@
req.setMethodParameters( args );
req.setMethodInstance( method );
- req.setClientIdentity( client.getClientIdentity() );
+ req.setClientIdentity( ContextManager.getThreadPrincipal() );
req.setContainerCode( ejb.deploymentCode );
req.setContainerID( ejb.deploymentID );
req.setPrimaryKey( primaryKey );
@@ -142,7 +144,7 @@
case EJB_OK_FOUND:
primKey = res.getResult();
- handler =
EJBObjectHandler.createEJBObjectHandler(ejb,server,client,primKey);
+ handler = EJBObjectHandler.createEJBObjectHandler(ejb,server,primKey);
handler.setEJBHomeProxy((EJBHomeProxy)proxy);
registerHandler(ejb.deploymentID+":"+primKey, handler);
return handler.createEJBObjectProxy();
@@ -156,7 +158,7 @@
for (int i=0; i < primaryKeys.length; i++){
primKey = primaryKeys[i];
- handler =
EJBObjectHandler.createEJBObjectHandler(ejb,server,client,primKey);
+ handler =
EJBObjectHandler.createEJBObjectHandler(ejb,server,primKey);
handler.setEJBHomeProxy((EJBHomeProxy)proxy);
registerHandler(ejb.deploymentID+":"+primKey, handler);
primaryKeys[i] = handler.createEJBObjectProxy();
@@ -168,7 +170,7 @@
for (int i=0; i < primaryKeys.length; i++){
primKey = primaryKeys[i];
- handler =
EJBObjectHandler.createEJBObjectHandler(ejb,server,client,primKey);
+ handler =
EJBObjectHandler.createEJBObjectHandler(ejb,server,primKey);
handler.setEJBHomeProxy((EJBHomeProxy)proxy);
registerHandler(ejb.deploymentID+":"+primKey, handler);
primaryKeys[i] = handler.createEJBObjectProxy();
1.2 +8 -6
openejb/modules/core/src/java/org/openejb/client/EntityEJBObjectHandler.java
Index: EntityEJBObjectHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EntityEJBObjectHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityEJBObjectHandler.java 1 Mar 2004 07:14:43 -0000 1.1
+++ EntityEJBObjectHandler.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -47,6 +47,8 @@
import java.lang.reflect.Method;
import java.rmi.RemoteException;
+import org.apache.geronimo.security.ContextManager;
+
/**
* This InvocationHandler and its proxy are serializable and can be used by
* HomeHandle, Handle, and MetaData to persist and revive handles. It maintains
@@ -60,12 +62,12 @@
public EntityEJBObjectHandler(){
}
- public EntityEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client){
- super(ejb, server, client);
+ public EntityEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server){
+ super(ejb, server);
}
- public EntityEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client, Object primaryKey){
- super(ejb, server, client, primaryKey);
+ public EntityEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
Object primaryKey){
+ super(ejb, server, primaryKey);
registryId = ejb.deploymentID+":"+primaryKey;
registerHandler( registryId, this );
}
@@ -117,7 +119,7 @@
req.setMethodParameters( args );
req.setMethodInstance( method );
- req.setClientIdentity( client.getClientIdentity() );
+ req.setClientIdentity( ContextManager.getThreadPrincipal() );
req.setContainerCode( ejb.deploymentCode );
req.setContainerID( ejb.deploymentID );
req.setPrimaryKey( primaryKey );
1.2 +2 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNDIContext.java 1 Mar 2004 07:14:43 -0000 1.1
+++ JNDIContext.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -68,7 +68,6 @@
private transient String tail = "/";
private transient ServerMetaData server;
- private transient ClientMetaData client;
private transient Hashtable env;
/**
@@ -96,7 +95,6 @@
public JNDIContext(JNDIContext that){
this.tail = that.tail;
this.server = that.server;
- this.client = that.client;
this.env = (Hashtable)that.env.clone();
}
@@ -209,11 +207,7 @@
}
switch (res.getResponseCode()) {
- case AUTH_GRANTED:
- client = res.getIdentity();
- break;
case AUTH_REDIRECT:
- client = res.getIdentity();
server = res.getServer();
break;
case AUTH_DENIED:
@@ -224,7 +218,7 @@
// Construct a new handler and proxy.
public EJBHomeProxy createEJBHomeProxy(EJBMetaDataImpl ejbData){
- EJBHomeHandler handler = EJBHomeHandler.createEJBHomeHandler(ejbData,
server, client);
+ EJBHomeHandler handler = EJBHomeHandler.createEJBHomeHandler(ejbData,
server);
EJBHomeProxy proxy = handler.createEJBHomeProxy();
handler.ejb.ejbHomeProxy = proxy;
1.3 +6 -5
openejb/modules/core/src/java/org/openejb/client/StatefulEJBHomeHandler.java
Index: StatefulEJBHomeHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/StatefulEJBHomeHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatefulEJBHomeHandler.java 10 Apr 2004 06:51:38 -0000 1.2
+++ StatefulEJBHomeHandler.java 30 Jul 2004 19:03:44 -0000 1.3
@@ -45,9 +45,10 @@
package org.openejb.client;
import java.lang.reflect.Method;
-import java.rmi.RemoteException;
import javax.ejb.RemoveException;
+import org.apache.geronimo.security.ContextManager;
+
/**
* This InvocationHandler and its proxy are serializable and can be used by
* HomeHandle, Handle, and MetaData to persist and revive handles. It maintains
@@ -60,8 +61,8 @@
public StatefulEJBHomeHandler(){
}
- public StatefulEJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client){
- super(ejb, server, client);
+ public StatefulEJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server){
+ super(ejb, server);
}
/**
@@ -137,7 +138,7 @@
}
EJBRequest req = new EJBRequest( EJB_HOME_REMOVE_BY_HANDLE );
- req.setClientIdentity( client.getClientIdentity() );
+ req.setClientIdentity( ContextManager.getThreadPrincipal() );
req.setContainerCode( handler.ejb.deploymentCode );
req.setContainerID( handler.ejb.deploymentID );
req.setMethodInstance( method );
1.2 +8 -6
openejb/modules/core/src/java/org/openejb/client/StatefulEJBObjectHandler.java
Index: StatefulEJBObjectHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/StatefulEJBObjectHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StatefulEJBObjectHandler.java 1 Mar 2004 07:14:43 -0000 1.1
+++ StatefulEJBObjectHandler.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -47,6 +47,8 @@
import java.lang.reflect.Method;
import java.rmi.RemoteException;
+import org.apache.geronimo.security.ContextManager;
+
/**
*
* @since 11/25/2001
@@ -56,12 +58,12 @@
public StatefulEJBObjectHandler() {
}
- public StatefulEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client){
- super(ejb, server, client);
+ public StatefulEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server){
+ super(ejb, server);
}
- public StatefulEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client, Object primaryKey){
- super(ejb, server, client, primaryKey);
+ public StatefulEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
Object primaryKey){
+ super(ejb, server, primaryKey);
registerHandler( primaryKey, this );
}
@@ -135,7 +137,7 @@
protected Object remove(Method method, Object[] args, Object proxy) throws
Throwable{
EJBRequest req = new EJBRequest( EJB_OBJECT_REMOVE );
- req.setClientIdentity( client.getClientIdentity() );
+ req.setClientIdentity( ContextManager.getThreadPrincipal() );
req.setContainerCode( ejb.deploymentCode );
req.setContainerID( ejb.deploymentID );
req.setMethodInstance( method );
1.3 +3 -3
openejb/modules/core/src/java/org/openejb/client/StatelessEJBHomeHandler.java
Index: StatelessEJBHomeHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/StatelessEJBHomeHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatelessEJBHomeHandler.java 10 Apr 2004 06:51:38 -0000 1.2
+++ StatelessEJBHomeHandler.java 30 Jul 2004 19:03:44 -0000 1.3
@@ -59,8 +59,8 @@
public StatelessEJBHomeHandler(){
}
- public StatelessEJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client){
- super(ejb, server, client);
+ public StatelessEJBHomeHandler(EJBMetaDataImpl ejb, ServerMetaData server){
+ super(ejb, server);
}
/**
1.2 +5 -5
openejb/modules/core/src/java/org/openejb/client/StatelessEJBObjectHandler.java
Index: StatelessEJBObjectHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/StatelessEJBObjectHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StatelessEJBObjectHandler.java 1 Mar 2004 07:14:43 -0000 1.1
+++ StatelessEJBObjectHandler.java 30 Jul 2004 19:03:44 -0000 1.2
@@ -64,12 +64,12 @@
public StatelessEJBObjectHandler(){
}
- public StatelessEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client){
- super(ejb, server, client);
+ public StatelessEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server){
+ super(ejb, server);
}
- public StatelessEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
ClientMetaData client, Object primaryKey){
- super(ejb, server, client, primaryKey);
+ public StatelessEJBObjectHandler(EJBMetaDataImpl ejb, ServerMetaData server,
Object primaryKey){
+ super(ejb, server, primaryKey);
}
// This should only be created at the server side and should not reference
Container
