Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 71147 invoked from network); 21 Apr 2009 04:59:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Apr 2009 04:59:04 -0000 Received: (qmail 30850 invoked by uid 500); 21 Apr 2009 04:59:04 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 30791 invoked by uid 500); 21 Apr 2009 04:59:04 -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 30782 invoked by uid 99); 21 Apr 2009 04:59:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2009 04:59:04 +0000 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; Tue, 21 Apr 2009 04:58:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 82C7B238898F; Tue, 21 Apr 2009 04:58:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r766977 - /continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Tue, 21 Apr 2009 04:58:36 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090421045836.82C7B238898F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Apr 21 04:58:35 2009 New Revision: 766977 URL: http://svn.apache.org/viewvc?rev=766977&view=rev Log: [CONTINUUM-2184] use the configured working directory instead of a default for some internal uses Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=766977&r1=766976&r2=766977&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Apr 21 04:58:35 2009 @@ -208,11 +208,6 @@ private ContinuumReleaseManager releaseManager; /** - * @plexus.configuration default-value="${plexus.home}/temp" - */ - private String workingDirectory; - - /** * @plexus.requirement */ private WorkingDirectoryService workingDirectoryService; @@ -2401,25 +2396,6 @@ { log.info( "Initializing Continuum." ); - File wdFile = new File( workingDirectory ); - - if ( wdFile.exists() ) - { - if ( !wdFile.isDirectory() ) - { - throw new InitializationException( - "The specified working directory isn't a directory: " + "'" + wdFile.getAbsolutePath() + "'." ); - } - } - else - { - if ( !wdFile.mkdirs() ) - { - throw new InitializationException( - "Could not making the working directory: " + "'" + wdFile.getAbsolutePath() + "'." ); - } - } - log.info( "Showing all groups:" ); try { @@ -2773,7 +2749,7 @@ public String getWorkingDirectory() { - return workingDirectory; + return configurationService.getWorkingDirectory().getAbsolutePath(); } public Project getProjectWithCheckoutResult( int projectId )