[jboss-cvs] JBossAS SVN: r71190 - in projects/aop/branches/joinpoint_graph: aspects and 1 other directories.

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

Author: flavia.rainone at jboss.com
Date: 2008-03-24 00:20:07 -0400 (Mon, 24 Mar 2008)
New Revision: 71190

Modified:
   projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestDelegate.java
   projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java
   projects/aop/branches/joinpoint_graph/aspects/pom.xml
   projects/aop/branches/joinpoint_graph/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java
Log:
Merging trunk changes.

Modified: projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestDelegate.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestDelegate.java	2008-03-24 04:17:13 UTC (rev 71189)
+++ projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestDelegate.java	2008-03-24 04:20:07 UTC (rev 71190)
@@ -39,7 +39,7 @@
 {
    Properties systemProps;
    
-   public AOPTestDelegate(Class clazz)
+   public AOPTestDelegate(Class<?> clazz)
    {
       // FIXME AOPTestDelegate constructor
       super(clazz);

Modified: projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java	2008-03-24 04:17:13 UTC (rev 71189)
+++ projects/aop/branches/joinpoint_graph/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java	2008-03-24 04:20:07 UTC (rev 71190)
@@ -48,10 +48,10 @@
     * @return the delegate
     * @throws Exception for any error
     */
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       AOPTestDelegate delegate = new AOPTestDelegate(clazz);
-      boolean disableSecurity = Boolean.valueOf((String)System.getProperty(DISABLE_SECURITY_KEY, "false"));
+      boolean disableSecurity = Boolean.valueOf(System.getProperty(DISABLE_SECURITY_KEY, "false"));
       if (!disableSecurity)
       {
          delegate.enableSecurity = true;

Modified: projects/aop/branches/joinpoint_graph/aspects/pom.xml
===================================================================
--- projects/aop/branches/joinpoint_graph/aspects/pom.xml	2008-03-24 04:17:13 UTC (rev 71189)
+++ projects/aop/branches/joinpoint_graph/aspects/pom.xml	2008-03-24 04:20:07 UTC (rev 71190)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>jboss-aop-parent</artifactId>
     <groupId>org.jboss.aop</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-aop-aspects</artifactId>
@@ -83,14 +83,14 @@
       <version>1.3.0</version>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
+      <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-jca-api</artifactId>
-      <version>1.5-SNAPSHOT</version>
+      <version>1.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
+      <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-servlet-api</artifactId>
-      <version>2.5-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: projects/aop/branches/joinpoint_graph/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java	2008-03-24 04:17:13 UTC (rev 71189)
+++ projects/aop/branches/joinpoint_graph/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java	2008-03-24 04:20:07 UTC (rev 71190)
@@ -52,7 +52,7 @@
    public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
    {
       MethodJoinpoint mj = (MethodJoinpoint)jp;
-      MutexLocked props = (MutexLocked)advisor.resolveAnnotation(mj.getMethod(), MutexLocked.class);
+      MutexLocked props = (MutexLocked)advisor.resolveTypedAnnotation(mj.getMethod(), MutexLocked.class);
       if (props.timeout() < 0)
       {
          return new MutexAspect.BlockingMutex();