[Jboss-cvs] JBossAS SVN: r56465 - branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading

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

Author: scott.stark at jboss.org
Date: 2006-08-30 23:54:49 -0400 (Wed, 30 Aug 2006)
New Revision: 56465

Modified:
   branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ClassLoaderUtils.java
   branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
   branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java
Log:
Just remove the class loader from the ClassLoaderUtils package mapping as it just gets passed back unused to the listener

Modified: branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ClassLoaderUtils.java
===================================================================
--- branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ClassLoaderUtils.java	2006-08-30 23:11:51 UTC (rev 56464)
+++ branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ClassLoaderUtils.java	2006-08-31 03:54:49 UTC (rev 56465)
@@ -245,11 +245,11 @@
     * @return the updated unique set of package names
     * @throws Exception
     */
-   public static void updatePackageMap(Object cl, URL url, PkgNameListener listener)
+   public static void updatePackageMap(URL url, PkgNameListener listener)
       throws Exception
    {
       ClassPathIterator cpi = new ClassPathIterator(url);
-      updatePackageMap(cl, cpi, listener);
+      updatePackageMap(cpi, listener);
    }
 
    /** Augment the class names associated with a UCL.
@@ -273,7 +273,7 @@
       return updateClassNamesMap(cl, classNamesMap, cpi, classNameSet);
    }
 
-   static void updatePackageMap(Object cl, ClassPathIterator cpi, PkgNameListener listener)
+   static void updatePackageMap(ClassPathIterator cpi, PkgNameListener listener)
       throws Exception
    {
       ClassPathEntry entry;
@@ -283,7 +283,7 @@
          // First look for a META-INF/INDEX.LIST entry
          if( name.equals("META-INF/INDEX.LIST") )
          {
-            readJarIndex(cl, cpi, /*packagesMap, pkgNameSet*/ listener);
+            readJarIndex(cpi, listener);
             // We are done
             break;
          }
@@ -293,7 +293,7 @@
             continue;
 
          String pkgName = entry.toPackageName();
-         listener.addPackage(pkgName, cl);
+         listener.addPackage(pkgName);
       }
       cpi.close();
    }
@@ -328,8 +328,7 @@
    /** Read the JDK 1.3+ META-INF/INDEX.LIST entry to obtain the package
     names without having to iterate through all entries in the jar.
     */
-   private static void readJarIndex(Object cl, ClassPathIterator cpi,
-      /*Map packagesMap, Set pkgNameSet,*/ PkgNameListener listener)
+   private static void readJarIndex(ClassPathIterator cpi, PkgNameListener listener)
       throws Exception
    {
       boolean trace = log.isTraceEnabled();
@@ -352,7 +351,7 @@
          if( line.length() == 0 )
             break;
          String pkgName = line.replace('/', '.');
-         listener.addPackage(pkgName, cl);
+         listener.addPackage(pkgName);
       }
       br.close();
    }
@@ -389,7 +388,7 @@
 
    public static interface PkgNameListener
    {
-      public void addPackage(String name, Object loader);
+      public void addPackage(String name);
    }
 
    /**

Modified: branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
===================================================================
--- branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java	2006-08-30 23:11:51 UTC (rev 56464)
+++ branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java	2006-08-31 03:54:49 UTC (rev 56465)
@@ -783,8 +783,8 @@
       try
       {
          URL url = cl.getURL();
-         PackageMapper listener = new PackageMapper();
-         ClassLoaderUtils.updatePackageMap(cl, url, listener);
+         PackageMapper listener = new PackageMapper(cl);
+         ClassLoaderUtils.updatePackageMap(url, listener);
       }
       catch (Exception e)
       {
@@ -802,8 +802,8 @@
    {
       try
       {
-         PackageMapper listener = new PackageMapper();
-         ClassLoaderUtils.updatePackageMap(cl, url, listener);
+         PackageMapper listener = new PackageMapper(cl);
+         ClassLoaderUtils.updatePackageMap(url, listener);
       }
       catch (Exception e)
       {
@@ -1059,8 +1059,13 @@
 
    private class PackageMapper implements ClassLoaderUtils.PkgNameListener
    {
-      public void addPackage(String pkgName, Object loader)
+      private RepositoryClassLoader loader;
+      PackageMapper(RepositoryClassLoader loader)
       {
+         this.loader = loader;
+      }
+      public void addPackage(String pkgName)
+      {
          // Skip the standard J2EE archive directories
          if( pkgName.startsWith("META-INF") || pkgName.startsWith("WEB-INF") )
             return;

Modified: branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java
===================================================================
--- branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java	2006-08-30 23:11:51 UTC (rev 56464)
+++ branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java	2006-08-31 03:54:49 UTC (rev 56465)
@@ -732,11 +732,11 @@
       boolean trace = log.isTraceEnabled();
       try
       {
-         PackageMapper listener = new PackageMapper();
+         PackageMapper listener = new PackageMapper(cl);
          URL[] cp = cl.getClasspath();
          for(URL url : cp)
          {
-            ClassLoaderUtils.updatePackageMap(cl, url, listener);
+            ClassLoaderUtils.updatePackageMap(url, listener);
          }
       }
       catch (Exception e)
@@ -1043,8 +1043,13 @@
 
    class PackageMapper implements ClassLoaderUtils.PkgNameListener
    {
-      public void addPackage(String pkgName, Object loader)
+      private DomainClassLoader loader;
+      PackageMapper(DomainClassLoader loader)
       {
+         this.loader = loader;
+      }
+      public void addPackage(String pkgName)
+      {
          // Skip the standard J2EE archive directories
          if( pkgName.startsWith("META-INF") || pkgName.startsWith("WEB-INF") )
             return;