From continuum-commits-return-537-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Tue Jul 12 15:56:38 2005 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 36099 invoked from network); 12 Jul 2005 15:56:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jul 2005 15:56:38 -0000 Received: (qmail 30939 invoked by uid 500); 12 Jul 2005 15:56:37 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 30913 invoked by uid 500); 12 Jul 2005 15:56:37 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 30896 invoked by uid 99); 12 Jul 2005 15:56:37 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 12 Jul 2005 08:56:26 -0700 Received: (qmail 36041 invoked by uid 65534); 12 Jul 2005 15:56:24 -0000 Message-ID: <20050712155624.36040.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r215978 - in /maven/continuum/trunk: continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core/src/main/java/org/apache/maven/continuum/scm/ continuum-core/src/main/resources/META-INF/plexus/ contin... Date: Tue, 12 Jul 2005 15:56:22 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Tue Jul 12 08:56:21 2005 New Revision: 215978 URL: http://svn.apache.org/viewcvs?rev=215978&view=rev Log: [CONTINUUM-219] - Update to the maven-scm alpha-2 [CONTINUUM-212] - Add Starteam scm provider (Need to test) 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 maven/continuum/trunk/continuum-plexus-application/pom.xml maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/SafePathValidator.java maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java maven/continuum/trunk/continuum-web/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=215978&r1=215977&r2=215978&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/pom.xml (original) +++ maven/continuum/trunk/continuum-core/pom.xml Tue Jul 12 08:56:21 2005 @@ -94,11 +94,11 @@ wagon-provider-api 1.0-alpha-3 - + - org.apache.maven.scm - maven-scm-api - 1.0-alpha-1 + plexus + plexus-scm + 1.0-alpha-1-SNAPSHOT @@ -115,7 +115,7 @@ org.apache.maven.scm maven-scm-provider-local - 1.0-alpha-1 + 1.0-alpha-2-SNAPSHOT test 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=215978&r1=215977&r2=215978&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 12 08:56:21 2005 @@ -24,8 +24,7 @@ import org.apache.maven.continuum.scm.ContinuumScmException; import org.apache.maven.continuum.scm.ScmResult; import org.apache.maven.continuum.utils.ContinuumUtils; -import org.apache.maven.scm.manager.NoSuchScmProviderException; - +import org.codehaus.plexus.scm.NoSuchScmProviderException; import org.codehaus.plexus.util.StringUtils; /** 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=215978&r1=215977&r2=215978&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 12 08:56:21 2005 @@ -22,11 +22,10 @@ import org.apache.maven.continuum.project.ContinuumProject; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; -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; /** * @author Trygve Laugstøl 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=215978&r1=215977&r2=215978&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 12 08:56:21 2005 @@ -110,7 +110,7 @@ org.apache.maven.continuum.scm.DefaultContinuumScm - org.apache.maven.scm.manager.ScmManager + org.codehaus.plexus.scm.ScmManager Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/pom.xml?rev=215978&r1=215977&r2=215978&view=diff ============================================================================== --- maven/continuum/trunk/continuum-plexus-application/pom.xml (original) +++ maven/continuum/trunk/continuum-plexus-application/pom.xml Tue Jul 12 08:56:21 2005 @@ -102,19 +102,25 @@ org.apache.maven.scm maven-scm-provider-cvs - 1.0-alpha-1 + 1.0-alpha-2-SNAPSHOT runtime org.apache.maven.scm maven-scm-provider-svn - 1.0-alpha-1 + 1.0-alpha-2-SNAPSHOT runtime org.apache.maven.scm maven-scm-provider-local - 1.0-alpha-1 + 1.0-alpha-2-SNAPSHOT + runtime + + + org.apache.maven.scm + maven-scm-provider-starteam + 1.0-alpha-2-SNAPSHOT runtime Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/SafePathValidator.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/SafePathValidator.java?rev=215978&r1=215977&r2=215978&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/SafePathValidator.java (original) +++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/SafePathValidator.java Tue Jul 12 08:56:21 2005 @@ -2,8 +2,6 @@ import java.util.List; -import org.apache.maven.scm.manager.ScmManager; - import org.codehaus.plexus.formica.FormicaException; import org.codehaus.plexus.formica.validation.AbstractValidator; import org.codehaus.plexus.util.StringUtils; Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java?rev=215978&r1=215977&r2=215978&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java (original) +++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java Tue Jul 12 08:56:21 2005 @@ -18,10 +18,9 @@ import java.util.List; -import org.apache.maven.scm.manager.ScmManager; - import org.codehaus.plexus.formica.FormicaException; import org.codehaus.plexus.formica.validation.AbstractValidator; +import org.codehaus.plexus.scm.ScmManager; /** * @author Trygve Laugstøl @@ -30,7 +29,9 @@ public class ScmUrlValidator extends AbstractValidator { - /** @requirement */ + /** + * @plexus.requirement + */ private ScmManager scmManager; public boolean validate( String scmUrl ) Modified: maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=215978&r1=215977&r2=215978&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml Tue Jul 12 08:56:21 2005 @@ -375,7 +375,7 @@ org.apache.maven.continuum.web.validation.ScmUrlValidator - org.apache.maven.scm.manager.ScmManager + org.codehaus.plexus.scm.ScmManager