[jboss-cvs] JBossAS SVN: r79330 - in projects/aop/trunk/aop/src: resources/test/inheritanceacrosspackages and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 9 23:57:22 EDT 2008
Author: flavia.rainone at jboss.com
Date: 2008-10-09 23:57:21 -0400 (Thu, 09 Oct 2008)
New Revision: 79330
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java
projects/aop/trunk/aop/src/resources/test/inheritanceacrosspackages/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/InheritanceAcrossPackagesTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/base/Base.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/child/Child.java
Log:
[JBAOP-660] Method and field info fields are now public on generated advisor mode. Plus, the test inheritanceacrosspackages
is now complete and checks all types of joinpoints.
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java 2008-10-10 03:26:55 UTC (rev 79329)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java 2008-10-10 03:57:21 UTC (rev 79330)
@@ -111,7 +111,7 @@
{
CtClass genadvisor = getGenadvisor();
String finame = addFieldReadInfoFieldWithAccessors(
- Modifier.PROTECTED,
+ Modifier.PUBLIC,
genadvisor,
field);
@@ -161,7 +161,7 @@
CtClass genadvisor = getGenadvisor();
String finame = addFieldWriteInfoField(
- Modifier.PROTECTED,
+ Modifier.PUBLIC,
genadvisor,
field);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java 2008-10-10 03:26:55 UTC (rev 79329)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java 2008-10-10 03:57:21 UTC (rev 79330)
@@ -51,7 +51,7 @@
GeneratedAdvisorInstrumentor instrumentor = (GeneratedAdvisorInstrumentor)trans.getInstrumentor();
CtClass genadvisor = instrumentor.getGenadvisor();
String miname = addMethodInfoField(
- Modifier.PROTECTED,
+ Modifier.PUBLIC,
genadvisor,
trans);
Modified: projects/aop/trunk/aop/src/resources/test/inheritanceacrosspackages/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/inheritanceacrosspackages/jboss-aop.xml 2008-10-10 03:26:55 UTC (rev 79329)
+++ projects/aop/trunk/aop/src/resources/test/inheritanceacrosspackages/jboss-aop.xml 2008-10-10 03:57:21 UTC (rev 79330)
@@ -1,6 +1,30 @@
<aop>
<interceptor class="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ <bind pointcut="field(* org.jboss.test.aop.inheritanceacrosspackages.base.Base->*)">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="field(* org.jboss.test.aop.inheritanceacrosspackages.child.Child->*)">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="construction(org.jboss.test.aop.inheritanceacrosspackages.base.Base->new(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="construction(org.jboss.test.aop.inheritanceacrosspackages.child.Child->new(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="execution(org.jboss.test.aop.inheritanceacrosspackages.base.Base->new(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="execution(org.jboss.test.aop.inheritanceacrosspackages.child.Child->new(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
<bind pointcut="execution(* org.jboss.test.aop.inheritanceacrosspackages.base.Base->*(..))">
<interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
</bind>
@@ -8,4 +32,21 @@
<bind pointcut="execution(* org.jboss.test.aop.inheritanceacrosspackages.child.Child->*(..))">
<interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
</bind>
+
+ <bind pointcut="call(org.jboss.test.aop.inheritanceacrosspackages.base.Base->new(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="call(org.jboss.test.aop.inheritanceacrosspackages.child.Child->new(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="call(* org.jboss.test.aop.inheritanceacrosspackages.base.Base->*(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
+ <bind pointcut="call(* org.jboss.test.aop.inheritanceacrosspackages.child.Child->*(..))">
+ <interceptor-ref name="org.jboss.test.aop.inheritanceacrosspackages.TestInterceptor"/>
+ </bind>
+
</aop>
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/InheritanceAcrossPackagesTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/InheritanceAcrossPackagesTestCase.java 2008-10-10 03:26:55 UTC (rev 79329)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/InheritanceAcrossPackagesTestCase.java 2008-10-10 03:57:21 UTC (rev 79330)
@@ -40,17 +40,39 @@
public void testBaseClass() throws Exception
{
+ TestInterceptor.intercepted = false;
Base base = new Base();
+ assertTrue(TestInterceptor.intercepted);
TestInterceptor.intercepted = false;
+ base.field = 0;
+ assertTrue(TestInterceptor.intercepted);
+ TestInterceptor.intercepted = false;
+ base.field = base.field -1;
+ assertTrue(TestInterceptor.intercepted);
+ TestInterceptor.intercepted = false;
base.base();
assertTrue(TestInterceptor.intercepted);
}
public void testChildClass() throws Exception
{
+ TestInterceptor.intercepted = false;
Child child = new Child();
+ assertTrue(TestInterceptor.intercepted);
((org.jboss.aop.Advised)child)._getInstanceAdvisor();
TestInterceptor.intercepted = false;
+ child.field = 20;
+ assertTrue(TestInterceptor.intercepted);
+ TestInterceptor.intercepted = false;
+ child.field = child.field * 5;
+ assertTrue(TestInterceptor.intercepted);
+ TestInterceptor.intercepted = false;
+ child.field2 = 40;
+ assertTrue(TestInterceptor.intercepted);
+ TestInterceptor.intercepted = false;
+ child.field2 = child.field2 * 10;
+ assertTrue(TestInterceptor.intercepted);
+ TestInterceptor.intercepted = false;
child.base();
assertTrue(TestInterceptor.intercepted);
TestInterceptor.intercepted = false;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/base/Base.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/base/Base.java 2008-10-10 03:26:55 UTC (rev 79329)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/base/Base.java 2008-10-10 03:57:21 UTC (rev 79330)
@@ -28,6 +28,12 @@
*/
public class Base
{
+ public int field;
+
+ public Base(){}
+
+ public Base(int arg){}
+
public void base()
{
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/child/Child.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/child/Child.java 2008-10-10 03:26:55 UTC (rev 79329)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/inheritanceacrosspackages/child/Child.java 2008-10-10 03:57:21 UTC (rev 79330)
@@ -30,6 +30,15 @@
*/
public class Child extends Base
{
+ public int field2;
+
+ public Child() {}
+
+ public Child(int arg)
+ {
+ super(arg);
+ }
+
public void child()
{
More information about the jboss-cvs-commits
mailing list