package org.apache.maven.continuum.utils;

/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.model.project.Project;
import org.codehaus.plexus.logging.AbstractLogEnabled;

import java.io.File;

/**
 * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
 * @version $Id$
 * @plexus.component role="org.apache.maven.continuum.utils.WorkingDirectoryService"
 * role-hint="default"
 */
public class DefaultWorkingDirectoryService
    extends AbstractLogEnabled
    implements WorkingDirectoryService
{
    /**
     * @plexus.requirement
     */
    private ConfigurationService configurationService;

    // ----------------------------------------------------------------------
    // WorkingDirectoryService Implementation
    // ----------------------------------------------------------------------

    public File getWorkingDirectory( Project project )
    {
//        TODO: Enable, this is what we really want
//        ContinuumProjectGroup projectGroup = project.getProjectGroup();
//
//        return new File( projectGroup.getWorkingDirectory(),
//                         project.getPath() );

        File workDir;
        if ( project.getWorkingDirectory() == null )
        {
            workDir = new File( configurationService.getWorkingDirectory(), Integer.toString( project.getId() ) );

            project.setWorkingDirectory( workDir.getAbsolutePath() );
        }
        else
        {
            workDir = new File( project.getWorkingDirectory() );
        }

        return workDir;
    }
}

@@ -1987,269 +1987,1037 @@
     
-File workDir;%0A        if ( project.getWorkingDirectory() == null )%0A        %7B%0A            workDir = new File( configurationService.getWorkingDirectory(), Integer.toString( project.getId() ) );%0A%0A            project.setWorkingDirectory( workDir.getAbsolutePath() )
+if ( project.getWorkingDirectory() == null )%0A        %7B%0A            project.setWorkingDirectory( Integer.toString( project.getId() ) );%0A        %7D%0A%0A        File workDir;%0A        File projectWorkingDirectory = new File( project.getWorkingDirectory() );%0A        if ( projectWorkingDirectory.isAbsolute() )%0A        %7B%0A            // clean the project working directory path if it's a subdirectory of the global working directory%0A            if ( projectWorkingDirectory.getAbsolutePath().startsWith(%0A                configurationService.getWorkingDirectory().getAbsolutePath() ) )%0A            %7B%0A                String pwd = projectWorkingDirectory.getAbsolutePath().substring(%0A                    configurationService.getWorkingDirectory().getAbsolutePath().length() );%0A                if ( pwd.startsWith( %22/%22 ) %7C%7C pwd.startsWith( %22%5C%5C%22 ) )%0A                %7B%0A                    pwd = pwd.substring( 1 );%0A                %7D%0A                project.setWorkingDirectory( pwd );%0A            %7D%0A%0A            workDir = projectWorkingDirectory
 ;%0A  
@@ -3070,32 +3070,76 @@
 kDir = new File(
+ configurationService.getWorkingDirectory(),
  project.getWork
@@ -3158,33 +3158,32 @@
 () );%0A        %7D%0A
-%0A
         return w

use relative path for project working directory so global working directory changes will take effect