You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2007/04/24 17:55:08 UTC
svn commit: r531990 - in /maven/scm/trunk/maven-scm-providers:
maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/
maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe...
Author: evenisse
Date: Tue Apr 24 08:55:06 2007
New Revision: 531990
URL: http://svn.apache.org/viewvc?view=rev&rev=531990
Log:
Delete temp files
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java?view=diff&rev=531990&r1=531989&r2=531990
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java Tue Apr 24 08:55:06 2007
@@ -69,6 +69,7 @@
throws Exception
{
File f = File.createTempFile( "test", null );
+ f.deleteOnExit();
List list = new LinkedList();
list.add( f );
Commandline cl = SynergyCCM.create( list, "test creation", "CCM_ADDR" );
@@ -82,6 +83,7 @@
assertEquals( "ccm create -c \"test creation\" " + f.getCanonicalPath(), cl.toString() );
}
File f2 = File.createTempFile( "test", null );
+ f2.deleteOnExit();
list.add( f2 );
cl = SynergyCCM.create( list, "test creation", "CCM_ADDR" );
if ( f.getCanonicalPath().indexOf( " " ) > -1 )
@@ -140,6 +142,7 @@
throws Exception
{
File f = File.createTempFile( "test", null );
+ f.deleteOnExit();
List list = new LinkedList();
list.add( f );
Commandline cl = SynergyCCM.delete( list, "CCM_ADDR", true );
@@ -153,6 +156,7 @@
assertEquals( "ccm delete -replace " + f.getCanonicalPath(), cl.toString() );
}
File f2 = File.createTempFile( "test", null );
+ f2.deleteOnExit();
list.add( f2 );
cl = SynergyCCM.delete( list, "CCM_ADDR", false );
if ( f.getCanonicalPath().indexOf( " " ) > -1 )
@@ -222,6 +226,7 @@
throws Exception
{
File f = File.createTempFile( "foo", null );
+ f.deleteOnExit();
Commandline cl = SynergyCCM.dir( f.getParentFile(), "format", "CCM_ADDR" );
assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironments(), "CCM_ADDR=CCM_ADDR" ) );
assertEquals( f.getParentFile().getCanonicalFile(), cl.getWorkingDirectory().getCanonicalFile() );
@@ -232,6 +237,7 @@
throws Exception
{
File f = File.createTempFile( "test", null );
+ f.deleteOnExit();
List list = new LinkedList();
list.add( f );
Commandline cl = SynergyCCM.checkoutFiles( list, "CCM_ADDR" );
@@ -245,6 +251,7 @@
assertEquals( "ccm co " + f.getCanonicalPath(), cl.toString() );
}
File f2 = File.createTempFile( "test", null );
+ f2.deleteOnExit();
list.add( f2 );
cl = SynergyCCM.checkoutFiles( list, "CCM_ADDR" );
if ( f.getCanonicalPath().indexOf( " " ) > -1 )
@@ -281,6 +288,7 @@
assertEquals( "ccm co -subprojects -rel -t MyVersion -purpose MyPurpose -release MyRelease -p MyProject", cl
.toString() );
File f = File.createTempFile( "test", null );
+ f.deleteOnExit();
cl = SynergyCCM.checkoutProject( f.getParentFile(), "MyProject", new ScmTag( "MyVersion" ), "MyPurpose",
"MyRelease", "CCM_ADDR" );
if ( f.getCanonicalPath().indexOf( " " ) > -1 )
@@ -307,6 +315,7 @@
throws Exception
{
File f = File.createTempFile( "test", null );
+ f.deleteOnExit();
List list = new LinkedList();
list.add( f );
Commandline cl = SynergyCCM.checkinFiles( list, "a comment", "CCM_ADDR" );
@@ -320,6 +329,7 @@
assertEquals( "ccm ci -c \"a comment\" " + f.getCanonicalPath(), cl.toString() );
}
File f2 = File.createTempFile( "test", null );
+ f2.deleteOnExit();
list.add( f2 );
cl = SynergyCCM.checkinFiles( list, "a comment", "CCM_ADDR" );
if ( f.getCanonicalPath().indexOf( " " ) > -1 )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java?view=diff&rev=531990&r1=531989&r2=531990
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java Tue Apr 24 08:55:06 2007
@@ -101,6 +101,17 @@
{
throw new ScmException( "Error while executing command.", ex );
}
+ finally
+ {
+ try
+ {
+ FileUtils.forceDelete( messageFile );
+ }
+ catch ( IOException ex )
+ {
+ // ignore
+ }
+ }
if ( exitCode != 0 )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?view=diff&rev=531990&r1=531989&r2=531990
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java Tue Apr 24 08:55:06 2007
@@ -101,6 +101,17 @@
{
throw new ScmException( "Error while executing command.", ex );
}
+ finally
+ {
+ try
+ {
+ FileUtils.forceDelete( messageFile );
+ }
+ catch ( IOException ex )
+ {
+ // ignore
+ }
+ }
if ( exitCode != 0 )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java?view=diff&rev=531990&r1=531989&r2=531990
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java Tue Apr 24 08:55:06 2007
@@ -39,6 +39,7 @@
throws Exception
{
File messageFile = File.createTempFile( "maven-scm", "commit" );
+ messageFile.deleteOnExit();
testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svnbranch", messageFile, "user",
"svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath() +
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java?view=diff&rev=531990&r1=531989&r2=531990
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java Tue Apr 24 08:55:06 2007
@@ -39,6 +39,7 @@
throws Exception
{
File messageFile = File.createTempFile( "maven-scm", "commit" );
+ messageFile.deleteOnExit();
testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath() +