You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/12/01 17:17:09 UTC
svn commit: r885816 -
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Author: brett
Date: Tue Dec 1 16:17:08 2009
New Revision: 885816
URL: http://svn.apache.org/viewvc?rev=885816&view=rev
Log:
formatting only
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=885816&r1=885815&r2=885816&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java Tue Dec 1 16:17:08 2009
@@ -292,8 +292,7 @@
try
{
Configuration config = configuration.getConfiguration();
- ManagedRepositoryConfiguration repoConfig =
- config.findManagedRepositoryById( repositoryId );
+ ManagedRepositoryConfiguration repoConfig = config.findManagedRepositoryById( repositoryId );
ArtifactReference artifactReference = new ArtifactReference();
artifactReference.setArtifactId( artifactId );
@@ -345,20 +344,22 @@
filename = filename.replaceAll( "SNAPSHOT", timestamp + "-" + newBuildNumber );
}
- boolean fixChecksums = !( config.getRepositoryScanning().getKnownContentConsumers().contains( "create-missing-checksums" ) );
-
+ boolean fixChecksums =
+ !( config.getRepositoryScanning().getKnownContentConsumers().contains( "create-missing-checksums" ) );
+
try
- {
+ {
File targetFile = new File( targetPath, filename );
- if( targetFile.exists() && !VersionUtil.isSnapshot( version ) && repoConfig.isBlockRedeployments() )
+ if ( targetFile.exists() && !VersionUtil.isSnapshot( version ) && repoConfig.isBlockRedeployments() )
{
- addActionError( "Overwriting released artifacts in repository '" + repoConfig.getId() + "' is not allowed." );
+ addActionError(
+ "Overwriting released artifacts in repository '" + repoConfig.getId() + "' is not allowed." );
return ERROR;
}
else
{
copyFile( artifactFile, targetPath, filename, fixChecksums );
- queueRepositoryTask( repository.getId(), repository.toFile( artifactReference ) );
+ queueRepositoryTask( repository.getId(), repository.toFile( artifactReference ) );
}
}
catch ( IOException ie )
@@ -373,17 +374,17 @@
pomFilename = StringUtils.remove( pomFilename, "-" + classifier );
}
pomFilename = FilenameUtils.removeExtension( pomFilename ) + ".pom";
-
+
if ( generatePom )
{
try
{
File generatedPomFile = createPom( targetPath, pomFilename );
- if( fixChecksums )
+ if ( fixChecksums )
{
fixChecksums( generatedPomFile );
}
- queueRepositoryTask( repoConfig.getId(), generatedPomFile );
+ queueRepositoryTask( repoConfig.getId(), generatedPomFile );
}
catch ( IOException ie )
{
@@ -400,7 +401,7 @@
if ( pomFile != null && pomFile.length() > 0 )
{
try
- {
+ {
copyFile( pomFile, targetPath, pomFilename, fixChecksums );
queueRepositoryTask( repoConfig.getId(), new File( targetPath, pomFilename ) );
}
@@ -413,7 +414,7 @@
}
// explicitly update only if metadata-updater consumer is not enabled!
- if( !config.getRepositoryScanning().getKnownContentConsumers().contains( "metadata-updater" ) )
+ if ( !config.getRepositoryScanning().getKnownContentConsumers().contains( "metadata-updater" ) )
{
updateMetadata( metadata, metadataFile, lastUpdatedTimestamp, timestamp, newBuildNumber, fixChecksums );
}
@@ -439,13 +440,13 @@
return ERROR;
}
}
-
+
private void fixChecksums( File file )
{
ChecksummedFile checksum = new ChecksummedFile( file );
checksum.fixChecksums( algorithms );
}
-
+
private void copyFile( File sourceFile, File targetPath, String targetFilename, boolean fixChecksums )
throws IOException
{
@@ -466,8 +467,8 @@
out.close();
input.close();
}
-
- if( fixChecksums )
+
+ if ( fixChecksums )
{
fixChecksums( new File( targetPath, targetFilename ) );
}
@@ -507,7 +508,7 @@
}
/**
- * Update artifact level metadata. If it does not exist, create the metadata and
+ * Update artifact level metadata. If it does not exist, create the metadata and
* fix checksums if necessary.
*/
private void updateMetadata( ArchivaRepositoryMetadata metadata, File metadataFile, Date lastUpdatedTimestamp,
@@ -563,8 +564,8 @@
}
RepositoryMetadataWriter.write( metadata, metadataFile );
-
- if( fixChecksums )
+
+ if ( fixChecksums )
{
fixChecksums( metadataFile );
}