[openejb-scm] openejb/modules/core/src/java/org/openejb AbstractInterceptorBuilder.java InterceptorBuilder.java

[djencks]

djencks     2005/04/18 15:04:59

  Modified:    modules/core/src/java/org/openejb
                        AbstractInterceptorBuilder.java
                        InterceptorBuilder.java
  Log:

  GERONIMO-634 Policy context per ejb module, not per ejb
  
  Revision  Changes    Path
  1.12      +14 -9     
openejb/modules/core/src/java/org/openejb/AbstractInterceptorBuilder.java
  
  Index: AbstractInterceptorBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/AbstractInterceptorBuilder.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractInterceptorBuilder.java   26 Jan 2005 23:27:58 -0000      1.11
  +++ AbstractInterceptorBuilder.java   18 Apr 2005 19:04:58 -0000      1.12
  @@ -68,22 +68,23 @@
       protected Object containerId;
       protected String ejbName;
       protected VirtualOperation[] vtable;
  -    protected Subject runAs;
       protected Context componentContext;
       protected TransactionPolicyManager transactionPolicyManager;
       protected PermissionManager permissionManager;
  +    protected Subject runAs;
       protected boolean doAsCurrentCaller = false;
       protected boolean securityEnabled = false;
       protected boolean useContextHandler = false;
  +    protected String policyContextId;
       protected transient TransactionContextManager transactionContextManager;
       protected transient TrackedConnectionAssociator 
trackedConnectionAssociator;
       protected transient InstancePool instancePool;
       protected InstanceCache instanceCache;
       protected InstanceFactory instanceFactory;
   
  -    public void setContainerId(Object containerId) {
  -        assert (containerId != null) : "containerId is null";
  -        this.containerId = containerId;
  +    public void setContainerId(Object containerID) {
  +        assert (containerID != null) : "containerID is null!";
  +        this.containerId = containerID;
       }
   
       public void setEJBName(String ejbName) {
  @@ -96,10 +97,6 @@
           this.vtable = vtable;
       }
   
  -    public void setRunAs(Subject runAs) {
  -        this.runAs = runAs;
  -    }
  -
       public void setComponentContext(Context componentContext) {
           assert (componentContext != null) : "componentContext is null";
           this.componentContext = componentContext;
  @@ -117,6 +114,14 @@
   
       public void setDoAsCurrentCaller(boolean doAsCurrentCaller) {
           this.doAsCurrentCaller = doAsCurrentCaller;
  +    }
  +
  +    public void setPolicyContextId(String policyContextID) {
  +        this.policyContextId = policyContextID;
  +    }
  +
  +    public void setRunAs(Subject runAs) {
  +        this.runAs = runAs;
       }
   
       public void setSecurityEnabled(boolean securityEnabled) {
  
  
  
  1.11      +4 -2      
openejb/modules/core/src/java/org/openejb/InterceptorBuilder.java
  
  Index: InterceptorBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/InterceptorBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- InterceptorBuilder.java   26 Jan 2005 23:27:58 -0000      1.10
  +++ InterceptorBuilder.java   18 Apr 2005 19:04:58 -0000      1.11
  @@ -35,7 +35,7 @@
    * @version $Revision$ $Date$
    */
   public interface InterceptorBuilder extends Serializable {
  -    void setContainerId(Object contextId);
  +    void setPolicyContextId(String policyContextID);
   
       void setEJBName(String ejbName);
   
  @@ -66,4 +66,6 @@
       void setInstanceFactory(InstanceFactory instanceFactory);
   
       TwoChains buildInterceptorChains();
  +
  +    void setContainerId(Object containerID);
   }