You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2006/01/17 19:13:50 UTC
svn commit: r369857 [4/6] - in /maven/scm/trunk:
maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/
maven-scm-plugin/ maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/
maven-scm-plugin/src/site/resources/css/ maven-scm-providers/...
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
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
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/PerforceScmProviderTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/PerforceScmProviderTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/PerforceScmProviderTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/PerforceScmProviderTest.java Tue Jan 17 10:12:41 2006
@@ -152,13 +152,13 @@
assertEquals( "//depot/projects/pathname", p4Repo.getPath() );
}
-
- public void testRepositoryPathCanonicalization()
+
+ public void testRepositoryPathCanonicalization()
{
assertEquals( "//depot/foo/bar/...", PerforceScmProvider.getCanonicalRepoPath( "//depot/foo/bar" ) );
-
+
assertEquals( "//depot/foo/bar/...", PerforceScmProvider.getCanonicalRepoPath( "//depot/foo/bar/" ) );
-
+
assertEquals( "//depot/foo/bar/...", PerforceScmProvider.getCanonicalRepoPath( "//depot/foo/bar/..." ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -63,8 +62,9 @@
File workingDirectory = getTestFile( "target/perforce-add-command-test" );
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
- PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File("."), new File[] { new File("foo.xml"), new File("bar.xml") } );
+ PerforceScmProviderRepository svnRepository =
+ (PerforceScmProviderRepository) repository.getProviderRepository();
+ ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new File( "foo.xml" ), new File( "bar.xml" )} );
Commandline cl = PerforceAddCommand.createCommandLine( svnRepository, workingDirectory, files );
assertEquals( commandLine, cl.toString() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.List;
-
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,14 +16,13 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -41,8 +40,7 @@
public void testGetCommandLineWithHost()
throws Exception
{
- testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -H a -u username filelog -t -l ..." );
+ testCommandLine( "scm:perforce:a:username@//depot/projects/pathname", "p4 -H a -u username filelog -t -l ..." );
}
public void testGetCommandLineWithHostAndPort()
@@ -63,7 +61,8 @@
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
- PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository.getProviderRepository();
+ PerforceScmProviderRepository svnRepository =
+ (PerforceScmProviderRepository) repository.getProviderRepository();
Commandline cl = PerforceChangeLogCommand.createCommandLine( svnRepository, workingDirectory );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,15 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
-import java.io.File;
import java.util.ArrayList;
-
-import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.ChangeFile;
-import org.apache.maven.scm.ChangeSet;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -42,8 +41,7 @@
public void testGetCommandLineWithHost()
throws Exception
{
- testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -H a -u username submit -i" );
+ testCommandLine( "scm:perforce:a:username@//depot/projects/pathname", "p4 -H a -u username submit -i" );
}
public void testGetCommandLineWithHostAndPort()
@@ -63,21 +61,24 @@
File workingDirectory = getTestFile( "target/perforce-checkin-command-test" );
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
- PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File("."), new File[] { new File("foo.xml"), new File("bar.xml") } );
+ PerforceScmProviderRepository svnRepository =
+ (PerforceScmProviderRepository) repository.getProviderRepository();
+ ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new File( "foo.xml" ), new File( "bar.xml" )} );
Commandline cl = PerforceCheckInCommand.createCommandLine( svnRepository, workingDirectory, files );
assertEquals( commandLine, cl.toString() );
-
+
String change = PerforceCheckInCommand.createChangeListSpecification( svnRepository, files, "Test checkin" );
assertContains( change, "//depot/projects/pathname/foo.xml" );
assertContains( change, "//depot/projects/pathname/bar.xml" );
assertContains( change, "Test checkin" );
}
-
- private void assertContains(String block, String element) {
- if (block.indexOf(element) == -1) {
- fail("Block '" + block + "' does not contain element '" + element + "'");
+
+ private void assertContains( String block, String element )
+ {
+ if ( block.indexOf( element ) == -1 )
+ {
+ fail( "Block '" + block + "' does not contain element '" + element + "'" );
}
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
-import org.apache.maven.scm.ScmTestCase;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -50,15 +50,17 @@
assertEquals( "", consumer.getOutput() );
}
- public void testBadParse() throws Exception {
- File testFile = getTestFile("src/test/resources/perforce/checkin_bad.txt");
+ public void testBadParse()
+ throws Exception
+ {
+ File testFile = getTestFile( "src/test/resources/perforce/checkin_bad.txt" );
PerforceCheckInConsumer consumer = new PerforceCheckInConsumer();
FileInputStream fis = new FileInputStream( testFile );
- BufferedReader in = new BufferedReader( new InputStreamReader(fis) );
+ BufferedReader in = new BufferedReader( new InputStreamReader( fis ) );
String s = in.readLine();
- while ( s != null )
+ while ( s != null )
{
consumer.consumeLine( s );
s = in.readLine();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,14 +16,14 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
-
-import org.apache.maven.scm.ScmFile;
-import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,12 +16,12 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
-
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -51,7 +50,7 @@
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository
.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[] { new File( "foo.xml" ), new File( "bar.xml" ) } );
+ ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new File( "foo.xml" ), new File( "bar.xml" )} );
Commandline cl = PerforceEditCommand.createCommandLine( svnRepository, new File( "." ), files );
assertEquals( commandLine, cl.toString() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.List;
-
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,12 +16,12 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
-
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -63,8 +62,9 @@
File workingDirectory = getTestFile( "target/perforce-remove-command-test" );
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
- PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File("."), new File[] { new File("foo.xml"), new File("bar.xml") } );
+ PerforceScmProviderRepository svnRepository =
+ (PerforceScmProviderRepository) repository.getProviderRepository();
+ ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new File( "foo.xml" ), new File( "bar.xml" )} );
Commandline cl = PerforceRemoveCommand.createCommandLine( svnRepository, workingDirectory, files );
assertEquals( commandLine, cl.toString() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.List;
-
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,15 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.List;
-
-import org.apache.maven.scm.ScmFile;
-import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl </a>
@@ -52,7 +51,7 @@
ScmRepository repository = getScmManager().makeScmRepository( "scm:perforce://depot/projects/pathname" );
PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository
.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File( "." ), new File[] { new File( "foo.xml" ), new File( "bar.xml" ) } );
+ ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new File( "foo.xml" ), new File( "bar.xml" )} );
Commandline cl1 = PerforceTagCommand.createLabelCommandLine( svnRepository, workingDirectory, files, tag );
assertEquals( create, cl1.toString() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.List;
-
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -49,8 +48,9 @@
File workingDirectory = getTestFile( "target/perforce-unedit-command-test" );
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
- PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository.getProviderRepository();
- ScmFileSet files = new ScmFileSet( new File("."), new File[] { new File("foo.xml"), new File("bar.xml") } );
+ PerforceScmProviderRepository svnRepository =
+ (PerforceScmProviderRepository) repository.getProviderRepository();
+ ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new File( "foo.xml" ), new File( "bar.xml" )} );
Commandline cl = PerforceUnEditCommand.createCommandLine( svnRepository, workingDirectory, files );
assertEquals( commandLine, cl.toString() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.List;
-
-import org.apache.maven.scm.ScmTestCase;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -49,6 +46,9 @@
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.IOException;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -56,7 +56,8 @@
public class StarteamScmProvider
extends AbstractScmProvider
{
- public static final String STARTEAM_URL_FORMAT = "[username[:password]@]hostname:port:/projectName/[viewName/][folderHiearchy/]";
+ public static final String STARTEAM_URL_FORMAT =
+ "[username[:password]@]hostname:port:/projectName/[viewName/][folderHiearchy/]";
// ----------------------------------------------------------------------
// ScmProvider Implementation
@@ -117,8 +118,8 @@
if ( tokens[1].indexOf( '/' ) == -1 )
{
- throw new ScmRepositoryException( "Invalid SCM URL: The url has to be on the form: "
- + STARTEAM_URL_FORMAT );
+ throw new ScmRepositoryException(
+ "Invalid SCM URL: The url has to be on the form: " + STARTEAM_URL_FORMAT );
}
int at = tokens[1].indexOf( '/' );
@@ -129,7 +130,8 @@
}
else
{
- throw new ScmRepositoryException( "Invalid SCM URL: The url has to be on the form: " + STARTEAM_URL_FORMAT );
+ throw new ScmRepositoryException(
+ "Invalid SCM URL: The url has to be on the form: " + STARTEAM_URL_FORMAT );
}
try
@@ -138,7 +140,8 @@
}
catch ( Exception e )
{
- throw new ScmRepositoryException( "Invalid SCM URL: The url has to be on the form: " + STARTEAM_URL_FORMAT );
+ throw new ScmRepositoryException(
+ "Invalid SCM URL: The url has to be on the form: " + STARTEAM_URL_FORMAT );
}
}
@@ -153,8 +156,8 @@
public AddScmResult add( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamAddCommand command = new StarteamAddCommand();
command.setLogger( getLogger() );
@@ -168,8 +171,8 @@
public ChangeLogScmResult changelog( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamChangeLogCommand command = new StarteamChangeLogCommand();
command.setLogger( getLogger() );
@@ -183,8 +186,8 @@
public CheckInScmResult checkin( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamCheckInCommand command = new StarteamCheckInCommand();
command.setLogger( getLogger() );
@@ -198,8 +201,8 @@
public CheckOutScmResult checkout( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamCheckOutCommand command = new StarteamCheckOutCommand();
command.setLogger( getLogger() );
@@ -213,8 +216,8 @@
public DiffScmResult diff( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamDiffCommand command = new StarteamDiffCommand();
command.setLogger( getLogger() );
@@ -228,8 +231,8 @@
public StatusScmResult status( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamStatusCommand command = new StarteamStatusCommand();
command.setLogger( getLogger() );
@@ -243,8 +246,8 @@
public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamTagCommand command = new StarteamTagCommand();
command.setLogger( getLogger() );
@@ -258,20 +261,20 @@
public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamUpdateCommand command = new StarteamUpdateCommand();
command.setLogger( getLogger() );
return (UpdateScmResult) command.execute( repository.getProviderRepository(), fileSet, parameters );
}
-
+
protected EditScmResult edit( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamEditCommand command = new StarteamEditCommand();
command.setLogger( getLogger() );
@@ -282,8 +285,8 @@
protected UnEditScmResult unedit( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-
+ fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
StarteamUnEditCommand command = new StarteamUnEditCommand();
command.setLogger( getLogger() );
@@ -294,6 +297,7 @@
/**
* Starteam provider requires that all files in ScmFileSet must be relative to basedir
* This function ensures and converts all absolute paths to relative paths
+ *
* @param currentFileSet
* @return
* @throws ScmException
@@ -302,53 +306,53 @@
throws ScmException
{
ScmFileSet newFileSet = null;
- try
+ try
{
- File basedir = getAbsoluteFilePath( currentFileSet.getBasedir() );
-
+ File basedir = getAbsoluteFilePath( currentFileSet.getBasedir() );
+
File [] files = currentFileSet.getFiles();
-
- for ( int i = 0 ; i < files.length; ++i )
+
+ for ( int i = 0; i < files.length; ++i )
{
if ( files[i].isAbsolute() )
{
files[i] = new File( getRelativePath( basedir, files[i] ) );
}
}
-
+
newFileSet = new ScmFileSet( basedir, files );
}
catch ( IOException e )
{
- throw new ScmException ( "Invalid file set.", e );
+ throw new ScmException( "Invalid file set.", e );
}
-
+
return newFileSet;
}
-
+
public static String getRelativePath( File basedir, File f )
throws ScmException, IOException
{
- File fileOrDir = getAbsoluteFilePath( f );
-
+ File fileOrDir = getAbsoluteFilePath( f );
+
if ( !fileOrDir.getPath().startsWith( basedir.getPath() ) )
{
- throw new ScmException ( fileOrDir.getPath() + " was not contained in " + basedir.getPath() );
+ throw new ScmException( fileOrDir.getPath() + " was not contained in " + basedir.getPath() );
}
-
+
return fileOrDir.getPath().substring( basedir.getPath().length() + 1, fileOrDir.getPath().length() );
}
-
+
private static File getAbsoluteFilePath( File fileOrDir )
- throws IOException
+ throws IOException
{
- String javaPathString = fileOrDir.getCanonicalPath().replace( '\\', '/' ) ;
-
- if ( javaPathString.endsWith("/") )
+ String javaPathString = fileOrDir.getCanonicalPath().replace( '\\', '/' );
+
+ if ( javaPathString.endsWith( "/" ) )
{
- javaPathString = javaPathString.substring( 0, javaPathString.length() - 1 );
+ javaPathString = javaPathString.substring( 0, javaPathString.length() - 1 );
}
- return new File ( javaPathString );
+ return new File( javaPathString );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java Tue Jan 17 10:12:41 2006
@@ -67,10 +67,10 @@
{
cl.createArgument().setValue( "-p" );
cl.createArgument().setValue( fullUrl );
-
+
cl.createArgument().setValue( "-fp" );
cl.createArgument().setValue( relativeFileOrDir.getAbsolutePath().replace( '\\', '/' ) );
-
+
return cl;
}
}
@@ -78,7 +78,6 @@
//set URL, makesure to alter the orginal URL
// to match with the working checkout directory of scm file
-
File relativeWorkingDir = relativeFileOrDir.getParentFile();
if ( relativeFileOrDir.isDirectory() )
@@ -120,6 +119,7 @@
/**
* Hellper method to display command line without password
+ *
* @param cl
* @return String
* @throws ScmException
@@ -182,10 +182,11 @@
throw new ScmException( "Error while executing command.", ex );
}
}
-
+
/**
* Given 2 paths, make sure parent and child are on the same tree
- * return the port of child that not in parent
+ * return the port of child that not in parent
+ *
* @param parent
* @param child
* @return
@@ -193,26 +194,27 @@
public static String getRelativeChildDirectory( String parent, String child )
{
//expect parentDir contains childDir
- try
+ try
{
String childPath = new File( child ).getCanonicalFile().getPath().replace( '\\', '/' );
-
+
String parentPath = new File( parent ).getCanonicalFile().getPath().replace( '\\', '/' );
-
+
if ( !childPath.startsWith( parentPath ) )
- {
+ {
throw new IllegalStateException();
}
-
+
String retDir = "." + childPath.substring( parentPath.length() );
return retDir;
-
+
}
catch ( IOException e )
{
- throw new IllegalStateException( "Unable to convert to canonical path of either " + parent + " or " + child );
+ throw new IllegalStateException(
+ "Unable to convert to canonical path of either " + parent + " or " + child );
}
}
-
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java Tue Jan 17 10:12:41 2006
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -27,9 +25,10 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java Tue Jan 17 10:12:41 2006
@@ -22,9 +22,9 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
@@ -99,20 +99,20 @@
{
String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
- try
+ try
{
this.currentDir = StarteamCommandLineUtils.getRelativeChildDirectory( this.workingDirectory, dirPath );
}
catch ( IllegalStateException e )
{
String error = "Working and checkout directories are not on the same tree";
-
+
logger.error( error );
-
+
logger.error( "Working directory: " + workingDirectory );
-
+
logger.error( "Checked out directory: " + dirPath );
-
+
throw new IllegalStateException( error );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.Date;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
@@ -27,11 +24,13 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+import java.util.Date;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -53,7 +52,7 @@
{
this.getLogger().warn( "This provider doesn't support changelog with on a given branch." );
}
-
+
StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
// TODO: revision
@@ -86,7 +85,8 @@
//
// ----------------------------------------------------------------------
- public static Commandline createCommandLine( StarteamScmProviderRepository repo, File workingDirectory, Date startDate )
+ public static Commandline createCommandLine( StarteamScmProviderRepository repo, File workingDirectory,
+ Date startDate )
{
Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "hist", workingDirectory, repo );
@@ -96,7 +96,7 @@
* unfortunately the below option only gives the hist from view creation date to
* the specified date. What good is that?????
*/
-
+
/*
if ( startDate != null )
{
@@ -107,7 +107,7 @@
cl.createArgument().setValue( localFormat.format( startDate ).toString() );
}
*/
-
+
return cl;
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,18 +16,17 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.maven.scm.ChangeSet;
-import org.apache.maven.scm.ChangeFile;
-import org.apache.maven.scm.log.ScmLogger;
-
-import org.codehaus.plexus.util.cli.StreamConsumer;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -42,6 +41,7 @@
private List entries = new ArrayList();
// state machine constants for reading Starteam output
+
/**
* expecting file information
*/
@@ -70,8 +70,8 @@
/**
* Marks end of file
*/
- private static final String END_FILE = "==================================="
- + "==========================================";
+ private static final String END_FILE =
+ "===================================" + "==========================================";
/**
* Marks start of revision
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java Tue Jan 17 10:12:41 2006
@@ -16,21 +16,18 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
-
import org.apache.maven.scm.command.checkin.AbstractCheckInCommand;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
-
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
@@ -83,7 +80,8 @@
if ( exitCode != 0 )
{
- return new CheckInScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+ return new CheckInScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(),
+ false );
}
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java Tue Jan 17 10:12:41 2006
@@ -21,9 +21,9 @@
import org.apache.maven.scm.log.ScmLogger;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java Tue Jan 17 10:12:41 2006
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.checkout.AbstractCheckOutCommand;
@@ -26,9 +24,10 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java Tue Jan 17 10:12:41 2006
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.diff.AbstractDiffCommand;
@@ -26,9 +24,10 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
@@ -68,7 +67,8 @@
return new DiffScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
}
- return new DiffScmResult( cl.toString(), consumer.getChangedFiles(), consumer.getDifferences(), consumer.getPatch() );
+ return new DiffScmResult( cl.toString(), consumer.getChangedFiles(), consumer.getDifferences(),
+ consumer.getPatch() );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java Tue Jan 17 10:12:41 2006
@@ -151,8 +151,8 @@
return;
}
- if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
- || line.startsWith( UNCHANGED_LINE_TOKEN ) )
+ if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) ||
+ line.startsWith( UNCHANGED_LINE_TOKEN ) )
{
// add to buffer
currentDifference.append( line ).append( "\n" );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommand.java Tue Jan 17 10:12:41 2006
@@ -16,22 +16,19 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-
import org.apache.maven.scm.command.edit.AbstractEditCommand;
import org.apache.maven.scm.command.edit.EditScmResult;
-
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
@@ -80,12 +77,13 @@
if ( exitCode != 0 )
{
- return new EditScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+ return new EditScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(),
+ false );
}
}
}
- return new EditScmResult( null , consumer.getEditedFiles() );
+ return new EditScmResult( null, consumer.getEditedFiles() );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditConsumer.java Tue Jan 17 10:12:41 2006
@@ -21,9 +21,9 @@
import org.apache.maven.scm.log.ScmLogger;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.io.File;
/**
* @author <a href="mailto:dantran@apache.org">Dan T. Tran</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommand.java Tue Jan 17 10:12:41 2006
@@ -16,22 +16,21 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.command.remove.AbstractRemoveCommand;
+import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.command.checkin.StarteamCheckInConsumer;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
* @version $Id$
@@ -76,7 +75,8 @@
if ( exitCode != 0 )
{
- return new RemoveScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+ return new RemoveScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(),
+ false );
}
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumer.java Tue Jan 17 10:12:41 2006
@@ -22,9 +22,9 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
@@ -99,20 +99,20 @@
{
String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
- try
+ try
{
this.currentDir = StarteamCommandLineUtils.getRelativeChildDirectory( this.workingDirectory, dirPath );
}
catch ( IllegalStateException e )
{
String error = "Working and checkout directories are not on the same tree";
-
+
logger.error( error );
-
+
logger.error( "Working directory: " + workingDirectory );
-
+
logger.error( "Checked out directory: " + dirPath );
-
+
throw new IllegalStateException( error );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java Tue Jan 17 10:12:41 2006
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.status.AbstractStatusCommand;
@@ -26,9 +24,10 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
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/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java?rev=369857&r1=369856&r2=369857&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 Tue Jan 17 10:12:41 2006
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -27,9 +25,10 @@
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java Tue Jan 17 10:12:41 2006
@@ -16,22 +16,19 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-
import org.apache.maven.scm.command.unedit.AbstractUnEditCommand;
import org.apache.maven.scm.command.unedit.UnEditScmResult;
-
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
@@ -80,7 +77,8 @@
if ( exitCode != 0 )
{
- return new UnEditScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+ return new UnEditScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(),
+ false );
}
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java Tue Jan 17 10:12:41 2006
@@ -21,9 +21,9 @@
import org.apache.maven.scm.log.ScmLogger;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.io.File;
/**
* @author <a href="mailto:dantran@apache.org">Dan T. Tran</a>
@@ -63,7 +63,7 @@
public void consumeLine( String line )
{
logger.debug( line );
-
+
int pos = 0;
if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
@@ -105,7 +105,7 @@
{
String lockedFilePath = this.currentDir + "/" + line.substring( 0, pos );
- this.files.add( new ScmFile( lockedFilePath, ScmFileStatus.UNKNOWN) );
+ this.files.add( new ScmFile( lockedFilePath, ScmFileStatus.UNKNOWN ) );
this.logger.info( "Unlocked: " + lockedFilePath );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java Tue Jan 17 10:12:41 2006
@@ -16,26 +16,24 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.command.changelog.ChangeLogCommand;
import org.apache.maven.scm.command.update.AbstractUpdateCommand;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
+import org.apache.maven.scm.provider.starteam.command.changelog.StarteamChangeLogCommand;
import org.apache.maven.scm.provider.starteam.command.checkout.StarteamCheckOutConsumer;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.apache.maven.scm.command.changelog.ChangeLogCommand;
-import org.apache.maven.scm.provider.starteam.command.changelog.StarteamChangeLogCommand;
-
-import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.DefaultConsumer;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
+
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
* @version $Id$
@@ -75,13 +73,13 @@
}
else
{
- //hiden feature to allow Continuous Integration machine to
- // delete local files. It affectively remove all build ouput as well
+ //hiden feature to allow Continuous Integration machine to
+ // delete local files. It affectively remove all build ouput as well
String doDeleteLocal = System.getProperty( "maven.scm.starteam.deleteLocal" );
-
+
if ( "true".equalsIgnoreCase( doDeleteLocal ) )
{
- this.deleteLocal( repository, fileSet.getBasedir(), tag);
+ this.deleteLocal( repository, fileSet.getBasedir(), tag );
}
}
}
@@ -96,7 +94,8 @@
if ( exitCode != 0 )
{
- return new UpdateScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+ return new UpdateScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(),
+ false );
}
}
}
@@ -147,23 +146,23 @@
return command;
}
-
+
private void deleteLocal( StarteamScmProviderRepository repo, File dir, String tag )
throws ScmException
{
- if ( dir.isFile() )
- {
- return ;
- }
-
- Commandline cl = createDeleteLocalCommand( repo, dir, tag );
-
+ if ( dir.isFile() )
+ {
+ return;
+ }
+
+ Commandline cl = createDeleteLocalCommand( repo, dir, tag );
+
StreamConsumer consumer = new DefaultConsumer();
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-
+
int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
-
+
if ( exitCode != 0 )
{
throw new ScmException( "Error executing delete-local: " + stderr.toString() );
@@ -178,7 +177,7 @@
{
cl.createArgument().setValue( "-is" );
}
-
+
if ( tag != null && tag.length() != 0 )
{
cl.createArgument().setValue( "-cfgl " );
@@ -189,8 +188,8 @@
cl.createArgument().setValue( "-filter" );
cl.createArgument().setValue( "N" );
-
+
return cl;
}
-
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java Tue Jan 17 10:12:41 2006
@@ -16,63 +16,62 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmTestCase;
+import java.io.File;
+
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version
*/
public class StarteamScmProviderTest
extends ScmTestCase
{
-
+
public void testGoodGetRelativeFile()
throws Exception
{
- File basedir = new File ( getBasedir() );
-
- File testDir = new File( basedir.getPath() + "/target/../target/testdir" );
-
- testDir.mkdirs();
-
- File testFile = new File ( testDir, "testfile.txt" );
-
- testFile.createNewFile();
-
- String relativePath = StarteamScmProvider.getRelativePath( basedir, testFile );
-
- assertEquals( "target/testdir/testfile.txt", relativePath.replace('\\', '/') );
-
+ File basedir = new File( getBasedir() );
+
+ File testDir = new File( basedir.getPath() + "/target/../target/testdir" );
+
+ testDir.mkdirs();
+
+ File testFile = new File( testDir, "testfile.txt" );
+
+ testFile.createNewFile();
+
+ String relativePath = StarteamScmProvider.getRelativePath( basedir, testFile );
+
+ assertEquals( "target/testdir/testfile.txt", relativePath.replace( '\\', '/' ) );
+
}
-
+
public void testBadGetRelativeFile()
throws Exception
{
- File basedir = new File ( getBasedir() );
-
+ File basedir = new File( getBasedir() );
+
File testDir1 = new File( basedir.getPath() + "/target/testdir1" );
testDir1.mkdirs();
File testDir2 = new File( basedir.getPath() + "/target/testdir2" );
testDir2.mkdirs();
-
- File testFile = new File ( testDir1, "testfile.txt" );
-
+
+ File testFile = new File( testDir1, "testfile.txt" );
+
testFile.createNewFile();
-
- try
+
+ try
{
- StarteamScmProvider.getRelativePath( testDir2, testFile );
- fail( "Bad relative path found!" );
+ StarteamScmProvider.getRelativePath( testDir2, testFile );
+ fail( "Bad relative path found!" );
}
catch ( ScmException e )
{
-
+
}
-
+
}
-
- }
+
+}