Author: hboutemy
Date: Sun May 25 11:31:54 2008
New Revision: 660011
URL: http://svn.apache.org/viewvc?rev=660011&view=rev
Log:
fixed use of some deprecated constructors
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.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
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
Sun May 25 11:31:54 2008
@@ -40,7 +40,7 @@
{
public static final String[] filesInTestBranch =
- new String[]{"pom.xml", "readme.txt",
"src/main/java/Application.java", "src/test/java/Test.java"};
+ new String[] { "pom.xml", "readme.txt",
"src/main/java/Application.java", "src/test/java/Test.java" };
public static final String TCK_FILE_CONSTANT = "/";
@@ -102,8 +102,8 @@
}
//Add to repository
- String[] add_cmd = new String[]{BazaarCommand.ADD_CMD};
- ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), (File[])
files.toArray( new File[0] ) );
+ String[] add_cmd = new String[] { BazaarCommand.ADD_CMD };
+ ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), files );
add_cmd = BazaarUtils.expandCommandLine( add_cmd, filesToAdd );
ScmResult result = BazaarUtils.execute( WORKING_DIR, add_cmd );
if ( !result.isSuccess() )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
Sun May 25 11:31:54 2008
@@ -103,7 +103,7 @@
//Add to repository
String[] add_cmd = new String[]{HgCommand.ADD_CMD};
- ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), (File[])
files.toArray( new File[0] ) );
+ ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), files );
add_cmd = HgUtils.expandCommandLine( add_cmd, filesToAdd );
ScmResult result = HgUtils.execute( WORKING_DIR, add_cmd );
if ( !result.isSuccess() )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.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/add/PerforceAddCommandTest.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
Sun May 25 11:31:54 2008
@@ -26,6 +26,7 @@
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
+import java.util.Arrays;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -70,7 +71,9 @@
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
+ ScmFileSet files =
+ new ScmFileSet( new File( "." ),
+ Arrays.asList( new File[] { new File( "foo.xml" ),
new File( "bar.xml" ) } ) );
Commandline cl = PerforceAddCommand.createCommandLine( svnRepository,
workingDirectory, files );
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/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=660011&r1=660010&r2=660011&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
Sun May 25 11:31:54 2008
@@ -26,6 +26,7 @@
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
+import java.util.Arrays;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -67,7 +68,9 @@
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
+ 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=660011&r1=660010&r2=660011&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
Sun May 25 11:31:54 2008
@@ -26,6 +26,7 @@
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
+import java.util.Arrays;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -57,7 +58,9 @@
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
+ 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 );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.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/remove/PerforceRemoveCommandTest.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
Sun May 25 11:31:54 2008
@@ -26,6 +26,7 @@
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
+import java.util.Arrays;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -69,7 +70,9 @@
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
+ ScmFileSet files =
+ new ScmFileSet( new File( "." ),
+ Arrays.asList( new File[] { new File( "foo.xml" ),
new File( "bar.xml" ) } ) );
Commandline cl = PerforceRemoveCommand.createCommandLine(
svnRepository, workingDirectory, files );
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/tag/PerforceTagCommandTest.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/tag/PerforceTagCommandTest.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
Sun May 25 11:31:54 2008
@@ -26,6 +26,7 @@
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
+import java.util.Arrays;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse </a>
@@ -56,7 +57,9 @@
ScmRepository repository = getScmManager().makeScmRepository(
"scm:perforce://depot/projects/pathname" );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
+ ScmFileSet files =
+ new ScmFileSet( new File( "." ),
+ Arrays.asList( new File[] { new File( "foo.xml" ),
new File( "bar.xml" ) } ) );
Commandline cl1 = PerforceTagCommand.createLabelCommandLine(
svnRepository, workingDirectory );
assertCommandLine( create, null, cl1 );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.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/unedit/PerforceUnEditCommandTest.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
Sun May 25 11:31:54 2008
@@ -26,6 +26,7 @@
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
+import java.util.Arrays;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -55,7 +56,9 @@
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
+ ScmFileSet files =
+ new ScmFileSet( new File( "." ),
+ Arrays.asList( new File[] { new File( "foo.xml" ),
new File( "bar.xml" ) } ) );
Commandline cl = PerforceUnEditCommand.createCommandLine(
svnRepository, workingDirectory, files );
assertCommandLine( commandLine, null, cl );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
Sun May 25 11:31:54 2008
@@ -52,6 +52,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
@@ -344,7 +345,7 @@
}
}
- newFileSet = new ScmFileSet( basedir, files );
+ newFileSet = new ScmFileSet( basedir, Arrays.asList( files ) );
}
catch ( IOException e )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
Sun May 25 11:31:54 2008
@@ -48,6 +48,7 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -722,7 +723,7 @@
}
}
- newFileSet = new ScmFileSet( basedir, files );
+ newFileSet = new ScmFileSet( basedir, Arrays.asList( files ) );
}
catch ( IOException e )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java?rev=660011&r1=660010&r2=660011&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
Sun May 25 11:31:54 2008
@@ -23,7 +23,6 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
import org.apache.maven.scm.command.tag.TagScmResult;
