[MRM-896]

-remove classifier from filename of poms during artifact upload

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683220 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
index c6ada1d06048d7fe758b04c7d5f5157fd86ebd3c..c539f1962e54cf681c026d4946eaec8076d6c9ff 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
@@ -68,6 +68,7 @@ import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.Preparable;
 import com.opensymphony.xwork.Validateable;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * Upload an artifact using Jakarta file upload in webwork. If set by the user a pom will also be generated. Metadata
@@ -388,11 +389,18 @@ public class UploadAction
                 return ERROR;
             }
 
+            String pomFilename = filename;
+            if( classifier != null && !"".equals( classifier ) )
+            {
+                pomFilename = StringUtils.remove( pomFilename, "-" + classifier );
+            }
+            pomFilename = FilenameUtils.removeExtension( pomFilename ) + ".pom";
+                
             if ( generatePom )
             {
                 try
                 {
-                    File generatedPomFile = createPom( targetPath, filename );
+                    File generatedPomFile = createPom( targetPath, pomFilename );
                     consumers.executeConsumers( repoConfig, generatedPomFile );
                 }
                 catch ( IOException ie )
@@ -410,10 +418,9 @@ public class UploadAction
             if ( pomFile != null && pomFile.length() > 0 ) 
             {
                 try
-                {
-                    String targetFilename = filename.replaceAll( packaging, "pom" );
-                    copyFile( pomFile, targetPath, targetFilename );
-                    consumers.executeConsumers( repoConfig, new File( targetPath, targetFilename ) );
+                {                    
+                    copyFile( pomFile, targetPath, pomFilename );
+                    consumers.executeConsumers( repoConfig, new File( targetPath, pomFilename ) );
                 }
                 catch ( IOException ie )
                 {
@@ -482,9 +489,7 @@ public class UploadAction
         projectModel.setVersion( version );
         projectModel.setPackaging( packaging );
         
-        filename = FilenameUtils.removeExtension(filename) + ".pom";
-        File pomFile = new File( targetPath, filename);
-        
+        File pomFile = new File( targetPath, filename);        
         pomWriter.write( projectModel, pomFile );
 
         return pomFile;