From: Maria Odea B. Ching <oching@apache.org>
Date: Fri, 30 May 2008 07:43:23 +0000 (+0000)
Subject: [MRM-785]
X-Git-Tag: archiva-r676265~94
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b4f999416533fafadfc71c175ce8242caab9e2d0;p=archiva.git

[MRM-785]
-set success result to go to jsp file instead of redirect to 'upload' action
-clear the form fields before returning to jsp page after upload


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661582 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 4680125df..567c5c901 100644
--- 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
@@ -286,6 +286,25 @@ public class UploadAction
         return INPUT;
     }
 
+    private void reset()
+    {
+        // reset the fields so the form is clear when 
+        // the action returns to the jsp page
+        groupId = "";
+        artifactId = "";
+        version = "";
+        packaging = "";
+        classifier = "";
+        artifactFile = null;
+        artifactContentType = "";
+        artifactFilename = "";
+        pomFile = null;
+        pomContentType = "";
+        pomFilename = "";
+        repositoryId = "";
+        generatePom = false;
+    }
+    
     public String doUpload()
     {
         try
@@ -367,10 +386,10 @@ public class UploadAction
 
             //TODO: MRM-810 (this writes to archiva.log, should be audit.log)
             getLogger().info( msg + " by " + getPrincipal() );
-
-            //TODO: MRM-785 (success message does not display on web page)
+            
             addActionMessage( msg );
 
+            reset();
             return SUCCESS;
         }
         catch ( RepositoryNotFoundException re )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
index b8309df61..ea788ef62 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
@@ -157,7 +157,7 @@
 	<action name="upload" class="uploadAction" method="input">      
       <result name="input">/WEB-INF/jsp/upload.jsp</result>
       <result name="error">/WEB-INF/jsp/upload.jsp</result>
-      <result name="success" type="redirect-action">upload</result>
+      <result name="success">/WEB-INF/jsp/upload.jsp</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
       <interceptor-ref name="fileUpload"/>
     </action>