continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r700274 - in /continuum/trunk: ./ continuum-docs/src/site/xdoc/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java continuum-webapp/src/main/resources/xwork.xml
Date Mon, 29 Sep 2008 21:56:01 GMT
Author: olamy
Date: Mon Sep 29 14:56:01 2008
New Revision: 700274

URL: http://svn.apache.org/viewvc?rev=700274&view=rev
Log:
merge -r 700272:700273 from 1.2.X


Modified:
    continuum/trunk/   (props changed)
    continuum/trunk/continuum-docs/src/site/xdoc/   (props changed)
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
    continuum/trunk/continuum-webapp/src/main/resources/xwork.xml

Propchange: continuum/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 29 14:56:01 2008
@@ -1 +1 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273

Propchange: continuum/trunk/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 29 14:56:01 2008
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250
+/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273
 /continuum/trunk/continuum-docs/src/site/xdoc:690494-690520

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java?rev=700274&r1=700273&r2=700274&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
Mon Sep 29 14:56:01 2008
@@ -20,6 +20,7 @@
  */
 
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -138,16 +139,23 @@
             {
                 try
                 {
-                    pom = pomFile.toURL().toString();
+                    //pom = pomFile.toURL().toString();
                     checkProtocol = false;
                     // CONTINUUM-1897
                     // File.c copyFile to tmp one
+                    File tmpPom = File.createTempFile( "continuum_tmp", "tmp" );
+                    FileUtils.copyFile( pomFile, tmpPom );
+                    pom = tmpPom.toURL().toString();
                 }
                 catch ( MalformedURLException e )
                 {
                     // if local file can't be converted to url it's an internal error
                     throw new RuntimeException( e );
                 }
+                catch ( IOException e )
+                {
+                    throw new RuntimeException( e );
+                }
             }
             else
             {

Modified: continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=700274&r1=700273&r2=700274&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Sep 29 14:56:01 2008
@@ -178,7 +178,11 @@
     
     <action name="addMavenTwoProject" class="addMavenTwoProject">
       <interceptor-ref name="configuredContinuumStack"/>
-      <interceptor-ref name="execAndWait"/> 
+      <interceptor-ref name="fileUpload"/>
+      <interceptor-ref name="execAndWait">
+        <param name="delay">200</param>
+        <param name="delaySleepInterval">50</param>
+      </interceptor-ref> 
       <result name="wait">/WEB-INF/jsp/navigations/wait.jsp</result>     
       <result name="input">/WEB-INF/jsp/addMavenTwoProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>



Mime
View raw message