Author: evenisse
Date: Mon Jul 18 23:04:30 2005
New Revision: 219622
URL: http://svn.apache.org/viewcvs?rev=219622&view=rev
Log:
o Update maven-scm dependencies
o [MPSCM-56] Add Starteam support, plus scm:add, scm:status, scm:checkin
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=219622&r1=219621&r2=219622&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/project.xml (original)
+++ maven/maven-1/plugins/trunk/scm/project.xml Mon Jul 18 23:04:30 2005
@@ -109,13 +109,21 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-5</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0-alpha-3</version>
+ <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>
@@ -124,22 +132,22 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.0-alpha-2-20050610.043511-1</version>
+ <version>1.0-alpha-2-20050712.151302-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvs</artifactId>
- <version>1.0-alpha-2-20050610.043511-1</version>
+ <version>1.0-alpha-2-20050712.151302-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svn</artifactId>
- <version>1.0-alpha-2-20050610.054835-1</version>
+ <version>1.0-alpha-2-20050712.155105-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-starteam</artifactId>
- <version>1.0-alpha-2-20050610.051724-1</version>
+ <version>1.0-alpha-2-20050712.153836-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=219622&r1=219621&r2=219622&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 Jul 18 23:04:30 2005
@@ -19,8 +19,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;
import java.io.File;
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=219622&r1=219621&r2=219622&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 Jul 18 23:04:30 2005
@@ -19,17 +19,18 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import
org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.scm.ScmManager;
+import org.apache.maven.scm.log.DefaultLog;
+import org.codehaus.plexus.scm.NoSuchScmProviderException;
import java.io.File;
@@ -125,7 +126,6 @@
{
StarteamScmProviderRepository starteamRepo =
(StarteamScmProviderRepository) repository.getProviderRepository();
- /* TODO: reinstate when the provider supports it
if ( username != null && username.length() > 0 )
{
starteamRepo.setUser( username );
@@ -134,7 +134,6 @@
{
starteamRepo.setPassword( password );
}
- */
}
return repository;
@@ -145,6 +144,8 @@
{
Embedder embedder = getEmbedder();
ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE
);
+ scmManager.addListener( new DefaultLog() );
+
return scmManager;
}
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=219622&r1=219621&r2=219622&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 Jul 18 23:04:30 2005
@@ -19,9 +19,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.embed.Embedder;
+import org.codehaus.plexus.scm.ScmManager;
import java.io.File;
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=219622&r1=219621&r2=219622&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 Jul 18 23:04:30 2005
@@ -19,10 +19,10 @@
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.embed.Embedder;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.scm.ScmManager;
import java.io.File;
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=219622&r1=219621&r2=219622&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 Jul 18 23:04:30 2005
@@ -20,9 +20,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.embed.Embedder;
+import org.codehaus.plexus.scm.ScmManager;
import java.io.File;
import java.util.Iterator;
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=219622&r1=219621&r2=219622&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 Jul 18 23:04:30 2005
@@ -19,8 +19,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;
import java.io.File;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
