[jboss-cvs] JBossAS SVN: r82929 - in projects/aop/trunk: asintegration-core/src/main/java/org/jboss/aop/classpool and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jan 15 17:06:49 EST 2009


Author: kabir.khan at jboss.com
Date: 2009-01-15 17:06:48 -0500 (Thu, 15 Jan 2009)
New Revision: 82929

Removed:
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolDomainInternal.java
Modified:
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractClassPoolDomain.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractParentDelegationStrategy.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPool.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPoolDomain.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolToClassPoolDomainAdapter.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/DelegatingClassPool.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ParentDelegationStrategy.java
   projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/ClassPoolTest.java
   projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/IsLocalResourcePluginFactoryTestCase.java
   projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/SimpleDelegatingClassPoolTestCase.java
   projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
   projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
   projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/classpool/jbosscl/JBossClClassPoolDomain.java
Log:
[JBAOP-666] Hide methods better

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -30,9 +30,9 @@
 import javassist.scopedpool.ScopedClassPool;
 import javassist.scopedpool.ScopedClassPoolRepository;
 
-import org.apache.log4j.Logger;
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.util.ClassLoaderUtils;
+import org.jboss.logging.Logger;
 
 /**
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractClassPoolDomain.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractClassPoolDomain.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractClassPoolDomain.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -34,10 +34,21 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-public abstract class AbstractClassPoolDomain implements ClassPoolDomainInternal
+public abstract class AbstractClassPoolDomain implements ClassPoolDomain
 {
    protected final Logger logger = Logger.getLogger(this.getClass());
    
+   abstract CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, boolean create);
+   
+   abstract CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace);
+   
+   abstract CtClass getCachedOrCreateFromParent(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace);
+   
+   abstract void addClassPool(DelegatingClassPool pool);
+   
+   abstract void removeClassPool(DelegatingClassPool pool);
+
+   
    protected CtClass getCachedOrCreateFromPoolParent(BaseClassPool initiatingPool, String classname, boolean create, boolean trace)
    {
       if (initiatingPool == null)

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractParentDelegationStrategy.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractParentDelegationStrategy.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/AbstractParentDelegationStrategy.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -33,8 +33,8 @@
 public abstract class AbstractParentDelegationStrategy implements ParentDelegationStrategy
 {
    protected final Logger logger = Logger.getLogger(this.getClass().getName());
-   private ClassPoolDomainInternal domain;
-   private ClassPoolDomainInternal parent;
+   private AbstractClassPoolDomain domain;
+   private AbstractClassPoolDomain parent;
    
    protected AbstractParentDelegationStrategy(ClassPoolDomain parent, ClassPoolToClassPoolDomainAdaptorFactory adaptorFactory)
    {
@@ -48,11 +48,11 @@
       }
       else 
       {
-         if (parent instanceof ClassPoolDomainInternal == false)
+         if (parent instanceof AbstractClassPoolDomain == false)
          {
-            throw new IllegalArgumentException("Parent must implement ClassPoolDomainInternal");         
+            throw new IllegalArgumentException("Parent must implement AbstractClassPoolDomain");         
          }
-         this.parent = (ClassPoolDomainInternal)parent;
+         this.parent = (AbstractClassPoolDomain)parent;
       }
       
       if (this.parent == null)
@@ -67,7 +67,7 @@
       return parent != null;
    }
    
-   protected ClassPoolDomainInternal getDomain()
+   protected AbstractClassPoolDomain getDomain()
    {
       return domain;
    }
@@ -77,7 +77,7 @@
       return parent.getCachedOrCreate(initiatingPool, classname, resourceName, create, trace);
    }
    
-   public void setDomain(ClassPoolDomainInternal domain)
+   public void setDomain(AbstractClassPoolDomain domain)
    {
       if (domain == null)
       {

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPool.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPool.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPool.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -21,6 +21,8 @@
 */ 
 package org.jboss.aop.classpool;
 
+import org.jboss.aop.AspectManager;
+
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.NotFoundException;
@@ -36,7 +38,7 @@
 public class BaseClassPool extends AOPClassPool
 {
    private IsLocalResourcePlugin isLocalResourcePlugin;
-
+   
    public BaseClassPool(ClassLoader cl, ClassPool parent, ScopedClassPoolRepository repository)
    {
       super(cl, parent, repository);
@@ -107,10 +109,8 @@
    public final CtClass get(String classname) throws NotFoundException 
    {
       boolean trace = logger.isTraceEnabled();
-      if (trace)
-      {
-         logger.trace(this + " initiating get of " + classname);
-      }
+      if (trace) logger.trace(this + " initiating get of " + classname);
+
       CtClass clazz = super.get(classname);
       if (trace)
       {
@@ -118,4 +118,11 @@
       }
       return clazz;
    }
+   
+   @Override
+   public void close()
+   {
+      if (logger.isTraceEnabled()) logger.trace(this + " closing");
+   }
+
 }

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPoolDomain.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPoolDomain.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/BaseClassPoolDomain.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -33,7 +33,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-public class BaseClassPoolDomain extends AbstractClassPoolDomain implements ClassPoolDomainInternal
+public class BaseClassPoolDomain extends AbstractClassPoolDomain
 {
    private String domainName;
    
@@ -59,7 +59,8 @@
       if (logger.isTraceEnabled()) logger.trace("Created " + this + " parentDelegationStrategy:" + parentDelegationStrategy);
    }
    
-   public synchronized void addClassPool(DelegatingClassPool pool)
+   @Override
+   synchronized void addClassPool(DelegatingClassPool pool)
    {
       if (!delegatingPools.contains(pool))
       {
@@ -68,13 +69,15 @@
       }
    }
    
-   public synchronized void removeClassPool(DelegatingClassPool pool)
+   @Override
+   protected synchronized void removeClassPool(DelegatingClassPool pool)
    {
       if (logger.isTraceEnabled()) logger.trace(this + " removing pool " + pool);
       delegatingPools.remove(pool);
    }
    
-   public synchronized CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, boolean create)
+   @Override
+   synchronized CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, boolean create)
    {
       boolean trace = logger.isTraceEnabled();
       String resourceName = ClassLoaderUtils.getResourceName(classname);
@@ -88,7 +91,8 @@
       return clazz;
    }
    
-   public CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
+   @Override
+   protected CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
    {
       if (trace) logger.trace(this + " looking for " + classname);
          
@@ -122,7 +126,8 @@
       return clazz;
    }
 
-   public CtClass getCachedOrCreateFromParent(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
+   @Override
+   protected CtClass getCachedOrCreateFromParent(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
    {
       return parentDelegationStrategy.getCachedOrCreateFromParent(initiatingPool, classname, resourceName, create, trace);
    }
@@ -132,11 +137,6 @@
       return "[" + super.toString() + " name:" + domainName + "]";
    }
 
-   public List<DelegatingClassPool> getClassPools()
-   {
-      return delegatingPools; 
-   }
-   
    protected boolean isParentBefore(String classname)
    {
       return parentDelegationStrategy.isParentBefore(classname);

Deleted: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolDomainInternal.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolDomainInternal.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolDomainInternal.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* 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.aop.classpool;
-
-import javassist.CtClass;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-interface ClassPoolDomainInternal extends ClassPoolDomain
-{
-   CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, boolean create);
-   
-   CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace);
-   
-   CtClass getCachedOrCreateFromParent(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace);
-   
-   void addClassPool(DelegatingClassPool pool);
-   
-   void removeClassPool(DelegatingClassPool pool);
-
-   
-}

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolToClassPoolDomainAdapter.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolToClassPoolDomainAdapter.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ClassPoolToClassPoolDomainAdapter.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -29,7 +29,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-public class ClassPoolToClassPoolDomainAdapter extends AbstractClassPoolDomain implements ClassPoolDomainInternal
+public class ClassPoolToClassPoolDomainAdapter extends AbstractClassPoolDomain
 {
    protected ClassPool pool;
    
@@ -54,37 +54,29 @@
    }
 
    
-   public synchronized CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
+   synchronized CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
    {
       return getCachedOrCreateFromPool(pool, classname, create, trace);
    }
 
-   public CtClass getCachedOrCreateFromParent(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
+   @Override
+   CtClass getCachedOrCreateFromParent(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
    {
       return null;
    }
 
-   public boolean isParentFirst()
+   void removeClassPool(DelegatingClassPool pool)
    {
-      return !pool.childFirstLookup;
-   }
-
-   public void removeClassPool(DelegatingClassPool pool)
-   {
       throw new IllegalStateException("Cannot remove pools from the domain adaptor");
    }
 
-   public void setParentFirst(boolean parentFirst)
-   {
-      throw new IllegalStateException("Cannot change the parent first setting in the domain adaptor");
-   }
-
    public String toString()
    {
       return "ClassPoolToDomainAdapter[" + System.identityHashCode(this) + " " + pool.toString() + "]";
    }
 
-   public CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, boolean create)
+   @Override
+   CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, boolean create)
    {
       throw new IllegalStateException("Should never be called");
    }

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/DelegatingClassPool.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/DelegatingClassPool.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/DelegatingClassPool.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -34,7 +34,7 @@
  */
 public class DelegatingClassPool extends BaseClassPool
 {
-   private final ClassPoolDomainInternal domain;
+   private final AbstractClassPoolDomain domain;
    
    private boolean closed;
    
@@ -45,11 +45,11 @@
       {
          throw new IllegalArgumentException("Domain was null");
       }
-      if (domain instanceof ClassPoolDomainInternal == false)
+      if (domain instanceof AbstractClassPoolDomain == false)
       {
-         throw new IllegalArgumentException("Domain must implement ClassPoolDomainInternal");
+         throw new IllegalArgumentException("Domain must implement AbstractClassPoolDomain");
       }
-      this.domain = (ClassPoolDomainInternal)domain;
+      this.domain = (AbstractClassPoolDomain)domain;
       if (logger.isTraceEnabled()) logger.trace(this + " domain:" + this);
       this.domain.addClassPool(this);
    }
@@ -92,7 +92,6 @@
    @Override
    public void close()
    {
-      if (logger.isTraceEnabled()) logger.trace(this + " closing");
       closed = true;
       super.close();
       domain.removeClassPool(this);

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ParentDelegationStrategy.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ParentDelegationStrategy.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ParentDelegationStrategy.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -30,7 +30,7 @@
  */
 public interface ParentDelegationStrategy
 {
-   void setDomain(ClassPoolDomainInternal domain);
+   void setDomain(AbstractClassPoolDomain domain);
    
    CtClass getCachedOrCreateFromParent(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace);
    

Modified: projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/ClassPoolTest.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/ClassPoolTest.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/ClassPoolTest.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -113,7 +113,7 @@
    protected void setUp() throws Exception
    {
       super.setUp();
-      enableTrace("org.jboss.aop.classpool");
+//      enableTrace("org.jboss.aop.classpool");
    }
 
    protected void assertCannotLoadClass(ClassLoader loader, String classname)

Modified: projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/IsLocalResourcePluginFactoryTestCase.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/IsLocalResourcePluginFactoryTestCase.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/IsLocalResourcePluginFactoryTestCase.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -176,7 +176,6 @@
       {
          return null;
       }
-      
    }
    
    

Modified: projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/SimpleDelegatingClassPoolTestCase.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/SimpleDelegatingClassPoolTestCase.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-core/src/test/java/org/jboss/test/aop/classpool/test/SimpleDelegatingClassPoolTestCase.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -110,4 +110,5 @@
       assertEquals(poolA, a.getClassPool());
       assertEquals(poolB, b.getClassPool());
    }
+   
 }

Modified: projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -30,7 +30,6 @@
 import javassist.scopedpool.ScopedClassPoolRepository;
 
 import org.jboss.aop.classpool.AOPClassPool;
-import org.jboss.logging.Logger;
 
 /**
  * 

Modified: projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -37,7 +37,6 @@
 import org.jboss.classloader.spi.ClassLoaderDomain;
 import org.jboss.classloader.spi.Loader;
 import org.jboss.classloading.spi.RealClassLoader;
-import org.jboss.logging.Logger;
 
 /**
  * 

Modified: projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/classpool/jbosscl/JBossClClassPoolDomain.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/classpool/jbosscl/JBossClClassPoolDomain.java	2009-01-15 20:35:58 UTC (rev 82928)
+++ projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/classpool/jbosscl/JBossClClassPoolDomain.java	2009-01-15 22:06:48 UTC (rev 82929)
@@ -93,7 +93,7 @@
    }
    
    @Override
-   public synchronized void removeClassPool(DelegatingClassPool pool)
+   protected synchronized void removeClassPool(DelegatingClassPool pool)
    {
       super.removeClassPool(pool);
    
@@ -116,7 +116,7 @@
    }
  
    @Override
-   public CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
+   protected CtClass getCachedOrCreate(DelegatingClassPool initiatingPool, String classname, String resourceName, boolean create, boolean trace)
    {
       if (trace) logger.trace(this + " looking for " + classname);
       Module module = getModuleForPool(initiatingPool);




More information about the jboss-cvs-commits mailing list