[jboss-svn-commits] JBL Code SVN: r13974 - labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro.

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

Author: pgier
Date: 2007-08-02 18:23:28 -0400 (Thu, 02 Aug 2007)
New Revision: 13974

Modified:
   labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveDependenciesMojo.java
   labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveMojo.java
Log:
Some minor cleanup and refactoring.

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveDependenciesMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveDependenciesMojo.java	2007-08-02 22:12:42 UTC (rev 13973)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveDependenciesMojo.java	2007-08-02 22:23:28 UTC (rev 13974)
@@ -1,21 +1,11 @@
 package org.jboss.maven.plugins.retro;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.Deflater;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.NameFileFilter;
-import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -23,7 +13,6 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.ResolutionNode;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveMojo.java	2007-08-02 22:12:42 UTC (rev 13973)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jboss-retro-plugin/src/main/java/org/jboss/maven/plugins/retro/WeaveMojo.java	2007-08-02 22:23:28 UTC (rev 13974)
@@ -110,7 +110,7 @@
     * allow the weaved jar to be deployed with the other build artifacts.
     * @parameter
     */
-   protected boolean attachJar = true;
+   protected boolean attachJar = false;
    
    /**
     * Classifier to append to the weaved output file (artifact).
@@ -157,7 +157,7 @@
    
    protected void weaveClasses() throws MojoFailureException {
       // Initialize the WeaveRunner using plugin params
-      Weaver weaver = createWeaver();
+      Weaver weaver = instantiateWeaver();
       weaver.setClasspath(this.buildClasspath());
       weaver.init();
       WeaveRunner weaveRunner = new WeaveRunner(weaver);
@@ -233,7 +233,7 @@
     * can use this class to override the default weaver configuration.
     * @return The weaver instance
     */
-   protected Weaver createWeaver() throws MojoFailureException {
+   protected Weaver instantiateWeaver() throws MojoFailureException {
       // We have to set the classpath first because the initialization
       // may require access to the classpath.
       Weaver weaver = null;