dion 2002/10/13 18:57:03
Modified: src/java/org/apache/maven/app PluginManager.java
Log:
Add isDebugEnabled around some debug messages, and refactor redundant call to
getPluginDir into a local
Revision Changes Path
1.36 +33 -11
jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- PluginManager.java 8 Oct 2002 02:40:34 -0000 1.35
+++ PluginManager.java 14 Oct 2002 01:57:03 -0000 1.36
@@ -280,16 +280,23 @@
// If there is no plugin.properties then this method will simply return
loadPluginProperties(name);
- log.debug("\n\nLOADING PLUGIN: " + name + " -> " + getPluginDir(name));
-
Forehead.getInstance().getClassLoader("root.maven").addURL(getPluginDir(name).toURL());
- Project pluginProject = MavenUtils.getProject(new
File(getPluginDir(name),"project.xml"));
+ File pluginDir = getPluginDir(name);
+ if (log.isDebugEnabled())
+ {
+ log.debug("\n\nLOADING PLUGIN: " + name + " -> " + pluginDir);
+ }
+
Forehead.getInstance().getClassLoader("root.maven").addURL(pluginDir.toURL());
+ Project pluginProject = MavenUtils.getProject(new File(pluginDir,
"project.xml"));
Map pluginProperties = pluginProject.resolvedProperties();
integrateProps(pluginProperties);
if (!isPluginProcessed(name))
{
- log.debug("VERIFYING PLUGIN");
+ if (log.isDebugEnabled())
+ {
+ log.debug("VERIFYING PLUGIN");
+ }
// Retrieve the dependencies that this plugin requires.
getProjectVerifier().setMavenProject(pluginProject);
getProjectVerifier().doExecute();
@@ -298,14 +305,23 @@
createNewFile(getPluginProcessedMarker(name));
}
- log.debug("Loading plugin dependencies:");
+ if (log.isDebugEnabled())
+ {
+ log.debug("Loading plugin dependencies:");
+ }
for (Iterator i = pluginProject.getDependencies().iterator(); i.hasNext();)
{
Dependency dependency = (Dependency) i.next();
- log.debug("dependency: " + dependency.getId());
+ if (log.isDebugEnabled())
+ {
+ log.debug("dependency: " + dependency.getId());
+ }
String classloader = dependency.getProperty("classloader");
- log.debug("classloader: " + classloader);
+ if (log.isDebugEnabled())
+ {
+ log.debug("classloader: " + classloader);
+ }
// Only add compile type dependencies to classloader
if (classloader != null &&
@@ -314,8 +330,11 @@
Artifact artifact =
DefaultArtifactFactory.createArtifact(dependency);
String localRepo = (String)
getJellyContext().getVariable("maven.repo.local");
File jarFile = new File(localRepo,artifact.getPath());
-
- log.debug("jarFile: " + jarFile);
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("jarFile: " + jarFile);
+ }
// We have the jar and the classloader to push it into so
// lets do it!
@@ -324,7 +343,10 @@
// Make sure the stated classloader actually exists.
if (Forehead.getInstance().getClassLoader(classloader) != null)
{
- log.debug("Adding " + jarFile + " to " + classloader);
+ if (log.isDebugEnabled())
+ {
+ log.debug("Adding " + jarFile + " to " + classloader);
+ }
Forehead.getInstance().getClassLoader(classloader).addURL(jarFile.toURL());
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
