svn commit: r935360 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/blame/clearcase.log

2010-04-18 Thread olamy 
Author: olamy
Date: Sun Apr 18 15:43:18 2010
New Revision: 935360

URL: http://svn.apache.org/viewvc?rev=935360&view=rev
Log:
really add missing file :-) 

Added:

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/blame/clearcase.log

Added: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/blame/clearcase.log
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/blame/clearcase.log?rev=935360&view=auto
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/blame/clearcase.log
 (added)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/blame/clearcase.log
 Sun Apr 18 15:43:18 2010
@@ -0,0 +1,12 @@
+VERSION:7@@@USER:Jeremie Lagarde@@@DATE:20081026.162644@@@http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+VERSION:7@@@USER:Jeremie Lagarde@@@DATE:20081026.162644@@@ 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+VERSION:7@@@USER:Jeremie Lagarde@@@DATE:20081026.162644@@@
4.0.0
+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@
+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@

+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@
+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@
localhost
+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@
dumping to target
+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@
file://${basedir}/target/repo/
+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@
+VERSION:8@@@USER:Jeremie Lagarde@@@DATE:20091118.162633@@@

+VERSION:5@@@USER:Evgeny Mandrikov@@@DATE:20081017.114150@@@
\ No newline at end of file

svn commit: r935359 - in /maven/scm/trunk: maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java pom.xml

2010-04-18 Thread olamy 
Author: olamy
Date: Sun Apr 18 15:41:30 2010
New Revision: 935359

URL: http://svn.apache.org/viewvc?rev=935359&view=rev
Log:
add missing file
add m2e profile to enable incremental build.


Modified:

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java
maven/scm/trunk/pom.xml

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java?rev=935359&r1=935358&r2=935359&view=diff
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java
 Sun Apr 18 15:41:30 2010
@@ -39,6 +39,7 @@ public class ClearCaseBlameConsumerTest
 public void testConsumer()
 throws IOException
 {
+
 InputStream inputStream = getResourceAsStream( 
"/clearcase/blame/clearcase.log" );
 
 BufferedReader in = new BufferedReader( new InputStreamReader( 
inputStream ) );

Modified: maven/scm/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=935359&r1=935358&r2=935359&view=diff
==
--- maven/scm/trunk/pom.xml (original)
+++ maven/scm/trunk/pom.xml Sun Apr 18 15:41:30 2010
@@ -334,5 +334,39 @@
 
   
 
+
+
+  m2e
+  
+target
+  
+  
+
+  m2e.version
+
+  
+  
+${m2BuildDirectory}
+
+  
+org.maven.ide.eclipse
+lifecycle-mapping
+0.10.0
+
+  customizable
+  
+
+
+
+  
+  
+
org.apache.maven.plugins:maven-resources-plugin::
+  
+
+  
+
+  
+
+

svn commit: r935354 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src: main/java/org/apache/maven/scm/provider/perforce/ main/java/org/apache/maven/scm/provider/perforce/comman

2010-04-18 Thread olamy 
Author: olamy
Date: Sun Apr 18 15:23:20 2010
New Revision: 935354

URL: http://svn.apache.org/viewvc?rev=935354&view=rev
Log:
[SCM-542] Add blame command to Perforce provider
Submitted by Evgeny Mandrikov

Added:

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameCommand.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameConsumer.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/blame/

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameConsumerTest.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumerTest.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/annotatelog.txt
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/filelog.txt
   (with props)
Modified:

maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.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/PerforceScmProvider.java?rev=935354&r1=935353&r2=935354&view=diff
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
 Sun Apr 18 15:23:20 2010
@@ -21,9 +21,11 @@ package org.apache.maven.scm.provider.pe
 
 
 import org.apache.maven.scm.CommandParameters;
+import org.apache.maven.scm.NoSuchCommandScmException;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.add.AddScmResult;
+import org.apache.maven.scm.command.blame.BlameScmResult;
 import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
 import org.apache.maven.scm.command.checkin.CheckInScmResult;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
@@ -41,6 +43,7 @@ import org.apache.maven.scm.provider.Scm
 import org.apache.maven.scm.provider.perforce.command.PerforceInfoCommand;
 import org.apache.maven.scm.provider.perforce.command.PerforceWhereCommand;
 import org.apache.maven.scm.provider.perforce.command.add.PerforceAddCommand;
+import 
org.apache.maven.scm.provider.perforce.command.blame.PerforceBlameCommand;
 import 
org.apache.maven.scm.provider.perforce.command.changelog.PerforceChangeLogCommand;
 import 
org.apache.maven.scm.provider.perforce.command.checkin.PerforceCheckInCommand;
 import 
org.apache.maven.scm.provider.perforce.command.checkout.PerforceCheckOutCommand;
@@ -248,6 +251,14 @@ public class PerforceScmProvider
 return (UpdateScmResult) command.execute( repository, fileSet, params 
);
 }
 
+protected BlameScmResult blame( ScmProviderRepository repository, 
ScmFileSet fileSet, CommandParameters params )
+throws ScmException
+{
+PerforceBlameCommand command = new PerforceBlameCommand();
+command.setLogger( getLogger() );
+return (BlameScmResult) command.execute( repository, fileSet, params );
+}
+
 public static Commandline createP4Command( PerforceScmProviderRepository 
repo, File workingDir )
 {
 Commandline command = new Commandline();

Added: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameCommand.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/blame/PerforceBlameCommand.java?rev=935354&view=auto
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org

svn commit: r935353 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java

2010-04-18 Thread olamy 
Author: olamy
Date: Sun Apr 18 15:19:50 2010
New Revision: 935353

URL: http://svn.apache.org/viewvc?rev=935353&view=rev
Log:
formart code

Modified:

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.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/blame/ClearCaseBlameCommand.java?rev=935353&r1=935352&r2=935353&view=diff
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java
 Sun Apr 18 15:19:50 2010
@@ -40,8 +40,7 @@ public class ClearCaseBlameCommand
 implements ClearCaseCommand
 {
 
-public BlameScmResult executeBlameCommand( ScmProviderRepository repo, 
ScmFileSet workingDirectory,
-   String filename )
+public BlameScmResult executeBlameCommand( ScmProviderRepository repo, 
ScmFileSet workingDirectory, String filename )
 throws ScmException
 {

svn commit: r935352 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame: ClearCaseBlameCommand.java ClearCaseBlam

2010-04-18 Thread olamy 
Author: olamy
Date: Sun Apr 18 15:18:36 2010
New Revision: 935352

URL: http://svn.apache.org/viewvc?rev=935352&view=rev
Log:
add @since 1.4 javadoc tag

Modified:

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.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/blame/ClearCaseBlameCommand.java?rev=935352&r1=935351&r2=935352&view=diff
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java
 Sun Apr 18 15:18:36 2010
@@ -33,6 +33,7 @@ import java.io.File;
 
 /**
  * @author Jérémie Lagarde
+ * @since 1.4
  */
 public class ClearCaseBlameCommand
 extends AbstractBlameCommand

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.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/blame/ClearCaseBlameConsumer.java?rev=935352&r1=935351&r2=935352&view=diff
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
 Sun Apr 18 15:18:36 2010
@@ -30,6 +30,7 @@ import java.util.List;
 
 /**
  * @author Jérémie Lagarde
+ * @since 1.4
  */
 public class ClearCaseBlameConsumer
 extends AbstractConsumer

svn commit: r935351 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase: ./ src/main/java/org/apache/maven/scm/provider/clearcase/ src/main/java/org/apache/maven/scm/provider/clearc

2010-04-18 Thread olamy 
Author: olamy
Date: Sun Apr 18 15:13:00 2010
New Revision: 935351

URL: http://svn.apache.org/viewvc?rev=935351&view=rev
Log:
[SCM-543] Add blame command to ClearCase provider
Submitted by Evgeny Mandrikov

Added:

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java
   (with props)

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/blame/
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml

maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml?rev=935351&r1=935350&r2=935351&view=diff
==
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml 
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml 
Sun Apr 18 15:13:00 2010
@@ -33,6 +33,13 @@
   Maven SCM Clearcase Provider
   SCM Provider implementation for Clearcase 
(http://www-306.ibm.com/software/awdtools/clearcase/).
 
+  
+
+  regexp
+  regexp
+
+  
+
   
 
   

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.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/ClearCaseScmProvider.java?rev=935351&r1=935350&r2=935351&view=diff
==
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java
 Sun Apr 18 15:13:00 2010
@@ -22,6 +22,7 @@ package org.apache.maven.scm.provider.cl
 import org.apache.maven.scm.CommandParameters;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.command.blame.BlameScmResult;
 import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
 import org.apache.maven.scm.command.checkin.CheckInScmResult;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
@@ -31,6 +32,7 @@ import org.apache.maven.scm.command.tag.
 import org.apache.maven.scm.command.update.UpdateScmResult;
 import org.apache.maven.scm.provider.AbstractScmProvider;
 import org.apache.maven.scm.provider.ScmProviderRepository;
+import 
org.apache.maven.scm.provider.clearcase.command.blame.ClearCaseBlameCommand;
 import 
org.apache.maven.scm.provider.clearcase.command.changelog.ClearCaseChangeLogCommand;
 import 
org.apache.maven.scm.provider.clearcase.command.checkin.ClearCaseCheckInCommand;
 import 
org.apache.maven.scm.provider.clearcase.command.checkout.ClearCaseCheckOutCommand;
@@ -165,4 +167,15 @@ public class ClearCaseScmProvider
 
 return (EditScmResult) command.execute( repository, fileSet, 
parameters );
 }
+
+/** {...@inheritdoc} */
+protected BlameScmResult blame( ScmProviderRepository repository, 
ScmFileSet fileSet, CommandParameters parameters )
+throws ScmException
+{
+ClearCaseBlameCommand command = new ClearCaseBlameCommand();
+
+command.setLogger( getLogger() );
+
+return (BlameScmResult) command.execute( repository, fileSet, 
parameters );
+}
 }

Added: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameCommand.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/blame/ClearCaseBlameCommand.java?rev=935351&view=auto
==
--- 
maven/scm/trunk/maven-scm

svn commit: r935343 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

2010-04-18 Thread olamy 
Author: olamy
Date: Sun Apr 18 14:29:35 2010
New Revision: 935343

URL: http://svn.apache.org/viewvc?rev=935343&view=rev
Log:
maven code standard

Modified:

maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

Modified: 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=935343&r1=935342&r2=935343&view=diff
==
--- 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
 (original)
+++ 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
 Sun Apr 18 14:29:35 2010
@@ -287,7 +287,7 @@ public abstract class AbstractScmMojo
 
 ScmProviderRepository providerRepo = 
repository.getProviderRepository();
 
-providerRepo.setPushChanges(pushChanges);
+providerRepo.setPushChanges( pushChanges );
 
 if ( !StringUtils.isEmpty( username ) )
 {