diff --git a/jxr/project.xml b/jxr/project.xml index 529358e5..c3884b12 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -23,7 +23,7 @@ 3 maven-jxr-plugin Maven JXR Plug-in - 1.4.1 + 1.4.2-SNAPSHOT Create cross reference. Requires Maven 1.0 RC2. Create cross reference http://maven.apache.org/reference/plugins/jxr/ diff --git a/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java b/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java index 0951fb56..d64d0b6c 100644 --- a/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java +++ b/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java @@ -20,15 +20,21 @@ package org.apache.maven.jxr.pacman; import java.util.*; import java.io.*; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.apache.maven.jxr.util.*; import org.apache.tools.ant.DirectoryScanner; + /** * Given a list of directories, parse them out and store them as rendered * packages, classes, imports, etc. */ public class PackageManager { + /** Log */ + private static final Log LOG = LogFactory.getLog(PackageManager.class); private Hashtable directories = new Hashtable(); @@ -81,6 +87,7 @@ public class PackageManager { // Go through each directory and get the java source // files for this dir. + LOG.info("Scanning " + directory); DirectoryScanner directoryScanner = new DirectoryScanner(); File baseDir = new File(directory); directoryScanner.setBasedir(baseDir); @@ -91,7 +98,7 @@ public class PackageManager for (int j = 0; j < files.length; ++j) { - log("parsing... " + files[j]); + LOG.debug("parsing... " + files[j]); //now parse out this file to get the packages/classname/etc try @@ -113,9 +120,7 @@ public class PackageManager if (jfi.getClassType() != null && jfi.getClassType().getName() != null) { - jp.addClassType(jfi.getClassType()); - } } @@ -167,7 +172,7 @@ public class PackageManager public void dump() { - log("Dumping out PackageManager structure"); + LOG.debug("Dumping out PackageManager structure"); Enumeration pts = this.getPackageTypes(); @@ -177,7 +182,7 @@ public class PackageManager //get the current package and print it. PackageType current = (PackageType)pts.nextElement(); - log(current.getName()); + LOG.debug(current.getName()); //get the classes under the package and print those too. Enumeration classes = current.getClassTypes(); @@ -187,7 +192,7 @@ public class PackageManager ClassType currentClass = (ClassType) classes.nextElement(); - log("\t" + currentClass.getName()); + LOG.debug("\t" + currentClass.getName()); } } diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index ca394560..095bc152 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -25,6 +25,9 @@ Emmanuel Venisse + + Reduce output for non-debug run. + Update commons-* dependencies Remove xmlns on html elements as JSL messes it up