maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject svn commit: r409257 - in /maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer: DefaultArtifactDeployer.java NamedArtifactDeployer.java
Date Wed, 24 May 2006 21:58:15 GMT
Author: aheritier
Date: Wed May 24 14:58:15 2006
New Revision: 409257

URL: http://svn.apache.org/viewvc?rev=409257&view=rev
Log:
Remove duplicated code between NamedArtifactDeployer and DefaultArtifactDeployer

Modified:
    maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
    maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java

Modified: maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=409257&r1=409256&r2=409257&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++ maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Wed May 24 14:58:15 2006
@@ -16,6 +16,21 @@
  * limitations under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,21 +58,6 @@
 import org.apache.maven.wagon.repository.Repository;
 import org.codehaus.plexus.util.FileUtils;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.security.NoSuchAlgorithmException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
 /**
  * Default implementation of Artifact Deployer interface.
  *
@@ -68,16 +68,16 @@
     implements ArtifactDeployer
 {
 
-    private static final String POM_TYPE = "pom";
+    protected static final String POM_TYPE = "pom";
 
     private static final ArtifactTypeHandler POM_ARTIFACT_TYPE_HANDLER = new DefaultArtifactTypeHandler();
 
     /**
      * Date/time stamp which is appended to snapshot filenames
      */
-    private final static String SNAPSHOT_FORMAT = "yyyyMMdd.HHmmss";
+    protected final static String SNAPSHOT_FORMAT = "yyyyMMdd.HHmmss";
 
-    private String snapshotSignature;
+    protected String snapshotSignature;
 
     private static final Log LOG = LogFactory.getLog( DefaultArtifactDeployer.class );
 
@@ -87,7 +87,7 @@
     public void deploy( String artifact, String type, Project project, ArtifactTypeHandler
handler )
         throws MavenException
     {
-        handleDeploy( type, project, artifact, handler, project.getCurrentVersion() );
+        handleDeploy( type, project, project.getArtifactId(), artifact, handler, project.getCurrentVersion()
);
     }
 
     /**
@@ -96,10 +96,10 @@
     public void deploySnapshot( String artifact, String type, Project project, ArtifactTypeHandler
handler )
         throws MavenException
     {
-        handleDeploy( type, project, artifact, handler, MavenConstants.SNAPSHOT_SIGNIFIER
);
+        handleDeploy( type, project, project.getArtifactId(), artifact, handler, MavenConstants.SNAPSHOT_SIGNIFIER
);
     }
 
-    private void handleDeploy( String type, Project project, String artifact, ArtifactTypeHandler
handler,
+    protected void handleDeploy( String type, Project project, String artifactId, String
artifact, ArtifactTypeHandler handler,
                                String version )
         throws MavenException
     {
@@ -116,10 +116,10 @@
         // do not deploy POM twice
         if ( !POM_TYPE.equals( type ) )
         {
-            doDeploy( PomRewriter.getRewrittenPom( project ), project, POM_ARTIFACT_TYPE_HANDLER,
version, POM_TYPE );
+            doDeploy( PomRewriter.getRewrittenPom( project ), project, artifactId, POM_ARTIFACT_TYPE_HANDLER,
version, POM_TYPE );
         }
 
-        doDeploy( file, project, handler, version, type );
+        doDeploy( file, project, artifactId, handler, version, type );
 
         snapshotSignature = null;
 
@@ -191,7 +191,7 @@
         }
     }
 
-    private String findSshIdentity()
+    protected String findSshIdentity()
     {
         String key = findSshIdentity( System.getProperty( "user.home" ) );
         if ( key != null )
@@ -239,7 +239,7 @@
         return null;
     }
 
-    private void doDeploy( File file, Project project, ArtifactTypeHandler handler, String
version, String type )
+    private void doDeploy( File file, Project project, String artifactId, ArtifactTypeHandler
handler, String version, String type )
         throws MavenException
     {
         List srcFiles = new ArrayList( 3 );
@@ -253,10 +253,10 @@
             String signature = getSnapshotSignature();
             String v = StringUtils.replace( version, MavenConstants.SNAPSHOT_SIGNIFIER, signature
);
 
-            File snapshotVersionFile = createSnapshotVersionFile( file, v, project, type
);
+            File snapshotVersionFile = createSnapshotVersionFile( file, v, artifactId, type
);
 
             String snapshotVersionsFilename = handler.constructRepositoryDirectoryPath( type,
project ) +
-                project.getArtifactId() + "-snapshot-version";
+                artifactId + "-snapshot-version";
 
             srcFiles.add( snapshotVersionFile );
             destFiles.add( snapshotVersionsFilename );
@@ -335,14 +335,14 @@
         }
     }
 
-    private void deployFile( Repository repository, File src, String dest, Project project
)
+    protected void deployFile( Repository repository, File src, String dest, Project project
)
         throws ResourceDoesNotExistException, MalformedURLException, NoSuchAlgorithmException,
TransferFailedException,
         ConnectionException, AuthenticationException, AuthorizationException, MavenException
     {
         deployFiles( repository, Collections.singletonList( src ), Collections.singletonList(
dest ), null, project );
     }
 
-    private void deployFiles( Repository repository, List srcFiles, List destFiles,
+    protected void deployFiles( Repository repository, List srcFiles, List destFiles,
                               AuthenticationInfo authenticationInfo, Project project )
         throws ConnectionException, AuthenticationException, ResourceDoesNotExistException,
TransferFailedException,
         AuthorizationException, MalformedURLException, NoSuchAlgorithmException, MavenException
@@ -451,7 +451,7 @@
 		return wagon;
 	}
 
-    private String getSnapshotSignature()
+    protected String getSnapshotSignature()
     {
         if ( snapshotSignature == null )
         {
@@ -462,7 +462,7 @@
         return snapshotSignature;
     }
 
-    private File getFileForArtifact( String artifact )
+    protected File getFileForArtifact( String artifact )
         throws MavenException
     {
         File file = new File( artifact );
@@ -487,11 +487,11 @@
     /**
      * Create a file which contains timestamp of the latetst snapshot
      */
-    private File createSnapshotVersionFile( File artifact, String snapshotVersion, Project
project, String type )
+    protected File createSnapshotVersionFile( File artifact, String snapshotVersion, String
artifactId, String type )
         throws MavenException
     {
         File file = null;
-        String filename = project.getArtifactId() + "-" + type + "-snapshot-version";
+        String filename = artifactId + "-" + type + "-snapshot-version";
         try
         {
             file = new File( artifact.getParent(), filename );

Modified: maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java?rev=409257&r1=409256&r2=409257&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java
(original)
+++ maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java
Wed May 24 14:58:15 2006
@@ -17,45 +17,9 @@
  * ====================================================================
  */
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.maven.MavenConstants;
 import org.apache.maven.MavenException;
-import org.apache.maven.artifact.PomRewriter;
 import org.apache.maven.project.Project;
-import org.apache.maven.wagon.ConnectionException;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.events.TransferListener;
-import org.apache.maven.wagon.observers.ChecksumObserver;
-import org.apache.maven.wagon.providers.file.FileWagon;
-import org.apache.maven.wagon.providers.ftp.FtpWagon;
-import org.apache.maven.wagon.providers.http.HttpWagon;
-import org.apache.maven.wagon.providers.ssh.ScpWagon;
-import org.apache.maven.wagon.providers.ssh.SftpWagon;
-import org.apache.maven.wagon.providers.sshext.ScpExternalWagon;
-import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.util.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.security.NoSuchAlgorithmException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
 
 /**
  * Default implementation of Artifact Deployer interface.
@@ -65,22 +29,13 @@
 public class NamedArtifactDeployer extends DefaultArtifactDeployer
 {
 
-    private static final String POM_TYPE = "pom";
-
-    /** Date/time stamp which is appended to snapshot filenames. */
-    private static final String SNAPSHOT_FORMAT = "yyyyMMdd.HHmmss";
-
-    private String snapshotSignature;
-
-    private static final Log LOG = LogFactory.getLog( NamedArtifactDeployer.class );
-
     /**
      * @see ArtifactDeployer#deploy(String, String, Project, NamedArtifactTypeHandler)
      */
     public void deploy( String artifact, String type, Project project, NamedArtifactTypeHandler
handler )
         throws MavenException
     {
-        handleDeploy( type, project, artifact, handler, project.getCurrentVersion() );
+        handleDeploy( type, project, handler.getArtifactId(), artifact, handler, project.getCurrentVersion()
);
     }
 
     /**
@@ -89,419 +44,6 @@
     public void deploySnapshot( String artifact, String type, Project project, NamedArtifactTypeHandler
handler )
         throws MavenException
     {
-        handleDeploy( type, project, artifact, handler, MavenConstants.SNAPSHOT_SIGNIFIER
);
-    }
-
-    private void handleDeploy( String type, Project project, String artifact, NamedArtifactTypeHandler
handler,
-                               String version )
-        throws MavenException
-    {
-        File file;
-        if ( POM_TYPE.equals( type ) )
-        {
-            file = PomRewriter.getRewrittenPom( project );
-        }
-        else
-        {
-            file = getFileForArtifact( artifact );
-        }
-
-        // do not deploy POM twice
-        if ( !POM_TYPE.equals( type ) )
-        {
-            doDeploy( PomRewriter.getRewrittenPom( project ), project, handler, version,
POM_TYPE );
-        }
-
-        doDeploy( file, project, handler, version, type );
-
-        snapshotSignature = null;
-
-    }
-
-    /**
-     * @see ArtifactDeployer#install(String, String, Project, NamedArtifactTypeHandler)
-     */
-    public void install( String artifact, String type, Project project, NamedArtifactTypeHandler
handler )
-        throws MavenException
-    {
-        handleInstall( type, project, artifact, handler, project.getCurrentVersion() );
-    }
-
-    /**
-     * @see ArtifactDeployer#installSnapshot(String, String, Project, NamedArtifactTypeHandler)
-     */
-    public void installSnapshot( String artifact, String type, Project project, NamedArtifactTypeHandler
handler )
-        throws MavenException
-    {
-        handleInstall( type, project, artifact, handler, MavenConstants.SNAPSHOT_SIGNIFIER
);
-    }
-
-    private void handleInstall( String type, Project project, String artifact, NamedArtifactTypeHandler
handler,
-                                String version )
-        throws MavenException
-    {
-        File file;
-        if ( POM_TYPE.equals( type ) )
-        {
-            file = PomRewriter.getRewrittenPom( project );
-        }
-        else
-        {
-            file = getFileForArtifact( artifact );
-        }
-
-        doInstall( file, type, project, version, handler );
-
-        // do not install twice
-        if ( !POM_TYPE.equals( type ) )
-        {
-            doInstall( PomRewriter.getRewrittenPom( project ), POM_TYPE, project, version,
handler );
-        }
-    }
-
-    /**
-     * Install given file in local repository
-     *
-     * @param file the artifact file to install
-     * @param type The type of the artiafct
-     * @param project The project
-     * @param version String denominating the version of the artifact
-     * @throws MavenException MavenException
-     */
-    private void doInstall( File file, String type, Project project, String version, NamedArtifactTypeHandler
handler )
-        throws MavenException
-    {
-        try
-        {
-            Repository repository = new Repository( "local", "file:" + project.getContext().getMavenRepoLocal()
);
-            String repositoryPath = handler.constructRepositoryFullPath( type, project, version
);
-            deployFile( repository, file, repositoryPath, project );
-        }
-        catch ( Exception e )
-        {
-            String msg = "Cannot install file: '" + file + "'. Reason: " + e.getMessage();
-            throw new MavenException( msg, e );
-        }
-    }
-
-    private String findSshIdentity()
-    {
-        String key = findSshIdentity( System.getProperty( "user.home" ) );
-        if ( key != null )
-        {
-            return key;
-        }
-        if ( !( System.getProperty( "user.home" ).equals( System.getProperty( "user.home.env"
) ) ) )
-        {
-            key = findSshIdentity( System.getProperty( "user.home.env" ) );
-            if ( key != null )
-            {
-                return key;
-            }
-        }
-        LOG.warn( "Unable to locate identity id_rsa, id_dsa or identity - set maven.repo.default.privatekey"
);
-        return null;
-    }
-
-    private String findSshIdentity( String home )
-    {
-        if ( home == null )
-        {
-            return null;
-        }
-        File sshHome = new File( home, ".ssh" );
-        LOG.debug( "Looking for SSH keys in " + sshHome );
-        File key = new File( sshHome, "id_dsa" );
-        if ( key.exists() )
-        {
-            LOG.debug( "found " + key );
-            return key.getAbsolutePath();
-        }
-        key = new File( sshHome, "id_rsa" );
-        if ( key.exists() )
-        {
-            LOG.debug( "found " + key );
-            return key.getAbsolutePath();
-        }
-        key = new File( sshHome, "identity" );
-        if ( key.exists() )
-        {
-            LOG.debug( "found " + key );
-            return key.getAbsolutePath();
-        }
-        return null;
-    }
-
-    private void doDeploy( File file, Project project, NamedArtifactTypeHandler handler,
String version, String type )
-        throws MavenException
-    {
-        List srcFiles = new ArrayList( 3 );
-        List destFiles = new ArrayList( 3 );
-
-        srcFiles.add( file );
-        destFiles.add( handler.constructRepositoryFullPath( type, project, version ) );
-
-        if ( version.indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) >= 0 )
-        {
-            String signature = getSnapshotSignature();
-            String v = StringUtils.replace( version, MavenConstants.SNAPSHOT_SIGNIFIER, signature
);
-
-            File snapshotVersionFile = createSnapshotVersionFile( file, v, project, type,
handler );
-
-            String snapshotVersionsFilename = handler.constructRepositoryDirectoryPath( type,
project )
-                + handler.getArtifactId() + "-snapshot-version";
-
-            srcFiles.add( snapshotVersionFile );
-            destFiles.add( snapshotVersionsFilename );
-
-            String deployTimestamp =
-                (String) project.getContext().getVariable( "maven.artifact.deploy.timestamps"
);
-            if ( deployTimestamp.equals("true") )
-            {
-                srcFiles.add( file );
-                destFiles.add( handler.constructRepositoryFullPath( type, project, v ) );
-            }
-        }
-
-        // trick add special values to context for default repository;
-
-        String repoStr = (String) project.getContext().getVariable( "maven.repo.list" );
-
-        if ( repoStr == null || repoStr.trim().length() == 0 )
-        {
-            String central = project.getDistributionSite();
-            String centralDirectory = project.getDistributionDirectory();
-            if ( central == null || central.trim().length() == 0 )
-            {
-                central = (String) project.getContext().getVariable( "maven.repo.central"
);
-                centralDirectory = (String) project.getContext().getVariable( "maven.repo.central.directory"
);
-            }
-            if ( central != null && central.trim().length() > 0 )
-            {
-                repoStr = "default";
-                project.getContext().setVariable( "maven.repo.default", "scp://" + central
);
-                if ( project.getContext().getVariable( "maven.repo.default.privatekey" )
== null )
-                {
-                    project.getContext().setVariable( "maven.repo.default.privatekey", findSshIdentity()
);
-                }
-                if ( project.getContext().getVariable( "maven.repo.default.passphrase" )
== null )
-                {
-                    LOG.warn( "WARNING: assuming empty passphrase. Specify maven.repo.default.passphrase
if needed" );
-                    project.getContext().setVariable( "maven.repo.default.passphrase", ""
);
-                }
-                project.getContext().setVariable( "maven.repo.default.directory", centralDirectory
);
-                project.getContext().setVariable( "maven.repo.default.username",
-                                                  project.getContext().getVariable( "maven.username"
) );
-                project.getContext().setVariable( "maven.repo.default.group",
-                                                  project.getContext().getVariable( "maven.remote.group"
) );
-            }
-        }
-
-        String[] repos = StringUtils.split( repoStr, "," );
-
-        LOG.info( "Will deploy to " + repos.length + " repository(ies): " + repoStr );
-        boolean success = false;
-        for ( int i = 0; i < repos.length; i++ )
-        {
-
-            String repo = repos[i].trim();
-            LOG.info( "Deploying to repository: " + repo );
-            Repository repository = RepositoryBuilder.getRepository( project, repo );
-            AuthenticationInfo authenticationInfo = RepositoryBuilder.getAuthenticationInfo(
project, repo );
-            try
-            {
-                deployFiles( repository, srcFiles, destFiles, authenticationInfo, project
);
-                success = true;
-            }
-            catch ( Exception e )
-            {
-                String msg = "Failed to deploy to: " + repository.getId() + " Reason: " +
e;
-                LOG.warn( msg, e );
-                // deploy to next repository
-                continue;
-            }
-
-        }
-        if ( !success )
-        {
-            throw new MavenException( "Unable to deploy to any repositories" );
-        }
-    }
-
-    private void deployFile( Repository repository, File src, String dest, Project project
)
-        throws ResourceDoesNotExistException, MalformedURLException, NoSuchAlgorithmException,
TransferFailedException,
-        ConnectionException, AuthenticationException, AuthorizationException, MavenException
-    {
-        deployFiles( repository, Collections.singletonList( src ), Collections.singletonList(
dest ), null, project );
-    }
-
-    private void deployFiles( Repository repository, List srcFiles, List destFiles,
-                              AuthenticationInfo authenticationInfo, Project project )
-        throws ConnectionException, AuthenticationException, ResourceDoesNotExistException,
TransferFailedException,
-        AuthorizationException, MalformedURLException, NoSuchAlgorithmException, MavenException
-    {
-
-        if ( srcFiles.size() != destFiles.size() )
-        {
-            String msg = "Lengths of the lists should be the same";
-            throw new IllegalArgumentException( msg );
-        }
-
-        Wagon wagon = getWagon( repository.getProtocol(), project, repository.getId() );
-
-        TransferListener uploadMonitor = new UploadMeter();
-
-        Map checksums = new HashMap( 2 );
-
-        ChecksumObserver observer = new ChecksumObserver( "MD5" );
-        checksums.put( "md5", observer );
-        wagon.addTransferListener( observer );
-        observer = new ChecksumObserver( "SHA-1" );
-        checksums.put( "sha1", observer );
-        wagon.addTransferListener( observer );
-
-        try
-        {
-            wagon.connect( repository, authenticationInfo );
-            Iterator srcIterator = srcFiles.iterator();
-            Iterator destIterator = destFiles.iterator();
-            while ( srcIterator.hasNext() )
-            {
-                wagon.addTransferListener( uploadMonitor );
-
-                File srcFile = (File) srcIterator.next();
-                String destFile = (String) destIterator.next();
-                wagon.put( srcFile, destFile );
-
-                wagon.removeTransferListener( uploadMonitor );
-
-                Map sums = new HashMap( 2 );
-                for ( Iterator i = checksums.keySet().iterator(); i.hasNext(); )
-                {
-                    // store first - a later put will modify them
-                    String extension = (String) i.next();
-                    observer = (ChecksumObserver) checksums.get( extension );
-                    sums.put( extension, observer.getActualChecksum() );
-                }
-
-                for ( Iterator i = checksums.keySet().iterator(); i.hasNext(); )
-                {
-                    String extension = (String) i.next();
-
-                    // TODO: shouldn't need a file intermediatary - improve wagon to take
a stream
-                    File temp = File.createTempFile( "maven-artifact", null );
-                    temp.deleteOnExit();
-                    FileUtils.fileWrite( temp.getAbsolutePath(), (String) sums.get( extension
) );
-
-                    wagon.put( temp, destFile + "." + extension );
-                }
-            }
-        }
-        catch ( IOException e )
-        {
-            throw new MavenException( "Error creating temporary file to transfer checksums",
e );
-        }
-        finally
-        {
-            try
-            {
-                wagon.disconnect();
-            }
-            catch ( Exception e )
-            {
-                LOG.error( "Error cleaning up from the deployer", e );
-            }
-        }
-    }
-
-    private Wagon getWagon( String protocol, Project project, String id )
-        throws MalformedURLException
-    {
-        if ( protocol.equals( "http" ) )
-        {
-            return new HttpWagon();
-        }
-        else if ( protocol.equals( "ftp" ) )
-        {
-            FtpWagon ftpWagon = new FtpWagon();
-            RepositoryBuilder.configureFtpWagon( project, id, ftpWagon );
-            return ftpWagon;
-        }
-        else if ( protocol.equals( "sftp" ) )
-        {
-            return new SftpWagon();
-        }
-        else if ( protocol.equals( "file" ) )
-        {
-            return new FileWagon();
-        }
-        else if ( protocol.equals( "scp" ) )
-        {
-            return new ScpWagon();
-        }
-        else if ( protocol.equals( "scpexe" ) )
-        {
-            ScpExternalWagon scpExternalWagon = new ScpExternalWagon();
-            RepositoryBuilder.configureSshExternalWagon( project, id, scpExternalWagon );
-            return scpExternalWagon;
-        }
-        else
-        {
-            throw new MalformedURLException( "Unknown Wagon protocol: " + protocol );
-        }
-    }
-
-    private String getSnapshotSignature()
-    {
-        if ( snapshotSignature == null )
-        {
-            DateFormat fmt = new SimpleDateFormat( SNAPSHOT_FORMAT );
-            fmt.setTimeZone( TimeZone.getTimeZone( "GMT" ) );
-            snapshotSignature = fmt.format( new Date() );
-        }
-        return snapshotSignature;
-    }
-
-    private File getFileForArtifact( String artifact )
-        throws MavenException
-    {
-        File file = new File( artifact );
-        if ( !file.exists() )
-        {
-            String msg = "Artifact file: '" + artifact + "' must exist";
-            throw new MavenException( msg );
-        }
-        if ( !file.canRead() )
-        {
-            String msg = "Artifact file: '" + artifact + "' must be readable";
-            throw new MavenException( msg );
-        }
-        if ( file.isDirectory() )
-        {
-            String msg = "Artifact file: '" + artifact + "' must not be a directory";
-            throw new MavenException( msg );
-        }
-        return file.getAbsoluteFile();
+        handleDeploy( type, project, handler.getArtifactId(), artifact, handler, MavenConstants.SNAPSHOT_SIGNIFIER
);
     }
-
-    // Create a file which contains timestamp of the latest snapshot
-    private File createSnapshotVersionFile( File artifact, String snapshotVersion,
-            Project project, String type, NamedArtifactTypeHandler handler )
-            throws MavenException
-    {
-        File file = null;
-        String filename = handler.getArtifactId() + "-" + type + "-snapshot-version";
-        try
-        {
-            file = new File( artifact.getParent(), filename );
-            FileUtils.fileWrite( file.getAbsolutePath(), snapshotVersion );
-            file.deleteOnExit();
-        }
-        catch ( Exception e )
-        {
-            throw new MavenException( "Cannot create snapshot-version file:" + file );
-        }
-        return file;
-    }
-
 }



Mime
View raw message