[jboss-cvs] JBossAS SVN: r59345 - projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration

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

Author: kabir.khan at jboss.com
Date: 2007-01-04 06:52:24 -0500 (Thu, 04 Jan 2007)
New Revision: 59345

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPJoinpointFactory.java
Log:
Get it building again

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2007-01-04 11:34:50 UTC (rev 59344)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2007-01-04 11:52:24 UTC (rev 59345)
@@ -72,12 +72,13 @@
       MetaDataStack.mask();
       try
       {
-         ContainerCache cache = ContainerCache.initialise(manager, clazz, metaData);
+         MetaData md = getNonEmptyMetaData(metaData);
+         ContainerCache cache = ContainerCache.initialise(manager, clazz, md);
          AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
          Object target = createTarget(cache, params);
 
          params.setProxiedClass(target.getClass());
-         params.setMetaDataContext(metaData);
+         params.setMetaData(md);
          params.setTarget(target);
          params.setContainerCache(cache);
          
@@ -89,6 +90,21 @@
       }
    }
 
+   private MetaData getNonEmptyMetaData(MetaData metaData)
+   {
+      if (metaData == null)
+      {
+         return null;
+      }
+      
+      if (metaData.getAnnotations() != MetaData.NO_ANNOTATIONS)
+      {
+         return metaData;
+      }
+      
+      return null; 
+   }
+   
    private Object createTarget(ContainerCache cache, AOPProxyFactoryParameters params) throws Throwable
    {
       Advisor advisor = cache.getAdvisor();

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPJoinpointFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPJoinpointFactory.java	2007-01-04 11:34:50 UTC (rev 59344)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPJoinpointFactory.java	2007-01-04 11:52:24 UTC (rev 59345)
@@ -21,11 +21,14 @@
 */
 package org.jboss.aop.microcontainer.integration;
 
+import org.jboss.joinpoint.plugins.BasicConstructorJoinPoint;
 import org.jboss.joinpoint.plugins.BasicJoinpointFactory;
 import org.jboss.joinpoint.spi.ConstructorJoinpoint;
 import org.jboss.joinpoint.spi.JoinpointException;
+import org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactory;
 import org.jboss.reflect.spi.ClassInfo;
 import org.jboss.reflect.spi.ConstructorInfo;
+import org.jboss.reflect.spi.TypeInfoFactory;
 
 /**
  * The existence of this class is the signal to the kernel that we want to use the aop-mc integration.
@@ -38,6 +41,7 @@
  */
 public class AOPJoinpointFactory extends BasicJoinpointFactory
 {
+   private ConstructorInfo ctorInfo;
    /**
     * Create a new AOPJoinpointFactory.
     * 
@@ -83,17 +87,12 @@
       ConstructorInfo[] ctors = info.getDeclaredConstructors();
       for (int i = 0 ; i < ctors.length ; i++)
       {
-         if (ctors[i].getParameterTypes().length == 2)
+         if (ctors[i].getParameterTypes().length == 1)
          {
             if (ctors[i].getParameterTypes()[0].getName().equals(ConstructorInfo.class.getName()) == false)
             {
                continue;
-            }
-            
-            if (ctors[i].getParameterTypes()[1].getName().equals(MetaDataContext.class.getName()) == false)
-            {
-               continue;
-            }
+            }            
             ctorInfo = ctors[i];
             break;
          }
@@ -101,7 +100,7 @@
       
       if (ctorInfo == null)
       {
-         throw new JoinpointException("No constructor found with the reqiured signature AOPConstructorJoinpoint(ConstructorInfo, MetadataContext)");
+         throw new JoinpointException("No constructor found with the reqiured signature AOPConstructorJoinpoint(ConstructorInfo)");
       }
       return ctorInfo;
    }
@@ -109,7 +108,7 @@
    private ConstructorJoinpoint createAOPConstructorJoinpoint(ConstructorInfo info, ConstructorInfo aopCtorInfo) throws JoinpointException
    {
       ConstructorJoinpoint jp = new BasicConstructorJoinPoint(info);
-      jp.setArguments(new Object[] {aopCtorInfo, metaDataContext});
+      jp.setArguments(new Object[] {aopCtorInfo});
       try
       {
          return (ConstructorJoinpoint)jp.dispatch();