Author: kenney
Date: Wed Apr 25 13:57:30 2007
New Revision: 532484
URL: http://svn.apache.org/viewvc?view=rev&rev=532484
Log:
Fix wagon-scm:
- compilation: due to changes in scm some methods collided, fixed;
- unit test: update parent pom to wagon 1.0-rc1-SNAPSHOT; this also brings
in new deps which have fixed tests.
Modified:
maven/sandbox/trunk/wagon/wagon-scm/pom.xml
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Modified: maven/sandbox/trunk/wagon/wagon-scm/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-scm/pom.xml?view=diff&rev=532484&r1=532483&r2=532484
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-scm/pom.xml (original)
+++ maven/sandbox/trunk/wagon/wagon-scm/pom.xml Wed Apr 25 13:57:30 2007
@@ -6,7 +6,7 @@
<parent>
<artifactId>wagon-providers</artifactId>
<groupId>org.apache.maven.wagon</groupId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-rc1-SNAPSHOT</version>
<relativePath>../../wagon/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?view=diff&rev=532484&r1=532483&r2=532484
==============================================================================
---
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
(original)
+++
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Wed Apr 25 13:57:30 2007
@@ -318,7 +318,7 @@
}
}
- result = scmProvider.checkIn( scmRepository, new ScmFileSet(
checkoutDirectory ), null, msg );
+ result = scmProvider.checkIn( scmRepository, new ScmFileSet(
checkoutDirectory ), (String) null, msg );
checkScmResult( result );
}
@@ -368,7 +368,7 @@
try
{
while ( target.length() > 0 && !scmProvider
- .list( scmRepository, new ScmFileSet( new File( "." ), new
File( target ) ), false, null )
+ .list( scmRepository, new ScmFileSet( new File( "." ), new
File( target ) ), false, (String) null )
.isSuccess() )
{
stack.push( FileUtils.filename( target ) );
@@ -390,7 +390,7 @@
scmRepository = getScmRepository( getRepository().getUrl() + "/" +
target );
CheckOutScmResult ret =
- scmProvider.checkOut( scmRepository, new ScmFileSet( new File(
checkoutDirectory, "" ) ), null, false );
+ scmProvider.checkOut( scmRepository, new ScmFileSet( new File(
checkoutDirectory, "" ) ), (String) null, false );
checkScmResult( ret );
}
@@ -574,14 +574,14 @@
if ( reservedScmFile != null && new File( basedir, reservedScmFile
).exists() )
{
- scmProvider.update( scmRepository, new ScmFileSet( basedir ),
null );
+ scmProvider.update( scmRepository, new ScmFileSet( basedir ),
(String) null );
}
else
{
// TODO: this should be checking out a full hierachy (requires
the -d equiv)
basedir.mkdirs();
- scmProvider.checkOut( scmRepository, new ScmFileSet( basedir
), null );
+ scmProvider.checkOut( scmRepository, new ScmFileSet( basedir
), (String) null );
}
if ( !scmFile.exists() )
@@ -622,7 +622,7 @@
ScmProvider provider = getScmProvider( repository.getProvider() );
ListScmResult result =
- provider.list( repository, new ScmFileSet( new File( "." ),
new File( resourcePath ) ), false, null );
+ provider.list( repository, new ScmFileSet( new File( "." ),
new File( resourcePath ) ), false, (String) null );
if ( !result.isSuccess() )
{
