User: starksm
Date: 02/03/03 23:39:02
Modified: src/main/org/jboss/ejb Tag: Branch_2_4
EnterpriseContext.java EntityEnterpriseContext.java
InstancePool.java
MessageDrivenEnterpriseContext.java
StatefulSessionEnterpriseContext.java
StatelessSessionEnterpriseContext.java
Log:
Undo the fix for Bug#523861 as it was not valid.
Revision Changes Path
No revision
No revision
1.31.2.6 +2 -3 jboss/src/main/org/jboss/ejb/EnterpriseContext.java
Index: EnterpriseContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
retrieving revision 1.31.2.5
retrieving revision 1.31.2.6
diff -u -r1.31.2.5 -r1.31.2.6
--- EnterpriseContext.java 3 Mar 2002 06:51:06 -0000 1.31.2.5
+++ EnterpriseContext.java 4 Mar 2002 07:39:02 -0000 1.31.2.6
@@ -47,7 +47,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
- * @version $Revision: 1.31.2.5 $
+ * @version $Revision: 1.31.2.6 $
*
* Revisions:
* 2001/06/29: marcf
@@ -97,13 +97,12 @@
// Constructors --------------------------------------------------
- public EnterpriseContext(Object instance, Container con, Principal createCaller)
+ public EnterpriseContext(Object instance, Container con)
{
this.instance = instance;
this.con = con;
- this.principal = createCaller;
}
-
+
// Public --------------------------------------------------------
public Object getInstance()
1.18.4.3 +3 -3 jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java
Index: EntityEnterpriseContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java,v
retrieving revision 1.18.4.2
retrieving revision 1.18.4.3
diff -u -r1.18.4.2 -r1.18.4.3
--- EntityEnterpriseContext.java 3 Mar 2002 06:51:06 -0000 1.18.4.2
+++ EntityEnterpriseContext.java 4 Mar 2002 07:39:02 -0000 1.18.4.3
@@ -7,7 +7,7 @@
package org.jboss.ejb;
import java.rmi.RemoteException;
-import java.security.Principal;
+
import javax.ejb.EJBContext;
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
@@ -28,7 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Rickard �berg</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel OConnor</a>
- * @version $Revision: 1.18.4.2 $
+ * @version $Revision: 1.18.4.3 $
*
* <p><b>Revisions</b>
* <p>20010703 marcf
@@ -70,10 +70,10 @@
// Constructors --------------------------------------------------
- public EntityEnterpriseContext(Object instance, Container con, Principal
createCaller)
+ public EntityEnterpriseContext(Object instance, Container con)
throws RemoteException
{
- super(instance, con, createCaller);
+ super(instance, con);
ctx = new EntityContextImpl();
((EntityBean)instance).setEntityContext(ctx);
}
1.3.6.4 +9 -18 jboss/src/main/org/jboss/ejb/InstancePool.java
Index: InstancePool.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/InstancePool.java,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -r1.3.6.3 -r1.3.6.4
--- InstancePool.java 3 Mar 2002 06:51:06 -0000 1.3.6.3
+++ InstancePool.java 4 Mar 2002 07:39:02 -0000 1.3.6.4
@@ -6,14 +6,12 @@
*/
package org.jboss.ejb;
-import java.security.Principal;
-
/**
* Interface for bean instance Pools.
*
+ * @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @author [EMAIL PROTECTED]
- * @version $Revision: 1.3.6.3 $
+ * @version $Revision: 1.3.6.4 $
*
* <p><b>Revisions:</b>
* <p><b>20011208 Vincent Harcq:</b>
@@ -36,30 +34,23 @@
// Public --------------------------------------------------------
/**
- * Add an instance in the Pool.
- * Is used by the TimedInstancePoolFeeder thread to create instances ready for
use by
- * the interceptor.
- * Since this can result in an ejbCreate invocation on a bean instance,
- * the caller principal must be associated with the EnterpriseContext
- * before calling ejbCreate in order for ctx.getCallerPrincipal() to
- * work.
+ * Add an instance in the Pool.
+ * Is used by the TimedInstancePoolFeeder thread to create instances ready for
use by
+ * the interceptor.
+ *
* @exception Exception when an Instance can not be instantiated
*/
- public void add(Principal callerPrincipal)
+ public void add()
throws Exception;
/**
- * Get an instance without identity.
- * Can be used by finders and create-methods, or stateless beans.
- * Since this can result in an ejbCreate invocation on a bean instance,
- * the caller principal must be associated with the EnterpriseContext
- * before calling ejbCreate in order for ctx.getCallerPrincipal() to
- * work.
+ * Get an instance without identity.
+ * Can be used by finders and create-methods, or stateless beans
*
* @return Context /w instance
* @exception RemoteException
*/
- public EnterpriseContext get(Principal callerPrincipal)
+ public EnterpriseContext get()
throws Exception;
/**
1.3.6.5 +2 -3 jboss/src/main/org/jboss/ejb/MessageDrivenEnterpriseContext.java
Index: MessageDrivenEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/MessageDrivenEnterpriseContext.java,v
retrieving revision 1.3.6.4
retrieving revision 1.3.6.5
diff -u -r1.3.6.4 -r1.3.6.5
--- MessageDrivenEnterpriseContext.java 3 Mar 2002 06:51:06 -0000 1.3.6.4
+++ MessageDrivenEnterpriseContext.java 4 Mar 2002 07:39:02 -0000 1.3.6.5
@@ -31,7 +31,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Antman</a>.
* @author <a href="mailto:[EMAIL PROTECTED]">Rickard �berg</a>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.3.6.4 $
+ * @version $Revision: 1.3.6.5 $
*/
public class MessageDrivenEnterpriseContext
extends EnterpriseContext
@@ -46,11 +46,10 @@
// Constructors --------------------------------------------------
- public MessageDrivenEnterpriseContext(Object instance, Container con,
- Principal createCaller)
+ public MessageDrivenEnterpriseContext(Object instance, Container con)
throws Exception
{
- super(instance, con, createCaller);
+ super(instance, con);
ctx = new MessageDrivenContextImpl();
((MessageDrivenBean)instance).setMessageDrivenContext(ctx);
1.10.4.3 +4 -5
jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java
Index: StatefulSessionEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java,v
retrieving revision 1.10.4.2
retrieving revision 1.10.4.3
diff -u -r1.10.4.2 -r1.10.4.3
--- StatefulSessionEnterpriseContext.java 3 Mar 2002 06:51:06 -0000
1.10.4.2
+++ StatefulSessionEnterpriseContext.java 4 Mar 2002 07:39:02 -0000
1.10.4.3
@@ -8,7 +8,7 @@
import java.io.IOException;
import java.rmi.RemoteException;
-import java.security.Principal;
+
import javax.ejb.EJBContext;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalObject;
@@ -23,7 +23,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author Daniel OConnor ([EMAIL PROTECTED])
- * @version $Revision: 1.10.4.2 $
+ * @version $Revision: 1.10.4.3 $
*/
public class StatefulSessionEnterpriseContext
extends EnterpriseContext
@@ -40,11 +40,10 @@
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public StatefulSessionEnterpriseContext(Object instance, Container con,
- Principal createCaller)
- throws RemoteException
+ public StatefulSessionEnterpriseContext(Object instance, Container con)
+ throws RemoteException
{
- super(instance, con, createCaller);
+ super(instance, con);
ctx = new StatefulSessionContextImpl();
((SessionBean)instance).setSessionContext(ctx);
}
1.8.4.2 +3 -4
jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java
Index: StatelessSessionEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -r1.8.4.1 -r1.8.4.2
--- StatelessSessionEnterpriseContext.java 3 Mar 2002 06:51:06 -0000 1.8.4.1
+++ StatelessSessionEnterpriseContext.java 4 Mar 2002 07:39:02 -0000 1.8.4.2
@@ -10,7 +10,7 @@
import java.lang.reflect.InvocationTargetException;
import java.rmi.RemoteException;
import java.rmi.ServerException;
-import java.security.Principal;
+
import javax.ejb.EJBContext;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalObject;
@@ -25,7 +25,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.8.4.1 $
+ * @version $Revision: 1.8.4.2 $
*/
public class StatelessSessionEnterpriseContext
extends EnterpriseContext
@@ -40,11 +40,10 @@
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public StatelessSessionEnterpriseContext(Object instance, Container con,
- Principal createCaller)
+ public StatelessSessionEnterpriseContext(Object instance, Container con)
throws Exception
{
- super(instance, con, createCaller);
+ super(instance, con);
ctx = new SessionContextImpl();
((SessionBean)instance).setSessionContext(ctx);
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development