[jboss-cvs] JBossAS SVN: r60192 - in projects/microcontainer/trunk: deployers/src/main/org/jboss/deployers/plugins/structure and 1 other directories.

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

Author: alesj
Date: 2007-02-02 08:13:00 -0500 (Fri, 02 Feb 2007)
New Revision: 60192

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
   projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java
Log:
Using createProxy method from GeneratedAOPProxyFactory.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java	2007-02-02 13:13:00 UTC (rev 60192)
@@ -21,7 +21,6 @@
  */
 package org.jboss.aop.microcontainer.aspects.util;
 
-import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
 import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
 import org.jboss.logging.Logger;
 
@@ -45,18 +44,8 @@
     */
    public static <T> T createProxy(T target, Class<T> interfaceClass)
    {
-      if (target == null)
-         return null;
-
       GeneratedAOPProxyFactory proxyFactory = new GeneratedAOPProxyFactory();
-      AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
-      params.setInterfaces(new Class[] { interfaceClass });
-      params.setObjectAsSuperClass(true);
-      params.setTarget(target);
-      Object proxy = proxyFactory.createAdvisedProxy(params);
-      if( log.isTraceEnabled() )
-         log.trace("Created proxy: "+proxy.getClass()+"@"+System.identityHashCode(proxy)+" target: "+target.getClass());
-      return interfaceClass.cast(proxy);
+      return proxyFactory.createProxy(target, interfaceClass);
    }
 
 }

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2007-02-02 13:13:00 UTC (rev 60192)
@@ -29,7 +29,6 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
 import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
 import org.jboss.deployers.plugins.attachments.AttachmentsImpl;
 import org.jboss.deployers.spi.DeploymentException;
@@ -739,17 +738,7 @@
     */
    private <T> T createProxy(T target, Class<T> interfaceClass)
    {
-      if (target == null)
-         return null;
-
       GeneratedAOPProxyFactory proxyFactory = new GeneratedAOPProxyFactory();
-      AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
-      params.setInterfaces(new Class[] { interfaceClass });
-      params.setObjectAsSuperClass(true);
-      params.setTarget(target);
-      Object proxy = proxyFactory.createAdvisedProxy(params);
-      if( log.isTraceEnabled() )
-         log.trace("Created proxy: "+proxy.getClass()+"@"+System.identityHashCode(proxy)+" target: "+target.getClass());
-      return interfaceClass.cast(proxy);
+      return proxyFactory.createProxy(target, interfaceClass);
    }
 }

Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java	2007-02-02 13:13:00 UTC (rev 60192)
@@ -24,7 +24,6 @@
 import java.util.Set;
 
 import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
 import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
 import org.jboss.logging.Logger;
 import org.jboss.managed.api.Fields;
@@ -138,17 +137,7 @@
     */
    static <T> T createProxy(T target, Class<T> interfaceClass)
    {
-      if (target == null)
-         return null;
-
       GeneratedAOPProxyFactory proxyFactory = new GeneratedAOPProxyFactory();
-      AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
-      params.setInterfaces(new Class[] { interfaceClass });
-      params.setObjectAsSuperClass(true);
-      params.setTarget(target);
-      Object proxy = proxyFactory.createAdvisedProxy(params);
-      if( log.isTraceEnabled() )
-         log.trace("Created proxy: "+proxy.getClass()+"@"+System.identityHashCode(proxy)+" target: "+target.getClass());
-      return interfaceClass.cast(proxy);
+      return proxyFactory.createProxy(target, interfaceClass);
    }
 }