mcardle 2005/12/07 18:00:38 CET
Modified files:
core/src/webapp/WEB-INF aop.xml
Log:
* catches JahiaFieldSet
Revision Changes Path
1.6 +21 -7 jahia/core/src/webapp/WEB-INF/aop.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/aop.xml.diff?r1=1.5&r2=1.6&f=h
Index: aop.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/src/webapp/WEB-INF/aop.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aop.xml 1 Dec 2005 15:30:49 -0000 1.5
+++ aop.xml 7 Dec 2005 17:00:38 -0000 1.6
@@ -4,7 +4,7 @@
<aspectwerkz>
<system id="webapp">
- <include package="org.jahia.apache.jsp.jsp.jahia.templates"/>
+ <include package="org.apache.jsp.jsp.jahia.templates"/>
<include package="org.jahia.taglibs"/>
<include package="org.jahia.deprecated.taglibs"/>
@@ -34,7 +34,7 @@
)
AND
(
- within(org.apache.jsp.jsp.jahia.templates..*+)
+ within(org.apache.jsp.jsp.jahia.templates..*)
OR within(org.jahia.taglibs..*)
OR within(org.jahia.deprecated.taglibs..*)
)
@@ -50,7 +50,7 @@
)
AND
(
- within(org.apache.jsp.jsp.jahia.templates..*+)
+ within(org.apache.jsp.jsp.jahia.templates..*)
OR within(org.jahia.taglibs..*)
OR within(org.jahia.deprecated.taglibs..*)
)
@@ -65,7 +65,7 @@
OR call(* org.jahia.services.pages.ContentPage.*(..))
)
AND (
- within(org.apache.jsp.jsp.jahia.templates.*)
+ within(org.apache.jsp.jsp.jahia.templates..*)
OR within(org.jahia.taglibs..*)
OR within(org.jahia.deprecated.taglibs..*)
)
@@ -81,7 +81,7 @@
)
AND
(
- within(org.apache.jsp.jsp.jahia.templates..*+)
+ within(org.apache.jsp.jsp.jahia.templates..*)
OR within(org.jahia.taglibs..*)
OR within(org.jahia.deprecated.taglibs..*)
)
@@ -92,7 +92,20 @@
<pointcut name="addContainerSET_pc" >
call(* org.jahia.data.containers.JahiaContainerSet.getContainer(..)
)
AND (
- within(org.apache.jsp.jsp.jahia.templates..*+)
+ within(org.apache.jsp.jsp.jahia.templates..*)
+ OR within(org.jahia.taglibs..*)
+ OR within(org.jahia.deprecated.taglibs..*)
+ )
+ AND !within(org.jahia.aop..*)
+ AND !within( *..eventlistener_jsp)
+ </pointcut>
+
+ <pointcut name="jahiaFieldSET_pc" >
+ ( call(* org.jahia.data.fields.JahiaFieldSet.getField(..) )
+ OR call(*
org.jahia.data.fields.JahiaFieldSet.getAbsoluteField(..) )
+ )
+ AND (
+ within(org.apache.jsp.jsp.jahia.templates..*)
OR within(org.jahia.taglibs..*)
OR within(org.jahia.deprecated.taglibs..*)
)
@@ -109,7 +122,8 @@
type="after returning(returnValue)"
bind-to="addContainerListSET_pc"/>
<advice name="addContainerSET(JoinPoint joinPoint,
org.jahia.data.containers.JahiaContainer returnValue)"
type="after returning(returnValue)"
bind-to="addContainerSET_pc"/>
-
+ <advice name="jahiaFieldSET(JoinPoint joinPoint,
org.jahia.data.fields.JahiaField returnValue)"
+ type="after returning(returnValue)" bind-to="jahiaFieldSET_pc"/>
</aspect>
</system>
