[jboss-cvs] JBossAS SVN: r65215 - in projects/aop/trunk/aop: src/resources/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 6 18:45:16 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-09-06 18:45:16 -0400 (Thu, 06 Sep 2007)
New Revision: 65215
Added:
projects/aop/trunk/aop/src/resources/test/typedAdvices/
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/
Removed:
projects/aop/trunk/aop/src/resources/test/beforeafter/
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/
Modified:
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/src/resources/test/typedAdvices/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/ArgsAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/BeforeAfterThrowingTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/GeneralAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/InvalidPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/POJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SimpleAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SubValue.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SuperValue.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/TestException.java
Log:
Refactoring: renamed beforeafter test package to typedAdvices.
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2007-09-06 22:42:01 UTC (rev 65214)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2007-09-06 22:45:16 UTC (rev 65215)
@@ -525,7 +525,7 @@
<!-- Tests only applicable for this weaving mode -->
<antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="beforeafter"/>
+ <param name="test" value="typedAdvices"/>
<param name="caller" value="precompiled-genadvisor-tests"/>
</antcall>
<antcall target="_run-precompiled-test" inheritRefs="true">
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2007-09-06 22:42:01 UTC (rev 65214)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2007-09-06 22:45:16 UTC (rev 65215)
@@ -395,7 +395,7 @@
<param name="caller" value="javaagent-genadvisor-tests"/>
</antcall>
<antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="beforeafter"/>
+ <param name="test" value="typedAdvices"/>
<param name="caller" value="javaagent-genadvisor-tests"/>
</antcall>
<antcall target="_run-javaagent-test" inheritRefs="true">
@@ -573,7 +573,7 @@
<param name="caller" value="precompiled-genadvisor-tests"/>
</antcall>
<antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="beforeafter"/>
+ <param name="test" value="typedAdvices"/>
<param name="caller" value="precompiled-genadvisor-tests"/>
</antcall>
<antcall target="_run-precompiled-test" inheritRefs="true">
Copied: projects/aop/trunk/aop/src/resources/test/typedAdvices (from rev 65200, projects/aop/trunk/aop/src/resources/test/beforeafter)
Modified: projects/aop/trunk/aop/src/resources/test/typedAdvices/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/beforeafter/jboss-aop.xml 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/resources/test/typedAdvices/jboss-aop.xml 2007-09-06 22:45:16 UTC (rev 65215)
@@ -1,90 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<aop>
- <aspect class="org.jboss.test.aop.beforeafter.SimpleAspect" scope="PER_VM"/>
- <aspect class="org.jboss.test.aop.beforeafter.ArgsAspect" scope="PER_VM"/>
- <aspect class="org.jboss.test.aop.beforeafter.GeneralAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.test.aop.typedAdvices.SimpleAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.test.aop.typedAdvices.ArgsAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.test.aop.typedAdvices.GeneralAspect" scope="PER_VM"/>
<stack name="simpleStack">
- <before name="before" aspect="org.jboss.test.aop.beforeafter.SimpleAspect"/>
- <advice name="around" aspect="org.jboss.test.aop.beforeafter.SimpleAspect"/>
- <after name="after" aspect="org.jboss.test.aop.beforeafter.SimpleAspect"/>
- <throwing name="throwing" aspect="org.jboss.test.aop.beforeafter.SimpleAspect"/>
+ <before name="before" aspect="org.jboss.test.aop.typedAdvices.SimpleAspect"/>
+ <advice name="around" aspect="org.jboss.test.aop.typedAdvices.SimpleAspect"/>
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.SimpleAspect"/>
+ <throwing name="throwing" aspect="org.jboss.test.aop.typedAdvices.SimpleAspect"/>
</stack>
- <bind pointcut="execution(* org.jboss.test.aop.beforeafter.POJO->method1(boolean))">
+ <bind pointcut="execution(* org.jboss.test.aop.typedAdvices.POJO->method1(boolean))">
<stack-ref name="simpleStack"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.beforeafter.POJO->method2(boolean))">
+ <bind pointcut="execution(* org.jboss.test.aop.typedAdvices.POJO->method2(boolean))">
<stack-ref name="simpleStack"/>
- <finally name="finallyAdvice" aspect="org.jboss.test.aop.beforeafter.SimpleAspect"/>
+ <finally name="finallyAdvice" aspect="org.jboss.test.aop.typedAdvices.SimpleAspect"/>
</bind>
<stack name="argsStack">
- <before name="before" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
- <after name="after" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
- <throwing name="throwing" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <before name="before" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
+ <throwing name="throwing" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</stack>
- <bind pointcut="(execution(org.jboss.test.aop.beforeafter.POJO->new(boolean, int, long, java.lang.String)) AND ! execution(org.jboss.test.aop.beforeafter.POJO->new())) OR (execution(* org.jboss.test.aop.beforeafter.POJO->method*(..)) AND !execution(* *->method*(boolean)) AND !execution(int *->*(..)) AND !execution(* *->*(*SubValue,int))) OR (get(!static * org.jboss.test.aop.beforeafter.POJO->*) AND !get(int *->*) AND !field(*Value *->*))">
+ <bind pointcut="(execution(org.jboss.test.aop.typedAdvices.POJO->new(boolean, int, long, java.lang.String)) AND ! execution(org.jboss.test.aop.typedAdvices.POJO->new())) OR (execution(* org.jboss.test.aop.typedAdvices.POJO->method*(..)) AND !execution(* *->method*(boolean)) AND !execution(int *->*(..)) AND !execution(* *->*(*SubValue,int))) OR (get(!static * org.jboss.test.aop.typedAdvices.POJO->*) AND !get(int *->*) AND !field(*Value *->*))">
<stack-ref name="argsStack"/>
</bind>
- <bind pointcut="set(!static * org.jboss.test.aop.beforeafter.POJO->*) AND !field(*Value *->*)">
- <before name="before" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
- <throwing name="throwing" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="set(!static * org.jboss.test.aop.typedAdvices.POJO->*) AND !field(*Value *->*)">
+ <before name="before" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
+ <throwing name="throwing" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="execution(int org.jboss.test.aop.beforeafter.POJO->method*(..)) OR execution(* org.jboss.test.aop.beforeafter.POJO->method*(*SubValue, int))">
- <throwing name="throwing" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="execution(int org.jboss.test.aop.typedAdvices.POJO->method*(..)) OR execution(* org.jboss.test.aop.typedAdvices.POJO->method*(*SubValue, int))">
+ <throwing name="throwing" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="get(int org.jboss.test.aop.beforeafter.POJO->*) OR field(*Value org.jboss.test.aop.beforeafter.POJO->*) OR execution(* org.jboss.test.aop.beforeafter.POJO->method*(*SubValue, int))">
- <before name="before" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="get(int org.jboss.test.aop.typedAdvices.POJO->*) OR field(*Value org.jboss.test.aop.typedAdvices.POJO->*) OR execution(* org.jboss.test.aop.typedAdvices.POJO->method*(*SubValue, int))">
+ <before name="before" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="get(!static *Value org.jboss.test.aop.beforeafter.POJO->*)">
- <after name="after" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="get(!static *Value org.jboss.test.aop.typedAdvices.POJO->*)">
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="execution(org.jboss.test.aop.beforeafter.InvalidPOJO->new())">
- <before name="before" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="execution(org.jboss.test.aop.typedAdvices.InvalidPOJO->new())">
+ <before name="before" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="execution(org.jboss.test.aop.beforeafter.InvalidPOJO->new(short))">
- <after name="after" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="execution(org.jboss.test.aop.typedAdvices.InvalidPOJO->new(short))">
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="execution(org.jboss.test.aop.beforeafter.InvalidPOJO->new(long))">
- <throwing name="throwing" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="execution(org.jboss.test.aop.typedAdvices.InvalidPOJO->new(long))">
+ <throwing name="throwing" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.beforeafter.InvalidPOJO->methodBefore(..))">
- <before name="before" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="execution(void org.jboss.test.aop.typedAdvices.InvalidPOJO->methodBefore(..))">
+ <before name="before" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.beforeafter.InvalidPOJO->methodAfter(..))">
- <after name="after" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="execution(void org.jboss.test.aop.typedAdvices.InvalidPOJO->methodAfter(..))">
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="all(org.jboss.test.aop.beforeafter.InvalidAdviceNamePOJO)">
- <throwing name="throwingzzz" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="all(org.jboss.test.aop.typedAdvices.InvalidAdviceNamePOJO)">
+ <throwing name="throwingzzz" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="field(int org.jboss.test.aop.beforeafter.InvalidPOJO->i)">
- <after name="after" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="field(int org.jboss.test.aop.typedAdvices.InvalidPOJO->i)">
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="field(!static *SuperValue org.jboss.test.aop.beforeafter.InvalidPOJO->*)">
- <throwing name="throwing" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="field(!static *SuperValue org.jboss.test.aop.typedAdvices.InvalidPOJO->*)">
+ <throwing name="throwing" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="set(!static *Value org.jboss.test.aop.beforeafter.InvalidPOJO->*)">
- <after name="after" aspect="org.jboss.test.aop.beforeafter.ArgsAspect"/>
+ <bind pointcut="set(!static *Value org.jboss.test.aop.typedAdvices.InvalidPOJO->*)">
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.ArgsAspect"/>
</bind>
- <bind pointcut="execution(org.jboss.test.aop.beforeafter.POJO->new($instanceof{org.jboss.test.aop.beforeafter.SuperValue}, int)) OR execution(* org.jboss.test.aop.beforeafter.POJO->method($instanceof{org.jboss.test.aop.beforeafter.SuperValue}, int))">
- <before name="before" aspect="org.jboss.test.aop.beforeafter.GeneralAspect"/>
- <after name="after" aspect="org.jboss.test.aop.beforeafter.GeneralAspect"/>
+ <bind pointcut="execution(org.jboss.test.aop.typedAdvices.POJO->new($instanceof{org.jboss.test.aop.typedAdvices.SuperValue}, int)) OR execution(* org.jboss.test.aop.typedAdvices.POJO->method($instanceof{org.jboss.test.aop.typedAdvices.SuperValue}, int))">
+ <before name="before" aspect="org.jboss.test.aop.typedAdvices.GeneralAspect"/>
+ <after name="after" aspect="org.jboss.test.aop.typedAdvices.GeneralAspect"/>
</bind>
</aop>
Copied: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices (from rev 65200, projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter)
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/ArgsAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/ArgsAspect.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
import junit.framework.Assert;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/BeforeAfterThrowingTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/BeforeAfterThrowingTestCase.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/BeforeAfterThrowingTestCase.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
import org.jboss.aop.advice.NoMatchingAdviceException;
import org.jboss.test.aop.AOPTestWithSetup;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/GeneralAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/GeneralAspect.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
import junit.framework.Assert;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/InvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/InvalidPOJO.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/InvalidPOJO.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
/**
* POJO whose joinpoints execution will throw a NoMatchingAdviceException, due to
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/POJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/POJO.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/POJO.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
/**
*
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SimpleAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/SimpleAspect.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SimpleAspect.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
import junit.framework.Assert;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SubValue.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/SubValue.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SubValue.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
/**
*
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SuperValue.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/SuperValue.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/SuperValue.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
/**
*
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/TestException.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/TestException.java 2007-09-06 21:00:28 UTC (rev 65200)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/typedAdvices/TestException.java 2007-09-06 22:45:16 UTC (rev 65215)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.aop.beforeafter;
+package org.jboss.test.aop.typedAdvices;
/**
*
More information about the jboss-cvs-commits
mailing list