[infinispan-commits] Infinispan SVN: r587 - in trunk: tools/src/main/java/org/infinispan/tools/doclet/config and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-07-16 03:42:27 -0400 (Thu, 16 Jul 2009)
New Revision: 587

Modified:
   trunk/core/src/main/java/org/infinispan/util/ClassFinder.java
   trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
Log:
improve exception handling and logging

Modified: trunk/core/src/main/java/org/infinispan/util/ClassFinder.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ClassFinder.java	2009-07-15 22:40:53 UTC (rev 586)
+++ trunk/core/src/main/java/org/infinispan/util/ClassFinder.java	2009-07-16 07:42:27 UTC (rev 587)
@@ -86,9 +86,7 @@
             files.add(new File(path));
          }
       }
-
-      log.debug("Looking for infinispan classes in " + files);
-      
+      log.debug("Looking for infinispan classes in " + files);     
       if (files.isEmpty()) {
          return Collections.emptyList();
       } else {
@@ -108,14 +106,17 @@
          List<File> classFiles = new ArrayList<File>();
          dir(classFiles, path);
          for (File cf : classFiles) {
+            String clazz = null;
             try {
-               claz = Util.loadClass(toClassName(cf.getAbsolutePath().toString()));
+               clazz = toClassName(cf.getAbsolutePath().toString());
+               claz = Util.loadClass(clazz);
                classes.add(claz);
+            } catch (NoClassDefFoundError ncdfe) {
+               log.warn(cf.getAbsolutePath().toString() + " has reference to a class "
+                        + ncdfe.getMessage() + " that could not be loaded from classpath");
             } catch (Throwable e) {
-               //We catch Throwable because a valid class can contain reference to a class that is not on classpath
-               //thus java.lang.NoClassDefFoundError is thrown
-               log.warn("Could not load class " + toClassName(cf.getAbsolutePath().toString())
-                        + " on path " + cf.getAbsolutePath().toString(),e);
+               // Catch all since we do not want skip iteration
+               log.warn("On path " + cf.getAbsolutePath().toString() + " could not load class "+ clazz, e);
             }
          }
       } else {
@@ -124,21 +125,24 @@
             try {
                jar = new JarFile(path);
             } catch (Exception ex) {
-               log.warn("Could not create jar file on path " +path);
+               log.warn("Could not create jar file on path " + path);
                return classes;
             }
             Enumeration<JarEntry> en = jar.entries();
             while (en.hasMoreElements()) {
                JarEntry entry = en.nextElement();
                if (entry.getName().endsWith("class")) {
+                  String clazz = null;
                   try {
-                     claz = Util.loadClass(toClassName(entry.getName()));
+                     clazz = toClassName(entry.getName());
+                     claz = Util.loadClass(clazz);
                      classes.add(claz);
+                  } catch (NoClassDefFoundError ncdfe) {
+                     log.warn(entry.getName() + " has reference to a class " + ncdfe.getMessage()
+                              + " that could not be loaded from classpath");
                   } catch (Throwable e) {
-                     //We catch Throwable because a valid class can contain reference to a class that is not on classpath
-                     //thus java.lang.NoClassDefFoundError is thrown
-                     log.warn("Could not load class " + toClassName(entry.getName())
-                              + " as a jar entry with path " + entry.getName(),e);
+                     // Catch all since we do not want skip iteration
+                     log.warn("From jar path " + entry.getName() + " could not load class "+ clazz, e);
                   }
                }
             }

Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java	2009-07-15 22:40:53 UTC (rev 586)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java	2009-07-16 07:42:27 UTC (rev 587)
@@ -46,8 +46,7 @@
 
       List<Class<?>> configBeans;
       try {
-         configBeans = getConfigBeans();
-         System.out.println("Found " + configBeans + " on classpath " + classpath);
+         configBeans = getConfigBeans();        
          
          XMLTreeOutputWalker tw = new XMLTreeOutputWalker(sb);
          TreeNode root = tw.constructTreeFromBeans(configBeans);                 
@@ -213,10 +212,6 @@
       }
       return ces;
    }
-   
-   private boolean isSetterMethod(Method m) {
-      return m.getName().startsWith("set") && m.getParameterTypes().length == 1;
-   }
 
    private Object matchingFieldValue(Method m) throws Exception {
       String name = m.getName();