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

[jd...@apache.org]

Author: jdumay
Date: Tue Jul  1 22:18:25 2008
New Revision: 673284

URL: http://svn.apache.org/viewvc?rev=673284&view=rev
Log:
MRM-856 - Artifact Upload replaces all instances of the name "jar" with "pom" when trying to change the file extension

* Use FilenameUtils from commons-io to properly strip the extension


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=673284&r1=673283&r2=673284&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 Tue Jul  1 22:18:25 2008
@@ -62,6 +62,7 @@
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.Preparable;
 import com.opensymphony.xwork.Validateable;
+import org.apache.commons.io.FilenameUtils;
 
 /**
  * Upload an artifact using Jakarta file upload in webwork. If set by the user a pom will also be generated. Metadata
@@ -446,9 +447,10 @@
         projectModel.setArtifactId( artifactId );
         projectModel.setVersion( version );
         projectModel.setPackaging( packaging );
-
-        File pomFile = new File( targetPath, filename.replaceAll( packaging, "pom" ) );
-
+        
+        filename = FilenameUtils.removeExtension(filename) + ".pom";
+        File pomFile = new File( targetPath, filename);
+        
         pomWriter.write( projectModel, pomFile );
 
         return pomFile;