[jboss-cvs] JBossAS SVN: r63405 - trunk/tomcat/src/resources/META-INF.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-06-07 17:34:16 -0400 (Thu, 07 Jun 2007)
New Revision: 63405

Modified:
   trunk/tomcat/src/resources/META-INF/jboss-aop.xml
Log:
[JBAS-3858] Update to match the current JBC

Modified: trunk/tomcat/src/resources/META-INF/jboss-aop.xml
===================================================================
--- trunk/tomcat/src/resources/META-INF/jboss-aop.xml	2007-06-07 21:32:31 UTC (rev 63404)
+++ trunk/tomcat/src/resources/META-INF/jboss-aop.xml	2007-06-07 21:34:16 UTC (rev 63405)
@@ -1,38 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
 
-   <!-- If a POJO has PojoCacheable annotation, it will be aspectized. -->
-   <prepare expr="field(* @org.jboss.cache.aop.annotation.PojoCacheable->*)" />
+   <!-- If a POJO has the @Replicable annotation, it will be aspectized. -->
+   <prepare expr="field(* @org.jboss.cache.pojo.annotation.Replicable->*)" />
 
-   <!-- Make any POJO with a PojoCacheable annotation as a Subject/Observable -->
-   <bind pointcut="set(* @org.jboss.cache.aop.annotation.PojoCacheable->*)">
+   <!-- Make any POJO with an @Replicable annotation as a Subject/Observable -->
+   <bind pointcut="set(* @org.jboss.cache.pojo.annotation.Replicable->*)">
       <interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
    </bind>
 
-   <introduction class="@org.jboss.cache.aop.annotation.PojoCacheable">
+   <introduction class="@org.jboss.cache.pojo.annotation.Replicable">
       <mixin>
          <interfaces>org.jboss.aspects.patterns.observable.Subject</interfaces>
          <class>org.jboss.aspects.patterns.observable.SubjectImpl</class>
          <construction>new org.jboss.aspects.patterns.observable.SubjectImpl(this)</construction>
       </mixin>
    </introduction>
-  
-   <!-- If a POJO has InstanceOfPojoCacheable annotation, it will be aspectized. -->
-   <prepare expr="field(* $instanceof{@org.jboss.cache.aop.annotation.InstanceOfPojoCacheable}->*)" />
 
-   <!-- Make any POJO with a InstanceOfPojoCacheable annotation as a Subject/Observable -->
-   <bind pointcut="set(* @org.jboss.cache.aop.annotation.InstanceOfPojoCacheable->*)">
-      <interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
-   </bind>
-
-   <introduction class="@org.jboss.cache.aop.annotation.InstanceOfPojoCacheable">
-      <mixin>
-         <interfaces>org.jboss.aspects.patterns.observable.Subject</interfaces>
-         <class>org.jboss.aspects.patterns.observable.SubjectImpl</class>
-         <construction>new org.jboss.aspects.patterns.observable.SubjectImpl(this)</construction>
-      </mixin>
-   </introduction>
-
    <!-- If a POJO has AopMarker annotation, it will be aspectized. -->
    <prepare expr="field(* @org.jboss.web.tomcat.service.session.AopMarker->*)" />