Author: olamy
Date: Wed Jun 20 12:35:38 2012
New Revision: 1352063
URL: http://svn.apache.org/viewvc?rev=1352063&view=rev
Log:
[SCM-678] scm perforce: mvn release:prepare fails with IOException and a write
error (Access is denied)
Submitted by Svend Hansen.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java?rev=1352063&r1=1352062&r2=1352063&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
Wed Jun 20 12:35:38 2012
@@ -19,6 +19,13 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmVersion;
@@ -32,13 +39,6 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
/**
* @author Mike Perham
* @version $Id$
@@ -50,6 +50,7 @@ public class PerforceCheckInCommand
/**
* {@inheritDoc}
*/
+ @Override
protected CheckInScmResult executeCheckInCommand( ScmProviderRepository
repo, ScmFileSet files, String message,
ScmVersion version )
throws ScmException
@@ -136,7 +137,9 @@ public class PerforceCheckInCommand
List<File> fs = files.getFileList();
for ( int i = 0; i < fs.size(); i++ )
{
- File file = new File( workingDir, fs.get( i ).getPath() );
+ File file = null;
+ if(fs.get( i ).isAbsolute()) file = new File( fs.get( i
).getPath() );
+ else file = new File( workingDir, fs.get( i ).getPath() );
// XXX Submit requires the canonical repository path for each
// file.
// It is unclear how to get that from a File object.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java?rev=1352063&r1=1352062&r2=1352063&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
Wed Jun 20 12:35:38 2012
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -32,10 +36,6 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
/**
* @author Mike Perham
* @version $Id$
@@ -45,6 +45,7 @@ public class PerforceEditCommand
implements PerforceCommand
{
/** {@inheritDoc} */
+ @Override
protected ScmResult executeEditCommand( ScmProviderRepository repo,
ScmFileSet files )
throws ScmException
{
@@ -100,7 +101,9 @@ public class PerforceEditCommand
List<File> fs = files.getFileList();
for ( int i = 0; i < fs.size(); i++ )
{
- File file = new File( workingDirectory, fs.get( i ).getPath()
);
+ File file = null;
+ if(fs.get( i ).isAbsolute()) file = new File( fs.get( i
).getPath() );
+ else file = new File( workingDirectory, fs.get( i ).getPath()
);
// I want to use relative paths to add files to make testing
// simpler.
// Otherwise the absolute path will be different on everyone's
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java?rev=1352063&r1=1352062&r2=1352063&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
Wed Jun 20 12:35:38 2012
@@ -19,15 +19,15 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.io.File;
+import java.util.Arrays;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import
org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.util.Arrays;
-
/**
* @author <a href="mailto:[email protected]";>Emmanuel Venisse</a>
* @author <a href="mailto:[email protected]";>Trygve Laugstøl</a>
@@ -42,35 +42,47 @@ public class PerforceCheckInCommandTest
public void testGetCommandLine()
throws Exception
{
- testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" submit -i" );
+ ScmFileSet files = new ScmFileSet( new File( "." ),
+ Arrays.asList( new File[] { new File( "foo.xml" ), new File(
"bar.xml" ) } ) );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" submit -i", files );
}
+ public void testGetCommandLineAbsolutePaths()
+ throws Exception
+ {
+ ScmFileSet files = new ScmFileSet( new File( "."
).getAbsoluteFile(),
+ Arrays.asList( new File[] { new File( "foo.xml"
).getAbsoluteFile(), new File( "bar.xml" ).getAbsoluteFile() } ) );
+ testCommandLine( "scm:perforce://depot/projects/pathname",
cmdPrefix + " submit -i", files );
+ }
+
public void testGetCommandLineWithHost()
throws Exception
{
- testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
cmdPrefix + " -p a -u username submit -i" );
+ ScmFileSet files = new ScmFileSet( new File( "." ),
+ Arrays.asList( new File[] { new File( "foo.xml" ), new File(
"bar.xml" ) } ) );
+ testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
+ cmdPrefix + " -p a -u username submit -i", files );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
+ ScmFileSet files = new ScmFileSet( new File( "." ),
+ Arrays.asList( new File[] { new File( "foo.xml" ), new File(
"bar.xml" ) } ) );
testCommandLine(
"scm:perforce:myhost:1234:username@//depot/projects/pathname",
- cmdPrefix + " -p myhost:1234 -u username submit -i" );
+ cmdPrefix + " -p myhost:1234 -u username submit -i",
files );
}
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
- private void testCommandLine( String scmUrl, String commandLine )
+ private void testCommandLine( String scmUrl, String commandLine,
ScmFileSet files )
throws Exception
{
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files =
- new ScmFileSet( new File( "." ),
- Arrays.asList( new File[] { new File( "foo.xml" ),
new File( "bar.xml" ) } ) );
Commandline cl = PerforceCheckInCommand.createCommandLine(
svnRepository, workingDirectory );
assertCommandLine( commandLine, null, cl );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java?rev=1352063&r1=1352062&r2=1352063&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
Wed Jun 20 12:35:38 2012
@@ -19,19 +19,19 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.io.File;
+import java.util.Arrays;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import
org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.util.Arrays;
-
/**
* @author <a href="mailto:[email protected]";>Emmanuel Venisse</a>
* @author <a href="mailto:[email protected]";>Trygve Laugstøl</a>
- * @version $Id: PerforceEditCommandTest.java 660011 2008-05-25 18:31:54Z
hboutemy $
+ * @version $Id$
*/
public class PerforceEditCommandTest
extends ScmTestCase
@@ -42,32 +42,54 @@ public class PerforceEditCommandTest
throws Exception
{
File workingDir = new File( "." );
+ ScmFileSet files = new ScmFileSet( new File( "." ), Arrays.asList(
+ new File[]{ new File( "foo.xml" ), new File( "bar.xml" ) } ) );
+ String commandLineString = cmdPrefix + workingDir.getAbsolutePath() +
" edit";
+ for(File file : files.getFileList()) {
+ commandLineString += " " + file.getPath();
+ }
testCommandLine( "scm:perforce://depot/projects/pathname",
- cmdPrefix + workingDir.getAbsolutePath() + " edit
foo.xml bar.xml", workingDir );
+ commandLineString, workingDir, files );
}
public void testRelativeCommandLine()
throws Exception
{
File workingDir = new File( "baz/qux" );
+ ScmFileSet files = new ScmFileSet( new File( "." ), Arrays.asList(
+ new File[]{ new File( "foo.xml" ), new File( "bar.xml" ) } ) );
+ String commandLineString = cmdPrefix + workingDir.getAbsolutePath() +
" edit";
+ for(File file : files.getFileList()) {
+ commandLineString += " " + file.getPath();
+ }
testCommandLine( "scm:perforce://depot/projects/pathname",
- cmdPrefix + workingDir.getAbsolutePath() + " edit
foo.xml bar.xml", workingDir );
+ commandLineString, workingDir, files );
}
+ public void testAbsoluteCommandLine()
+ throws Exception
+ {
+ File workingDir = new File( "." ).getAbsoluteFile();
+ ScmFileSet files = new ScmFileSet( new File( "." ), Arrays.asList(
+ new File[]{ new File( "foo.xml" ).getAbsoluteFile(), new
File( "bar.xml" ).getAbsoluteFile() } ) );
+ String commandLineString = cmdPrefix +
workingDir.getAbsolutePath() + " edit";
+ for(File file : files.getFileList()) {
+ commandLineString += " " + file.getPath();
+ }
+ testCommandLine( "scm:perforce://depot/projects/pathname",
+ commandLineString, workingDir, files );
+ }
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
- private void testCommandLine( String scmUrl, String commandLine, File
workingDir )
+ private void testCommandLine( String scmUrl, String commandLine, File
workingDir, ScmFileSet files )
throws Exception
{
- //File workingDirectory = getTestFile(
"target/perforce-edit-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), Arrays.asList(
- new File[]{ new File( "foo.xml" ), new File( "bar.xml" ) } ) );
Commandline cl = PerforceEditCommand.createCommandLine( svnRepository,
workingDir, files );
assertCommandLine( commandLine, null, cl );
