[jboss-cvs] JBossCache/src/resources ...

[Ben Wang]

  User: bwang   
  Date: 06/07/13 00:27:26

  Modified:    src/resources  jboss-aop.xml
  Log:
  Changed the interceptor stack to per-method base since 1) methods are few, 2) flexible configuration.
  
  Revision  Changes    Path
  1.13      +36 -20    JBossCache/src/resources/jboss-aop.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jboss-aop.xml
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/resources/jboss-aop.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- jboss-aop.xml	12 Jul 2006 13:27:29 -0000	1.12
  +++ jboss-aop.xml	13 Jul 2006 04:27:26 -0000	1.13
  @@ -102,9 +102,7 @@
      <interceptor name="CheckId" class="org.jboss.cache.pojo.interceptors.CheckIdInterceptor" scope="PER_INSTANCE"/>
      <!-- Track Tx undo operation -->
      <interceptor name="Undo" class="org.jboss.cache.pojo.interceptors.PojoTxUndoInterceptor" scope="PER_INSTANCE"/>
  -
  -   <stack name="Tx">
  -      <!-- Starting interceptor -->
  +   <!-- Begining -->
         <interceptor name="Start" class="org.jboss.cache.pojo.interceptors.PojoBeginInterceptor" scope="PER_INSTANCE"/>
         <!-- Check if we need a local tx for batch processing -->
         <interceptor name="Tx" class="org.jboss.cache.pojo.interceptors.PojoTxInterceptor" scope="PER_INSTANCE"/>
  @@ -112,25 +110,43 @@
         <interceptor name="TxLock" class="org.jboss.cache.pojo.interceptors.PojoTxLockInterceptor" scope="PER_INSTANCE"/>
         <!-- Interceptor to perform Pojo level rollback -->
         <interceptor name="TxUndo" class="org.jboss.cache.pojo.interceptors.PojoTxUndoSynchronizationInterceptor" scope="PER_INSTANCE"/>
  +
  +   <stack name="Attach">
  +      <interceptor-ref name="Start"/>
  +      <interceptor-ref name="CheckId"/>
  +      <interceptor-ref name="Tx"/>
  +      <interceptor-ref name="TxLock"/>
  +      <interceptor-ref name="TxUndo"/>
      </stack>
   
  -   <!--bind pointcut="execution(public Object org.jboss.cache.pojo.impl.PojoCacheImpl->attach(String, Object)
  -    throws PojoCacheException)"-->
  -   <bind pointcut="execution(*
  -      org.jboss.cache.pojo.impl.PojoCacheImpl->@org.jboss.cache.pojo.annotation.CheckIdValidity(..))">
  +   <stack name="Detach">
  +      <interceptor-ref name="Start"/>
         <interceptor-ref name="CheckId"/>
  -   </bind>
  +      <interceptor-ref name="Tx"/>
  +      <interceptor-ref name="TxLock"/>
  +      <interceptor-ref name="TxUndo"/>
  +   </stack>
   
  +   <stack name="Find">
  +      <interceptor-ref name="Start"/>
  +      <interceptor-ref name="CheckId"/>
  +   </stack>
  +
  +   <!-- This bind the jointpoint to specific in-memory operations. Currently in PojoUtil. -->
      <bind pointcut="execution(*
         org.jboss.cache.pojo.PojoUtil->@org.jboss.cache.pojo.annotation.TxUndo(..))">
         <interceptor-ref name="Undo"/>
      </bind>
   
  -   <!-- Don't do find method now. Is it necessary? -->
  -   <bind pointcut="
  -      execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->attach(..)) OR
  -      execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->detach(..))
  -   ">
  -      <stack-ref name="Tx"/>
  +   <bind pointcut="execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->@org.jboss.cache.pojo.annotation.Attach(..))">
  +      <stack-ref name="Attach"/>
  +   </bind>
  +
  +   <bind pointcut="execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->@org.jboss.cache.pojo.annotation.TxUndo(..))">
  +      <stack-ref name="Detach"/>
  +   </bind>
  +
  +   <bind pointcut="execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->@org.jboss.cache.pojo.annotation.TxUndo(..))">
  +      <stack-ref name="Find"/>
      </bind>
   </aop>