svn commit: r354750 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java

[aramirez]

Author: aramirez
Date: Wed Dec  7 00:17:11 2005
New Revision: 354750

URL: http://svn.apache.org/viewcvs?rev=354750&view=rev
Log:
PR: MNG-1772

-fixed inconsistencies of parameter names
-applied the @component expression

Modified:
    
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=354750&r1=354749&r2=354750&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
 Wed Dec  7 00:17:11 2005
@@ -74,12 +74,13 @@
         * @parameter expression="${file}"
         * @required
         */
-       private File deployFile;
+       private File file;
        
        /**
         * Server Id to map on the <id> under <server> section of 
settings.xml
         * 
-        * @parameter expression="${serverId}" default-value="my-repo"
+        * @parameter expression="${repositoryId}"
+        * @required
         */
        private String repositoryId;
        
@@ -93,23 +94,17 @@
        private String url;
        
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
-     * @required
-     * @readonly
+     * @component
      */
     private ArtifactFactory artifactFactory;   
     
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout}"
-     * @required
-     * @readonly
+     * @component
      */
     private ArtifactRepositoryLayout layout;    
     
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.repository.ArtifactRepositoryFactory}"
-     * @required
-     * @readonly
+     * @component
      */
     private ArtifactRepositoryFactory repositoryFactory;
        
@@ -122,16 +117,16 @@
                        ArtifactRepository deploymentRepository = 
                                
repositoryFactory.createDeploymentArtifactRepository( repositoryId, url, 
layout, false );
                        
-               if ( deployFile == null )
+               if ( file == null )
                {
                    throw new MojoExecutionException(
                        "The packaging for this project did not assign a file 
to the build artifact" );
                }
                else
                {
-                       if( deployFile.exists() )
+                       if( file.exists() )
                        {
-                               getDeployer().deploy( deployFile, artifact, 
deploymentRepository, getLocalRepository() );       
+                               getDeployer().deploy( file, artifact, 
deploymentRepository, getLocalRepository() );     
                        }
                }
                }