continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject svn commit: r225658 - in /maven/continuum/branches/trygvis-test/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/
Date Thu, 28 Jul 2005 00:06:17 GMT
Author: trygvis
Date: Wed Jul 27 17:06:04 2005
New Revision: 225658

URL: http://svn.apache.org/viewcvs?rev=225658&view=rev
Log:
Merging from trunk r225320
Update to new maven-scm apis                                                             
                                                                              --This line,
and those below, will be ignored--

M    continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
M    continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
M    continuum-core/src/main/resources/META-INF/plexus/components.xml
M    continuum-core/pom.xml

Modified:
    maven/continuum/branches/trygvis-test/continuum-core/pom.xml
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml

Modified: maven/continuum/branches/trygvis-test/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/pom.xml?rev=225658&r1=225657&r2=225658&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/pom.xml Wed Jul 27 17:06:04 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/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?rev=225658&r1=225657&r2=225658&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
(original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
Wed Jul 27 17:06:04 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/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=225658&r1=225657&r2=225658&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
(original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
Wed Jul 27 17:06:04 2005
@@ -22,10 +22,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;
@@ -92,7 +92,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() )
@@ -164,7 +164,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/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=225658&r1=225657&r2=225658&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
Wed Jul 27 17:06:04 2005
@@ -130,7 +130,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>
         <requirement>
           <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>



Mime
View raw message