Author: carlos
Date: Wed Mar 1 17:38:16 2006
New Revision: 382231
URL: http://svn.apache.org/viewcvs?rev=382231&view=rev
Log:
Upgrade dependencies
Modified:
maven/sandbox/wagon-scm/pom.xml
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Modified: maven/sandbox/wagon-scm/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/sandbox/wagon-scm/pom.xml?rev=382231&r1=382230&r2=382231&view=diff
==============================================================================
--- maven/sandbox/wagon-scm/pom.xml (original)
+++ maven/sandbox/wagon-scm/pom.xml Wed Mar 1 17:38:16 2006
@@ -2,17 +2,17 @@
<parent>
<artifactId>wagon-providers</artifactId>
<groupId>org.apache.maven.wagon</groupId>
- <version>1.0-alpha-6-SNAPSHOT</version>
+ <version>1.0-alpha-7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wagon-scm</artifactId>
<name>Maven Wagon SCM-based Provider</name>
- <version>1.0-alpha-6-SNAPSHOT</version>
+ <version>1.0-alpha-7-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>plexus-container-default</artifactId>
@@ -27,19 +27,19 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-test</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvs</artifactId>
- <version>1.0-alpha-1</version>
+ <artifactId>maven-scm-provider-cvsexe</artifactId>
+ <version>1.0-beta-3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svn</artifactId>
- <version>1.0-alpha-1</version>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.0-beta-3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified:
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?rev=382231&r1=382230&r2=382231&view=diff
==============================================================================
---
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
(original)
+++
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Wed Mar 1 17:38:16 2006
@@ -1,7 +1,7 @@
package org.apache.maven.wagon.providers.scm;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.manager.ScmManager;
+import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
@@ -151,18 +152,19 @@
String msg = "Adding " + resourceName + " to repository";
// TODO: ewwww
+ ScmProvider scmProvider = scmManager.getProviderByRepository(
scmRepository );
if ( new File( basedir, ".svn" ).exists() || new File( basedir,
"CVS" ).exists() )
{
- scmManager.update( scmRepository, new ScmFileSet( basedir ),
null );
+ scmProvider.update( scmRepository, new ScmFileSet( basedir ),
null );
}
else
{
File lastOne = mkdirs( basedir, scmRepository );
- scmManager.checkOut( scmRepository, new ScmFileSet( basedir ),
null );
+ scmProvider.checkOut( scmRepository, new ScmFileSet( basedir
), null );
if ( lastOne != null )
{
- ScmResult result = scmManager.checkIn( scmRepository,
+ ScmResult result = scmProvider.checkIn( scmRepository,
new ScmFileSet(
lastOne.getParentFile(), lastOne ), null,
msg );
if ( !result.isSuccess() )
@@ -173,8 +175,8 @@
}
// TODO: detect if it is necessary to add first!
- scmManager.add( scmRepository, new ScmFileSet( basedir, scmFile )
);
- ScmResult result = scmManager.checkIn( scmRepository, new
ScmFileSet( basedir, scmFile ), null, msg );
+ scmProvider.add( scmRepository, new ScmFileSet( basedir, scmFile )
);
+ ScmResult result = scmProvider.checkIn( scmRepository, new
ScmFileSet( basedir, scmFile ), null, msg );
if ( !result.isSuccess() )
{
throw new TransferFailedException( "Unable to commit file " +
result.getCommandOutput() );
@@ -214,7 +216,8 @@
// TODO: ewwww
if ( !new File( basedir, ".svn" ).exists() && !new File( basedir,
"CVS" ).exists() )
{
- scmManager.add( scmRepository, new ScmFileSet( parent, basedir
) );
+ ScmProvider scmProvider = scmManager.getProviderByRepository(
scmRepository );
+ scmProvider.add( scmRepository, new ScmFileSet( parent,
basedir ) );
lastOne = basedir;
}
}
@@ -259,15 +262,16 @@
File basedir = scmFile.getParentFile();
// TODO: ewwww
+ ScmProvider scmProvider = scmManager.getProviderByRepository(
scmRepository );
if ( new File( basedir, ".svn" ).exists() || new File( basedir,
"CVS" ).exists() )
{
- scmManager.update( scmRepository, new ScmFileSet( basedir ),
null );
+ scmProvider.update( scmRepository, new ScmFileSet( basedir ),
null );
}
else
{
// TODO: this should be checking out a full hierachy (requires
the -d equiv)
basedir.mkdirs();
- scmManager.checkOut( scmRepository, new ScmFileSet( basedir ),
null );
+ scmProvider.checkOut( scmRepository, new ScmFileSet( basedir
), null );
}
if ( !scmFile.exists() )
