[jboss-cvs] jboss-seam/bootstrap-new/deploy ...

Peter Muir peter at bleepbleep.org.uk
Mon Dec 3 15:19:13 EST 2007


  User: pmuir   
  Date: 07/12/03 15:19:13

  Modified:    bootstrap-new/deploy  ejb3-interceptors-aop.xml
  Log:
  Update for new jboss
  
  Revision  Changes    Path
  1.2       +92 -59    jboss-seam/bootstrap-new/deploy/ejb3-interceptors-aop.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ejb3-interceptors-aop.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap-new/deploy/ejb3-interceptors-aop.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ejb3-interceptors-aop.xml	14 Nov 2007 11:42:04 -0000	1.1
  +++ ejb3-interceptors-aop.xml	3 Dec 2007 20:19:13 -0000	1.2
  @@ -8,6 +8,7 @@
      <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
      <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
      <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
  +   <interceptor class="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor" scope="PER_VM"/>
      <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
   
      <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
  @@ -48,7 +49,7 @@
      </stack>
   
      <stack name="ClusteredStatelessSessionClientInterceptors">
  -      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
  +      <interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/>
         <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
         <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
         <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
  @@ -56,7 +57,7 @@
      </stack>
   
      <stack name="ClusteredStatefulSessionClientInterceptors">
  -      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
  +      <interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/>
         <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
         <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
         <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
  @@ -89,13 +90,13 @@
            <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
            <interceptor-ref name="Basic Authorization"/>
         </bind>
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
            <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->*(..))">
  @@ -106,8 +107,11 @@
            <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
  -         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
  +         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
  +      </annotation>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
         </annotation>
      </domain>
   
  @@ -117,13 +121,13 @@
            <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
            <interceptor-ref name="JACC Authorization"/>
         </bind>
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
            <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->*(..))">
  @@ -134,8 +138,11 @@
            <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
  -         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
  +         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
  +      </annotation>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
         </annotation>
      </domain>
   
  @@ -145,13 +152,13 @@
            <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
            <interceptor-ref name="Basic Authorization"/>
         </bind>
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
            <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
  @@ -169,35 +176,42 @@
         <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
  -         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
   
  -      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
            <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
         </bind>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
  -         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
  +
  +      <bind pointcut="execution(public * *->*(..))">
  +         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
  +      </bind>
  +
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
  +         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
  +      </annotation>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
         </annotation>
      </domain>
   
      <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
         <!-- NON Clustered cache configuration -->
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
         </annotation>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
         </annotation>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
         </annotation>
   
         <!-- Clustered cache configuration -->
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
         </annotation>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
         </annotation>
      </domain>
   
  @@ -207,13 +221,13 @@
            <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
            <interceptor-ref name="JACC Authorization"/>
         </bind>
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
            <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
  @@ -234,45 +248,53 @@
            <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
   
  -      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
            <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
         </bind>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
  -         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
  +         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
  +      </annotation>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
         </annotation>
   
         <!-- NON Clustered cache configuration -->
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
         </annotation>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
         </annotation>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
         </annotation>
   
         <!-- Clustered cache configuration -->
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
         </annotation>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
  -         @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
  +         @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
         </annotation>
      </domain>
   
      <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
         <!-- NON Clustered cache configuration -->
  -      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
  -         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache)">
  +         @org.jboss.ejb3.annotation.Cache ("NoPassivationCache")
  +      </annotation>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
         </annotation>
   
      </domain>
   
      <domain name="Message Driven Bean">
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
  +         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
  +      <!-- TODO: Authorization? -->
         <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
  @@ -280,13 +302,16 @@
            <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
  -         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
  +         @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
  +      </annotation>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
         </annotation>
      </domain>
   
      <domain name="Consumer Bean">
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->*(..))">
  @@ -295,14 +320,17 @@
            <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
            <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
         </bind>
  -      <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
  +      <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.ejb3.annotation.CurrentMessage(..)) OR hasfield(* *->@org.jboss.ejb3.annotation.CurrentMessage))">
            <interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
  -      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
  -         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
  +         @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
  +      </annotation>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
         </annotation>
      </domain>
   
  @@ -314,10 +342,10 @@
         <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
            <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
            <interceptor-ref name="Basic Authorization"/>
         </bind>
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->*(..))">
  @@ -329,6 +357,9 @@
         <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
            <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
  +      </annotation>
      </domain>
   
      <domain name="JACC Service Bean">
  @@ -339,10 +370,10 @@
         <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
            <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
         </bind>
  -      <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
  +      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
            <interceptor-ref name="Basic Authorization"/>
         </bind>
  -      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
  +      <bind pointcut="execution(public * *->*(..))">
            <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
         </bind>
         <bind pointcut="execution(public * *->*(..))">
  @@ -354,7 +385,9 @@
         <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
            <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
         </bind>
  +      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
  +         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
  +      </annotation>
      </domain>
   
  -
   </aop>
  \ No newline at end of file
  
  
  



More information about the jboss-cvs-commits mailing list