You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2010/05/03 10:49:48 UTC
svn commit: r940398 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Author: oching
Date: Mon May 3 08:49:48 2010
New Revision: 940398
URL: http://svn.apache.org/viewvc?rev=940398&view=rev
Log:
moved getMetadataFile inline
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=940398&r1=940397&r2=940398&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java Mon May 3 08:49:48 2010
@@ -313,7 +313,7 @@ public class UploadAction
int newBuildNumber = -1;
String timestamp = null;
- File versionMetadataFile = getMetadata( targetPath.getAbsolutePath() );
+ File versionMetadataFile = new File( targetPath, MetadataTools.MAVEN_METADATA );
ArchivaRepositoryMetadata versionMetadata = getMetadata( versionMetadataFile );
if ( VersionUtil.isSnapshot( version ) )
@@ -501,11 +501,6 @@ public class UploadAction
return pomFile;
}
- private File getMetadata( String targetPath )
- {
- return new File( targetPath, MetadataTools.MAVEN_METADATA );
- }
-
private ArchivaRepositoryMetadata getMetadata( File metadataFile )
throws RepositoryMetadataException
{
@@ -561,8 +556,9 @@ public class UploadAction
List<String> availableVersions = new ArrayList<String>();
String latestVersion = version;
- String projectPath = targetPath.substring( 0, targetPath.lastIndexOf( File.separatorChar ) );
- File projectMetadataFile = getMetadata( projectPath );
+ File projectDir = new File( targetPath ).getParentFile();
+ File projectMetadataFile = new File( projectDir, MetadataTools.MAVEN_METADATA );
+
ArchivaRepositoryMetadata projectMetadata = getMetadata( projectMetadataFile );
if ( projectMetadataFile.exists() )