You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/07/26 16:56:01 UTC
svn commit: r225320 - in /maven/continuum/trunk/continuum-core: ./
src/main/java/org/apache/maven/continuum/core/action/
src/main/java/org/apache/maven/continuum/scm/
src/main/resources/META-INF/plexus/
Author: evenisse
Date: Tue Jul 26 07:55:53 2005
New Revision: 225320
URL: http://svn.apache.org/viewcvs?rev=225320&view=rev
Log:
Update to new maven-scm apis
Modified:
maven/continuum/trunk/continuum-core/pom.xml
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/pom.xml?rev=225320&r1=225319&r2=225320&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Tue Jul 26 07:55:53 2005
@@ -38,6 +38,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
@@ -112,9 +113,9 @@
</dependency>
<!-- Plexus SCM -->
<dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-scm</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?rev=225320&r1=225319&r2=225320&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java Tue Jul 26 07:55:53 2005
@@ -22,7 +22,7 @@
import org.apache.maven.continuum.scm.ContinuumScm;
import org.apache.maven.continuum.utils.ContinuumUtils;
import org.apache.maven.continuum.store.ContinuumStore;
-import org.codehaus.plexus.scm.NoSuchScmProviderException;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=225320&r1=225319&r2=225320&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java Tue Jul 26 07:55:53 2005
@@ -21,10 +21,10 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
+import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.scm.ScmManager;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -84,7 +84,7 @@
ScmFileSet fileSet = new ScmFileSet( workingDirectory );
- result = convertScmResult( scmManager.checkOut( repository, fileSet, tag ) );
+ result = convertScmResult( scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, tag ) );
}
if ( !result.isSuccess() )
@@ -155,7 +155,7 @@
synchronized ( this )
{
- result = convertScmResult( scmManager.update( repository, fileSet, tag ) );
+ result = convertScmResult( scmManager.getProviderByRepository( repository ).update( repository, fileSet, tag ) );
}
if ( !result.isSuccess() )
Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=225320&r1=225319&r2=225320&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Tue Jul 26 07:55:53 2005
@@ -127,7 +127,7 @@
<implementation>org.apache.maven.continuum.scm.DefaultContinuumScm</implementation>
<requirements>
<requirement>
- <role>org.codehaus.plexus.scm.ScmManager</role>
+ <role>org.apache.maven.scm.manager.ScmManager</role>
</requirement>
</requirements>
</component>