svn commit: r683220 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java

[oching]

Author: oching
Date: Wed Aug  6 03:59:34 2008
New Revision: 683220

URL: http://svn.apache.org/viewvc?rev=683220&view=rev
Log:
[MRM-896]
-remove classifier from filename of poms during artifact upload

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=683220&r1=683219&r2=683220&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
 Wed Aug  6 03:59:34 2008
@@ -68,6 +68,7 @@
 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 @@
                 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 @@
             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 @@
         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;