svn commit: r233049 - in /maven/components/trunk/maven-plugins: maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java

[jdcasey]

Author: jdcasey
Date: Tue Aug 16 13:19:38 2005
New Revision: 233049

URL: http://svn.apache.org/viewcvs?rev=233049&view=rev
Log:
Removing attached-Artifact creation code, replacing with 
MavenProjectHelper.attachArtifact(..).

Modified:
    
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
    
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java

Modified: 
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=233049&r1=233048&r2=233049&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
 Tue Aug 16 13:19:38 2005
@@ -17,7 +17,6 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
@@ -29,6 +28,7 @@
 import org.apache.maven.plugins.assembly.model.FileSet;
 import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
@@ -87,11 +87,11 @@
     private MavenProject project;
 
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
+     * @parameter 
expression="${component.org.apache.maven.project.MavenProjectHelper}"
      * @required
      * @readonly
      */
-    private ArtifactFactory artifactFactory;
+    private MavenProjectHelper projectHelper;
 
        
 
@@ -156,28 +156,13 @@
                    archiver.setDestFile( destFile );
                    archiver.createArchive();
                    
-                   addAttachedArtifact( destFile , format);
+                projectHelper.attachArtifact(project, format, format + 
"-assembly", destFile );
                }
            }
            finally
            {
                IOUtil.close( r );
            }
-       }
-
-       private void addAttachedArtifact(File destFile, String format) {
-               
-        Artifact artifact = artifactFactory.createArtifactWithClassifier( 
-                       project.getGroupId(),
-                project.getArtifactId(),
-                project.getVersion(), 
-                format,
-                null );
-                
-        artifact.setFile( destFile );
-
-        project.addAttachedArtifact( artifact );               
-               
        }
 
        private void processDependencySets(Archiver archiver, List 
dependencySets, boolean includeBaseDirectory) throws ArchiverException, 
IOException, Exception {

Modified: 
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=233049&r1=233048&r2=233049&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
 Tue Aug 16 13:19:38 2005
@@ -18,11 +18,10 @@
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
 
 import java.io.File;
 
@@ -75,11 +74,11 @@
     private MavenProject project;
 
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
+     * @parameter 
expression="${component.org.apache.maven.project.MavenProjectHelper}"
      * @required
      * @readonly
      */
-    private ArtifactFactory artifactFactory;
+    private MavenProjectHelper projectHelper;
 
     /**
      * @parameter
@@ -131,13 +130,7 @@
                 clientArchiver.createArchive( project, archive );
 
                 // TODO: shouldn't need classifer
-                Artifact artifact = 
artifactFactory.createArtifactWithClassifier( project.getGroupId(),
-                                                                               
   project.getArtifactId(),
-                                                                               
   project.getVersion(), null,
-                                                                               
   "ejb-client", "client" );
-                artifact.setFile( clientJarFile );
-
-                project.addAttachedArtifact( artifact );
+                projectHelper.attachArtifact( project, "ejb-client", "client", 
clientJarFile );
             }
         }
         catch ( Exception e )



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]