Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 55474 invoked from network); 29 Sep 2008 21:56:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Sep 2008 21:56:52 -0000 Received: (qmail 53552 invoked by uid 500); 29 Sep 2008 21:56:51 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 53503 invoked by uid 500); 29 Sep 2008 21:56:51 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 53494 invoked by uid 99); 29 Sep 2008 21:56:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 14:56:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 21:55:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E225123889B9; Mon, 29 Sep 2008 14:56:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@continuum.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080929215601.E225123889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - + + + 200 + 50 + /WEB-INF/jsp/navigations/wait.jsp /WEB-INF/jsp/addMavenTwoProject.jsp groupSummary