[jboss-cvs] JBossAS SVN: r90768 - in projects/ejb3/trunk/proxy-impl: src/main/java/org/jboss/ejb3/proxy/impl/factory and 1 other directory.

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

Author: jaikiran
Date: 2009-07-02 08:45:15 -0400 (Thu, 02 Jul 2009)
New Revision: 90768

Modified:
   projects/ejb3/trunk/proxy-impl/pom.xml
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/ProxyFactoryBase.java
Log:
EJBTHREE-1854 Configure EJB3 MC beans (ProxyFactory) to disable AOPDependencyBuilder

Modified: projects/ejb3/trunk/proxy-impl/pom.xml
===================================================================
--- projects/ejb3/trunk/proxy-impl/pom.xml	2009-07-02 12:18:10 UTC (rev 90767)
+++ projects/ejb3/trunk/proxy-impl/pom.xml	2009-07-02 12:45:15 UTC (rev 90768)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
 
   <!-- Model Version -->
@@ -131,6 +131,12 @@
       <groupId>org.jboss.metadata</groupId>
       <artifactId>jboss-metadata</artifactId>
     </dependency>
+    
+    <dependency>
+	<groupId>org.jboss.microcontainer</groupId>
+	<artifactId>jboss-aop-mc-int</artifactId>
+    </dependency>
+    
 
     <dependency>
       <groupId>org.jboss.naming</groupId>

Modified: projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/ProxyFactoryBase.java
===================================================================
--- projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/ProxyFactoryBase.java	2009-07-02 12:18:10 UTC (rev 90767)
+++ projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/ProxyFactoryBase.java	2009-07-02 12:45:15 UTC (rev 90768)
@@ -31,16 +31,18 @@
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.advice.AdviceStack;
 import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.microcontainer.annotations.DisableAOP;
 import org.jboss.logging.Logger;
 
 /**
  * ProxyFactoryBase
- * 
+ *
  * A Base upon which Proxy Factory Implementations may build
  *
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
+ at DisableAOP
 public abstract class ProxyFactoryBase implements ProxyFactory
 {
    // --------------------------------------------------------------------------------||
@@ -63,8 +65,8 @@
     */
    private String containerName;
 
-   /** 
-    * The globally-unique name of the target container 
+   /**
+    * The globally-unique name of the target container
     */
    private String containerGuid;
 
@@ -78,7 +80,7 @@
 
    /**
     * Constructor
-    * 
+    *
     * @param name The unique name for this ProxyFactory
     * @param containerName The name of the InvokableContext (container)
     *   upon which Proxies will invoke
@@ -104,7 +106,7 @@
 
    /**
     * Create a Proxy Constructor for the specified interfaces, using the specified CL
-    * 
+    *
     * @param interfaces
     * @param cl
     * @return
@@ -132,7 +134,7 @@
    /**
     * Returns Proxy interfaces common to all Proxies generated
     * by this ProxyFactory
-    * 
+    *
     * @return
     */
    protected Set<Class<?>> getCommonProxyInterfaces()
@@ -149,10 +151,10 @@
    // --------------------------------------------------------------------------------||
 
    /**
-    * Return the name of the interceptor stack to apply to 
-    * proxies created by this proxy factory, or null 
+    * Return the name of the interceptor stack to apply to
+    * proxies created by this proxy factory, or null
     * if no interceptors should be applied
-    * 
+    *
     * @return
     */
    protected String getInterceptorStackName()
@@ -162,7 +164,7 @@
 
    /**
     * Obtains all interceptors in this Proxy Factory's stack
-    * 
+    *
     * @return
     */
    protected Interceptor[] getInterceptors()
@@ -189,9 +191,9 @@
    // --------------------------------------------------------------------------------||
 
    /**
-    * Lifecycle callback to be invoked by 
+    * Lifecycle callback to be invoked by
     * before the ProxyFactory is able to service requests
-    * 
+    *
     *  @throws Exception
     */
    public void start() throws Exception
@@ -202,9 +204,9 @@
 
    /**
     * Lifecycle callback to be invoked by the ProxyFactoryDeployer
-    * before the ProxyFactory is taken out of service, 
+    * before the ProxyFactory is taken out of service,
     * possibly GC'd
-    * 
+    *
     * @throws Exception
     */
    public void stop() throws Exception