Author: aheritier
Date: Mon Sep 26 15:59:04 2005
New Revision: 291776
URL: http://svn.apache.org/viewcvs?rev=291776&view=rev
Log:
MPSCM-66 : Upgrade to maven-scm components 1.0-alpha-2
Modified:
maven/maven-1/plugins/trunk/scm/project.xml
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
Modified: maven/maven-1/plugins/trunk/scm/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/project.xml?rev=291776&r1=291775&r2=291776&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/project.xml (original)
+++ maven/maven-1/plugins/trunk/scm/project.xml Mon Sep 26 15:59:04 2005
@@ -116,14 +116,6 @@
<artifactId>plexus-utils</artifactId>
<version>1.0.1</version>
</dependency>
-
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-scm</artifactId>
- <version>1.0-alpha-1-20050705.084636-3</version>
- </dependency>
-
-
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
@@ -131,23 +123,28 @@
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.0-alpha-2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.0-alpha-2-20050712.151302-2</version>
+ <version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvs</artifactId>
- <version>1.0-alpha-2-20050712.151302-2</version>
+ <version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svn</artifactId>
- <version>1.0-alpha-2-20050712.155105-2</version>
+ <version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-starteam</artifactId>
- <version>1.0-alpha-2-20050712.153836-2</version>
+ <version>1.0-alpha-2</version>
</dependency>
</dependencies>
</project>
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java?rev=291776&r1=291775&r2=291776&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
Mon Sep 26 15:59:04 2005
@@ -21,8 +21,8 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.add.AddScmResult;
+import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
@@ -41,8 +41,8 @@
ScmRepository repository = getScmRepository( scmManager );
- AddScmResult result = scmManager.add( repository, new ScmFileSet( new
File( getWorkingDirectory() ),
-
getIncludes(), getExcludes() ) );
+ AddScmResult result = scmManager.getProviderByRepository( repository )
+ .add( repository, new ScmFileSet( new File( getWorkingDirectory()
), getIncludes(), getExcludes() ) );
checkResult( result );
}
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java?rev=291776&r1=291775&r2=291776&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
Mon Sep 26 15:59:04 2005
@@ -25,13 +25,13 @@
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.log.DefaultLog;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.manager.ScmManager;
import
org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.embed.Embedder;
-import org.codehaus.plexus.scm.NoSuchScmProviderException;
-import org.codehaus.plexus.scm.ScmManager;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -94,8 +94,8 @@
}
checkoutDirectory.mkdirs();
- CheckOutScmResult result = scmManager.checkOut( repository,
- new ScmFileSet(
checkoutDirectory.getAbsoluteFile() ), tag );
+ CheckOutScmResult result = scmManager.getProviderByRepository(
repository )
+ .checkOut( repository, new ScmFileSet(
checkoutDirectory.getAbsoluteFile() ), tag );
checkResult( result );
}
@@ -146,8 +146,8 @@
{
Embedder embedder = getEmbedder();
ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE
);
- scmManager.addListener( new DefaultLog() );
-
+ ScmRepository repository = getScmRepository( scmManager );
+ scmManager.getProviderByRepository( repository ).addListener( new
DefaultLog() );
return scmManager;
}
@@ -175,7 +175,8 @@
checkoutDirectory = new File( workingDirectory );
// TODO: want includes/excludes?
- UpdateScmResult result = scmManager.update( repository, new
ScmFileSet( new File( workingDirectory ) ), tag );
+ UpdateScmResult result = scmManager.getProviderByRepository(
repository )
+ .update( repository, new ScmFileSet( new File( workingDirectory )
), tag );
checkResult( result );
}
@@ -188,7 +189,8 @@
ScmRepository repository = getScmRepository( scmManager );
// TODO: want includes/excludes?
- TagScmResult result = scmManager.tag( repository, new ScmFileSet( new
File( workingDirectory ) ), tag );
+ TagScmResult result = scmManager.getProviderByRepository( repository )
+ .tag( repository, new ScmFileSet( new File( workingDirectory ) ),
tag );
checkResult( result );
}
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java?rev=291776&r1=291775&r2=291776&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
Mon Sep 26 15:59:04 2005
@@ -21,8 +21,8 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
+import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
@@ -41,9 +41,9 @@
ScmRepository repository = getScmRepository( scmManager );
- CheckInScmResult result = scmManager.checkIn( repository, new
ScmFileSet( new File( getWorkingDirectory() ),
-
getIncludes(), getExcludes() ),
- getTag(), message );
+ CheckInScmResult result = scmManager.getProviderByRepository(
repository )
+ .checkIn( repository, new ScmFileSet( new File(
getWorkingDirectory() ), getIncludes(), getExcludes() ),
+ getTag(), message );
checkResult( result );
}
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java?rev=291776&r1=291775&r2=291776&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
Mon Sep 26 15:59:04 2005
@@ -21,8 +21,8 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.diff.DiffScmResult;
+import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -47,7 +47,8 @@
ScmRepository repository = getScmRepository( scmManager );
ScmFileSet fileSet = new ScmFileSet( new File( getWorkingDirectory()
), getIncludes(), getExcludes() );
- DiffScmResult result = scmManager.diff( repository, fileSet,
startRevision, endRevision );
+ DiffScmResult result = scmManager.getProviderByRepository( repository
).diff( repository, fileSet,
+
startRevision, endRevision );
checkResult( result );
FileUtils.fileWrite( patchFile, result.getPatch() );
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java?rev=291776&r1=291775&r2=291776&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
Mon Sep 26 15:59:04 2005
@@ -24,8 +24,8 @@
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.status.StatusScmResult;
+import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
@@ -44,7 +44,8 @@
ScmRepository repository = getScmRepository( scmManager );
- StatusScmResult result = scmManager.status( repository, new
ScmFileSet( new File( getWorkingDirectory() ) ) );
+ StatusScmResult result = scmManager.getProviderByRepository(
repository )
+ .status( repository, new ScmFileSet( new File(
getWorkingDirectory() ) ) );
checkResult( result );
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java?rev=291776&r1=291775&r2=291776&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
Mon Sep 26 15:59:04 2005
@@ -21,8 +21,8 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.update.UpdateScmResult;
+import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
@@ -41,9 +41,9 @@
ScmRepository repository = getScmRepository( scmManager );
- UpdateScmResult result = scmManager.update( repository, new
ScmFileSet( new File( getWorkingDirectory() ),
-
getIncludes(), getExcludes() ),
- getTag() );
+ UpdateScmResult result = scmManager.getProviderByRepository(
repository )
+ .update( repository, new ScmFileSet( new File(
getWorkingDirectory() ), getIncludes(), getExcludes() ),
+ getTag() );
checkResult( result );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
