Author: olamy
Date: Sun Jan 9 15:02:55 2011
New Revision: 1056959
URL: http://svn.apache.org/viewvc?rev=1056959&view=rev
Log:
[SCM-591] Move to Java 1.5 : tag command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/tag/LocalTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
Sun Jan 9 15:02:55 2011
@@ -19,39 +19,43 @@ package org.apache.maven.scm.command.tag
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class TagScmResult
extends ScmResult
{
- private List taggedFiles;
+ private static final long serialVersionUID = -5068975000282095635L;
+
+ private List<ScmFile> taggedFiles;
public TagScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
- public TagScmResult( String commandLine, List taggedFiles )
+ public TagScmResult( String commandLine, List<ScmFile> taggedFiles )
{
super( commandLine, null, null, true );
this.taggedFiles = taggedFiles;
}
- public TagScmResult( List taggedFiles, ScmResult result )
+ public TagScmResult( List<ScmFile> taggedFiles, ScmResult result )
{
super( result );
this.taggedFiles = taggedFiles;
}
- public List getTaggedFiles()
+ public List<ScmFile> getTaggedFiles()
{
return taggedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java
Sun Jan 9 15:02:55 2011
@@ -31,6 +31,7 @@ import org.apache.maven.scm.provider.baz
/**
* Parse output from "bzr ls".
* @author <a href="mailto:johan.wal...@gmail.com";>Johan Walles</a>
+ * @author Olivier Lamy
* @version $Id$
*/
class BazaarLsConsumer extends BazaarConsumer {
@@ -42,7 +43,7 @@ class BazaarLsConsumer extends BazaarCon
/**
* A list of the files found by ls.
*/
- private List files;
+ private List<ScmFile> files;
/**
* Create a new "bzr ls" consumer.
@@ -54,7 +55,7 @@ class BazaarLsConsumer extends BazaarCon
ScmFileStatus wantedStatus)
{
super( logger );
- files = new LinkedList();
+ files = new LinkedList<ScmFile>();
}
public void doConsume( ScmFileStatus status, String trimmedLine ) {
@@ -71,7 +72,7 @@ class BazaarLsConsumer extends BazaarCon
* Answer what files were listed by bzr ls.
* @return A list of files listed by bzr ls.
*/
- public List getListedFiles() {
+ public List<ScmFile> getListedFiles() {
return files;
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.cl
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -32,10 +35,9 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-
/**
* @author <a href="mailto:wim.debla...@gmail.com";>Wim Deblauwe</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseTagCommand
@@ -117,18 +119,17 @@ public class ClearCaseTagCommand
command.setExecutable( "cleartool" );
command.createArg().setValue( "mklabel" );
- File[] files = scmFileSet.getFiles();
- if ( files.length == 0 )
+ List<File> files = scmFileSet.getFileList();
+ if ( files.isEmpty() )
{
command.createArg().setValue( "-recurse" );
}
command.createArg().setValue( tag );
- if ( files.length > 0 )
+ if ( files.size() > 0 )
{
- for ( int i = 0; i < files.length; i++ )
+ for ( File file : files )
{
- File file = files[i];
command.createArg().setValue( file.getName() );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.hg
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -36,15 +40,11 @@ import org.apache.maven.scm.provider.hg.
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Tag
*
* @author <a href="mailto:r...@darksleep.com";>ryan daum</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class HgTagCommand
@@ -72,7 +72,7 @@ public class HgTagCommand
throw new ScmException( "tag must be specified" );
}
- if ( fileSet.getFiles().length != 0 )
+ if ( fileSet.getFileList().isEmpty() )
{
throw new ScmException( "This provider doesn't support tagging
subsets of a directory" );
}
@@ -122,12 +122,10 @@ public class HgTagCommand
result = HgUtils.execute( listconsumer, getLogger(),
fileSet.getBasedir(), listCmd );
if ( result.isSuccess() )
{
- List files = listconsumer.getFiles();
- ArrayList fileList = new ArrayList();
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ List<ScmFile> files = listconsumer.getFiles();
+ List<ScmFile> fileList = new ArrayList<ScmFile>();
+ for ( ScmFile f : files )
{
- ScmFile f = (ScmFile) i.next();
-
if ( !f.getPath().endsWith( ".hgtags" ) )
{
fileList.add( new ScmFile( f.getPath(),
ScmFileStatus.TAGGED ) );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/tag/LocalTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/tag/LocalTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/tag/LocalTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/tag/LocalTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -19,20 +19,21 @@ package org.apache.maven.scm.provider.lo
* under the License.
*/
+import java.util.Collections;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.ScmTagParameters;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.local.command.LocalCommand;
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmTagParameters;
-import org.apache.maven.scm.ScmResult;
-
-import java.util.List;
-import java.util.Collections;
/**
* @author <a href="mailto:matth...@ambientideas.com";>Matthew McCullough</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class LocalTagCommand
@@ -43,8 +44,7 @@ public class LocalTagCommand
protected ScmResult executeTagCommand( ScmProviderRepository repository,
ScmFileSet fileSet, String message, ScmTagParameters scmTagParameters)
throws ScmException
{
- List fileList = Collections.EMPTY_LIST;
- return new TagScmResult( null, fileList );
+ return new TagScmResult( null, Collections.<ScmFile>emptyList() );
}
//Satisfies deprecated interface
@@ -52,7 +52,6 @@ public class LocalTagCommand
protected ScmResult executeTagCommand( ScmProviderRepository repository,
ScmFileSet fileSet, String tagName, String message)
throws ScmException
{
- List fileList = Collections.EMPTY_LIST;
- return new TagScmResult( null, fileList );
+ return new TagScmResult( null, Collections.<ScmFile>emptyList() );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -44,6 +44,7 @@ import java.util.List;
/**
* @author Mike Perham
+ * @author Olivier Lamy
* @version $Id$
*/
public class PerforceTagCommand
@@ -209,10 +210,9 @@ public class PerforceTagCommand
command.createArg().setValue( "-l" );
command.createArg().setValue( tag );
- List fs = files.getFileList();
- for ( int i = 0; i < fs.size(); i++ )
+ List<File> fs = files.getFileList();
+ for ( File file : fs )
{
- File file = (File) fs.get( i );
command.createArg().setValue( file.getPath() );
}
return command;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumer.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumer.java
Sun Jan 9 15:02:55 2011
@@ -19,18 +19,20 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.provider.perforce.command.AbstractPerforceConsumer;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.codehaus.plexus.util.cli.StreamConsumer;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author Mike Perham
- * @version $Id: PerforceChangeLogConsumer.java 331276 2005-11-07 15:04:54Z
- * evenisse $
+ * @author Olivier Lamy
+ * @version $Id$
*/
public class PerforceTagConsumer
extends AbstractPerforceConsumer
@@ -49,7 +51,7 @@ public class PerforceTagConsumer
private int currentState = STATE_CREATE;
- private List tagged = new ArrayList();
+ private List<ScmFile> tagged = new ArrayList<ScmFile>();
private RE syncRegexp;
@@ -73,7 +75,7 @@ public class PerforceTagConsumer
* //depot/modules/cordoba/runtime-ear/.runtime
* </pre>
*/
- public List getTagged()
+ public List<ScmFile> getTagged()
{
return tagged;
}
@@ -108,7 +110,7 @@ public class PerforceTagConsumer
error( line );
break;
}
- tagged.add( syncRegexp.getParen( 1 ) );
+ tagged.add( new ScmFile( syncRegexp.getParen( 1 ),
ScmFileStatus.TAGGED ) );
break;
default:
error( line );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -36,6 +36,7 @@ import java.io.File;
/**
* @author <a href="mailto:dant...@gmail.com";>Dan T. Tran</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class StarteamTagCommand
@@ -57,7 +58,7 @@ public class StarteamTagCommand
ScmTagParameters scmTagParameters )
throws ScmException
{
- if ( fileSet.getFiles().length != 0 )
+ if ( fileSet.getFileList().isEmpty() )
{
throw new ScmException( "This provider doesn't support tagging
subsets of a directory" );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagConsumer.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagConsumer.java
Sun Jan 9 15:02:55 2011
@@ -19,12 +19,13 @@ package org.apache.maven.scm.provider.st
* under the License.
*/
-import org.apache.maven.scm.log.ScmLogger;
-import org.codehaus.plexus.util.cli.StreamConsumer;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
/**
* @author <a href="mailto:dant...@gmail.com";>Dan T. Tran</a>
* @version $Id$
@@ -34,7 +35,7 @@ public class StarteamTagConsumer
{
private ScmLogger logger;
- private List tags = new ArrayList();
+ private List<ScmFile> tags = new ArrayList<ScmFile>();
public StarteamTagConsumer( ScmLogger logger )
{
@@ -50,7 +51,7 @@ public class StarteamTagConsumer
}
}
- public List getTaggedFiles()
+ public List<ScmFile> getTaggedFiles()
{
return tags;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -19,8 +19,14 @@ package org.apache.maven.scm.provider.sy
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmTagParameters;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
@@ -33,6 +39,7 @@ import org.apache.maven.scm.provider.syn
/**
* @author <a href="mailto:julien.he...@capgemini.com";>Julien Henry</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SynergyTagCommand
@@ -75,8 +82,12 @@ public class SynergyTagCommand
{
SynergyUtil.stop( getLogger(), ccmAddr );
}
-
- return new TagScmResult( "", fileSet.getFileList() );
+ List<ScmFile> files = new
ArrayList<ScmFile>(fileSet.getFileList().size());
+ for (File f : fileSet.getFileList())
+ {
+ files.add( new ScmFile( f.getPath(), ScmFileStatus.TAGGED ) );
+ }
+ return new TagScmResult( "", files );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -19,8 +19,14 @@ package org.apache.maven.scm.provider.tf
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmTagParameters;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
@@ -30,6 +36,10 @@ import org.apache.maven.scm.provider.tfs
import org.apache.maven.scm.provider.tfs.command.consumer.ErrorStreamConsumer;
import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;
+/**
+ * @author Olivier Lamy
+ *
+ */
public class TfsTagCommand
extends AbstractTagCommand
{
@@ -55,7 +65,12 @@ public class TfsTagCommand
return new TagScmResult( command.getCommandString(), "Error code
for TFS label command - " + status,
err.getOutput(), false );
}
- return new TagScmResult( command.getCommandString(), f.getFileList() );
+ List<ScmFile> files = new ArrayList<ScmFile>(f.getFileList().size());
+ for (File file : f.getFileList() )
+ {
+ files.add( new ScmFile( file.getPath(), ScmFileStatus.TAGGED ) );
+ }
+ return new TagScmResult( command.getCommandString(), files );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -48,13 +48,9 @@ public class VssTagCommand
.getMessage() );
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.maven.scm.command.tag.AbstractTagCommand#executeTagCommand(org.apache.maven.scm
- * .provider.ScmProviderRepository, org.apache.maven.scm.ScmFileSet,
java.lang.String,
- * java.lang.String)
+
+ /**
+ * @see
org.apache.maven.scm.command.tag.AbstractTagCommand#executeTagCommand(org.apache.maven.scm.provider.ScmProviderRepository,
org.apache.maven.scm.ScmFileSet, java.lang.String, java.lang.String)
*/
protected ScmResult executeTagCommand( ScmProviderRepository repository,
ScmFileSet fileSet, String tagName,
String message )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagConsumer.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagConsumer.java
Sun Jan 9 15:02:55 2011
@@ -32,6 +32,7 @@ import java.util.List;
/**
* @author <a href="mailto:matpime...@gmail.com";>Mateus Pimenta</a>
+ * @author Olivier Lamy
*/
public class VssTagConsumer
extends AbstractConsumer
@@ -95,7 +96,7 @@ public class VssTagConsumer
private String currentPath = "";
- private List updatedFiles = new ArrayList();
+ private List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
private VssScmProviderRepository repo;
@@ -208,7 +209,7 @@ public class VssTagConsumer
return argument;
}
- public List getUpdatedFiles()
+ public List<ScmFile> getUpdatedFiles()
{
return updatedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -73,9 +73,9 @@ public abstract class AbstractCvsTagComm
if ( fileSet.getFileList() != null && !fileSet.getFileList().isEmpty()
)
{
- for ( Iterator it = fileSet.getFileList().iterator();
it.hasNext(); )
+ for ( Iterator<File> it = fileSet.getFileList().iterator();
it.hasNext(); )
{
- File fileName = (File) it.next();
+ File fileName = it.next();
cl.createArg().setValue( fileName.toString() );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Sun Jan 9 15:02:55 2011
@@ -48,6 +48,7 @@ import org.codehaus.plexus.util.cli.Comm
/**
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
+ * @author Olivier Lamy
* @version $Id$
* @todo since this is just a copy, use that instead.
*/
@@ -89,7 +90,7 @@ public class SvnTagCommand
throw new ScmException( "tag must be specified" );
}
- if ( fileSet.getFiles().length != 0 )
+ if ( fileSet.getFileList().isEmpty() )
{
throw new ScmException( "This provider doesn't support tagging
subsets of a directory" );
}
@@ -149,26 +150,30 @@ public class SvnTagCommand
return new TagScmResult( cl.toString(), "The svn tag command
failed.", stderr.getOutput(), false );
}
- List fileList = new ArrayList();
+ List<ScmFile> fileList = new ArrayList<ScmFile>();
- List files = null;
+ List<File> files = null;
try
{
if ( StringUtils.isNotEmpty( fileSet.getExcludes() ) )
{
- files =
+ @SuppressWarnings( "unchecked" )
+ List<File> list =
FileUtils.getFiles( fileSet.getBasedir(),
( StringUtils.isEmpty(
fileSet.getIncludes() ) ? "**"
:
fileSet.getIncludes() ), fileSet.getExcludes()
+ ",**/.svn/**", false );
+ files = list;
}
else
{
- files =
+ @SuppressWarnings( "unchecked" )
+ List<File> list =
FileUtils.getFiles( fileSet.getBasedir(),
( StringUtils.isEmpty(
fileSet.getIncludes() ) ? "**"
:
fileSet.getIncludes() ), "**/.svn/**", false );
+ files = list;
}
}
catch ( IOException e )
@@ -176,9 +181,9 @@ public class SvnTagCommand
throw new ScmException( "Error while executing command.", e );
}
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( Iterator<File> i = files.iterator(); i.hasNext(); )
{
- File f = (File) i.next();
+ File f = i.next();
fileList.add( new ScmFile( f.getPath(), ScmFileStatus.TAGGED ) );
}
