[jboss-cvs] JBossAS SVN: r65192 - 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 15:33:33 EDT 2007


Author: flavia.rainone at jboss.com
Date: 2007-09-06 15:33:32 -0400 (Thu, 06 Sep 2007)
New Revision: 65192

Added:
   projects/aop/trunk/aop/src/resources/test/arguments/
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/
Removed:
   projects/aop/trunk/aop/src/resources/test/args/
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/
Modified:
   projects/aop/trunk/aop/base-tests.xml
   projects/aop/trunk/aop/build-tests-jdk14.xml
   projects/aop/trunk/aop/build-tests-jdk50.xml
   projects/aop/trunk/aop/src/resources/test/arguments/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/InvocationAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/InvocationTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/POJO.java
Log:
[JBAOP-382] First step of refactoring: rename args package.

Modified: projects/aop/trunk/aop/base-tests.xml
===================================================================
--- projects/aop/trunk/aop/base-tests.xml	2007-09-06 19:16:56 UTC (rev 65191)
+++ projects/aop/trunk/aop/base-tests.xml	2007-09-06 19:33:32 UTC (rev 65192)
@@ -2,7 +2,7 @@
 
    <target name="_base-tests">
       <antcall target="${test-target}" inheritRefs="true">
-         <param name="test" value="args"/>
+         <param name="test" value="arguments"/>
       </antcall>
       <antcall target="${test-target}" inheritRefs="true">
          <param name="test" value="packagedotdot"/>

Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml	2007-09-06 19:16:56 UTC (rev 65191)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml	2007-09-06 19:33:32 UTC (rev 65192)
@@ -477,11 +477,6 @@
       <!-- Tests only applicable for this weaving mode -->
 
       <antcall target="_run-precompiled-test" inheritRefs="true">
-         <param name="test" value="args"/>
-         <param name="caller" value="precompiled-tests"/>
-      </antcall>
-
-      <antcall target="_run-precompiled-test" inheritRefs="true">
          <param name="test" value="override"/>
          <param name="caller" value="precompiled-tests"/>
          <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
@@ -530,10 +525,6 @@
 
       <!-- Tests only applicable for this weaving mode -->
       <antcall target="_run-precompiled-test" inheritRefs="true">
-         <param name="test" value="args"/>
-         <param name="caller" value="precompiled-genadvisor-tests"/>
-      </antcall>
-      <antcall target="_run-precompiled-test" inheritRefs="true">
          <param name="test" value="beforeafter"/>
          <param name="caller" value="precompiled-genadvisor-tests"/>
       </antcall>
@@ -565,7 +556,7 @@
 
    <target name="precompiled-genadvisor-test" depends="retroweave">
       <antcall target="_run-precompiled-test" inheritRefs="true">
-         <param name="test" value="args"/>
+         <param name="test" value="${test}"/>
          <param name="caller" value="precompiled-genadvisor-tests"/>
       </antcall>
    </target>

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2007-09-06 19:16:56 UTC (rev 65191)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2007-09-06 19:33:32 UTC (rev 65192)
@@ -1450,7 +1450,7 @@
                <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
                <!-- This test won't work with JRockit, due to the limit on stack trace
                    length, which breaks cflow functionality on this test case -->
-               <exclude name="org/jboss/test/aop/args/ArgumentsTestCase.class"/>
+               <exclude name="org/jboss/test/aop/arguments/ArgumentsTestCase.class"/>
             </fileset>
          </batchtest>
       </junit>
@@ -1472,7 +1472,7 @@
          <param name="case" value="AnnotatedParamsTester"/>
       </antcall>
       <antcall  target="memory-test" inheritRefs="true">
-         <param name="test" value="args"/>
+         <param name="test" value="arguments"/>
          <param name="case" value="ArgsTestCase"/>
       </antcall>
       <antcall  target="memory-test" inheritRefs="true">

Copied: projects/aop/trunk/aop/src/resources/test/arguments (from rev 65155, projects/aop/trunk/aop/src/resources/test/args)

Modified: projects/aop/trunk/aop/src/resources/test/arguments/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml	2007-09-06 13:12:15 UTC (rev 65155)
+++ projects/aop/trunk/aop/src/resources/test/arguments/jboss-aop.xml	2007-09-06 19:33:32 UTC (rev 65192)
@@ -3,86 +3,86 @@
 
 <aop>
    <!-- get/setArguments test -->
-   <aspect class="org.jboss.test.aop.args.ArgumentsAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.arguments.ArgumentsAspect" scope="PER_VM"/>
   
    <stack name="getAndChange">
-		<advice name="getArgumentsAdvice1" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
-      <advice name="getAndChangeArgumentsAdvice" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
-      <advice name="getArgumentsAdvice2" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>      
+		<advice name="getArgumentsAdvice1" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+      <advice name="getAndChangeArgumentsAdvice" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+      <advice name="getArgumentsAdvice2" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>      
    </stack>
   
    <cflow-stack name="ArgumentsPOJO1_constructor">
-      <called expr="org.jboss.test.aop.args.ArgumentsPOJO1->new(..)"/>
+      <called expr="org.jboss.test.aop.arguments.ArgumentsPOJO1->new(..)"/>
    </cflow-stack>
    
    <cflow-stack name="ArgumentsPOJO1_method">
-      <called expr="* org.jboss.test.aop.args.ArgumentsPOJO1->*(..)"/>
+      <called expr="* org.jboss.test.aop.arguments.ArgumentsPOJO1->*(..)"/>
    </cflow-stack>
 
-   <bind pointcut="all(org.jboss.test.aop.args.ArgumentsPOJO1)">
+   <bind pointcut="all(org.jboss.test.aop.arguments.ArgumentsPOJO1)">
 		<stack-ref name="getAndChange"/>
    </bind>
 
-	<bind pointcut="call(org.jboss.test.aop.args.CalledPOJO->new(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
+	<bind pointcut="call(org.jboss.test.aop.arguments.CalledPOJO->new(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
 		<stack-ref name="getAndChange"/>
    </bind>
 
-	<bind pointcut="call(* org.jboss.test.aop.args.CalledPOJO->*(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
+	<bind pointcut="call(* org.jboss.test.aop.arguments.CalledPOJO->*(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
 		<stack-ref name="getAndChange"/>
    </bind>
 
-	<bind pointcut="call(static * org.jboss.test.aop.args.CalledPOJO->*(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
-      <advice name="setArgumentsAdvice" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
+	<bind pointcut="call(static * org.jboss.test.aop.arguments.CalledPOJO->*(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
+      <advice name="setArgumentsAdvice" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
    </bind>
 
    <stack name="set">
-      <advice name="getArgumentsAdvice1" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
-      <advice name="setArgumentsAdvice" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
-      <advice name="getArgumentsAdvice2" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
+      <advice name="getArgumentsAdvice1" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+      <advice name="setArgumentsAdvice" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+      <advice name="getArgumentsAdvice2" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
    </stack>
    
    <cflow-stack name="ArgumentsPOJO2_constructor">
-      <called expr="org.jboss.test.aop.args.ArgumentsPOJO2->new(..)"/>
+      <called expr="org.jboss.test.aop.arguments.ArgumentsPOJO2->new(..)"/>
    </cflow-stack>
    
    <cflow-stack name="ArgumentsPOJO2_method">
-      <called expr="* org.jboss.test.aop.args.ArgumentsPOJO2->*(..)"/>
+      <called expr="* org.jboss.test.aop.arguments.ArgumentsPOJO2->*(..)"/>
    </cflow-stack>
    
-   <bind pointcut="all(org.jboss.test.aop.args.ArgumentsPOJO2)">
+   <bind pointcut="all(org.jboss.test.aop.arguments.ArgumentsPOJO2)">
       <stack-ref name="set"/>
    </bind>
 
-   <bind pointcut="call(org.jboss.test.aop.args.CalledPOJO->new(..))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
+   <bind pointcut="call(org.jboss.test.aop.arguments.CalledPOJO->new(..))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
       <stack-ref name="set"/>
    </bind>
 
-   <bind pointcut="call(* org.jboss.test.aop.args.CalledPOJO->*(..))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
+   <bind pointcut="call(* org.jboss.test.aop.arguments.CalledPOJO->*(..))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
       <stack-ref name="set"/>
    </bind>
 
-	<bind pointcut="call(static * org.jboss.test.aop.args.CalledPOJO->*(int))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
-      <advice name="getAndChangeArgumentsAdvice" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
+	<bind pointcut="call(static * org.jboss.test.aop.arguments.CalledPOJO->*(int))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
+      <advice name="getAndChangeArgumentsAdvice" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
    </bind>
 
    <!-- @Invocation test -->
-	<aspect class="org.jboss.test.aop.args.InvocationAspect" scope="PER_VM"/>
+	<aspect class="org.jboss.test.aop.arguments.InvocationAspect" scope="PER_VM"/>
 	
-	<bind pointcut="execution(* org.jboss.test.aop.args.POJO->method1(..))">
-		<advice name="aroundMethodExecution1" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.arguments.POJO->method1(..))">
+		<advice name="aroundMethodExecution1" aspect="org.jboss.test.aop.arguments.InvocationAspect"/>
    </bind>
 
-	<bind pointcut="get(* org.jboss.test.aop.args.POJO->number)">
-		<advice name="aroundFieldRead" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+	<bind pointcut="get(* org.jboss.test.aop.arguments.POJO->number)">
+		<advice name="aroundFieldRead" aspect="org.jboss.test.aop.arguments.InvocationAspect"/>
    </bind>
 
-	<bind pointcut="set(* org.jboss.test.aop.args.POJO->number)">
-		<advice name="aroundFieldWrite" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+	<bind pointcut="set(* org.jboss.test.aop.arguments.POJO->number)">
+		<advice name="aroundFieldWrite" aspect="org.jboss.test.aop.arguments.InvocationAspect"/>
    </bind>
    
-   <bind pointcut="call(* org.jboss.test.aop.args.POJO->calleeMethod(..)) AND
-      withincode(* org.jboss.test.aop.args.POJO->callerMethod(..))">
-		<advice name="aroundMethodCalledByMethod" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.arguments.POJO->calleeMethod(..)) AND
+      withincode(* org.jboss.test.aop.arguments.POJO->callerMethod(..))">
+		<advice name="aroundMethodCalledByMethod" aspect="org.jboss.test.aop.arguments.InvocationAspect"/>
    </bind>
    
 </aop>
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments (from rev 65155, projects/aop/trunk/aop/src/test/org/jboss/test/aop/args)

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsAspect.java	2007-09-06 13:12:15 UTC (rev 65155)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsAspect.java	2007-09-06 19:33:32 UTC (rev 65192)
@@ -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.args;
+package org.jboss.test.aop.arguments;
 
 import org.jboss.aop.joinpoint.ConstructorCalledByConstructorInvocation;
 import org.jboss.aop.joinpoint.ConstructorCalledByMethodInvocation;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsPOJO.java	2007-09-06 13:12:15 UTC (rev 65155)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsPOJO.java	2007-09-06 19:33:32 UTC (rev 65192)
@@ -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.args;
+package org.jboss.test.aop.arguments;
 
 
 /**

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsTestCase.java	2007-09-06 13:12:15 UTC (rev 65155)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/ArgumentsTestCase.java	2007-09-06 19:33:32 UTC (rev 65192)
@@ -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.args;
+package org.jboss.test.aop.arguments;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/InvocationAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationAspect.java	2007-09-06 13:12:15 UTC (rev 65155)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/InvocationAspect.java	2007-09-06 19:33:32 UTC (rev 65192)
@@ -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.args;
+package org.jboss.test.aop.arguments;
 
 import org.jboss.aop.joinpoint.FieldInvocation;
 import org.jboss.aop.joinpoint.FieldReadInvocation;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/InvocationTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationTestCase.java	2007-09-06 13:12:15 UTC (rev 65155)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/InvocationTestCase.java	2007-09-06 19:33:32 UTC (rev 65192)
@@ -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.args;
+package org.jboss.test.aop.arguments;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/POJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJO.java	2007-09-06 13:12:15 UTC (rev 65155)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/arguments/POJO.java	2007-09-06 19:33:32 UTC (rev 65192)
@@ -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.args;
+package org.jboss.test.aop.arguments;
 
 
 /**




More information about the jboss-cvs-commits mailing list