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/02/27 20:58:12 UTC
svn commit: r381421 - in
/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src:
main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/
main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/
main/java/org/apache/maven/sc...
Author: evenisse
Date: Mon Feb 27 11:58:09 2006
New Revision: 381421
URL: http://svn.apache.org/viewcvs?rev=381421&view=rev
Log:
Fix command for future tests with TCK
Modified:
maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java
maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java
maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/diff/SvnDiffCommand.java
maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/remove/SvnRemoveCommand.java
maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/update/SvnUpdateCommand.java
maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java
maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java
Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java?rev=381421&r1=381420&r2=381421&view=diff
==============================================================================
--- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java (original)
+++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java Mon Feb 27 11:58:09 2006
@@ -55,7 +55,7 @@
{
SvnJavaScmProviderRepository javaRepo = (SvnJavaScmProviderRepository) repo;
- SVNRevision startRevision = ( startDate != null ) ? SVNRevision.create( startDate ) : SVNRevision.PREVIOUS;
+ SVNRevision startRevision = ( startDate != null ) ? SVNRevision.create( startDate ) : SVNRevision.UNDEFINED;
SVNRevision endRevision = ( endDate != null ) ? SVNRevision.create( endDate ) : SVNRevision.HEAD;
try
Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java?rev=381421&r1=381420&r2=381421&view=diff
==============================================================================
--- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java (original)
+++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java Mon Feb 27 11:58:09 2006
@@ -55,7 +55,7 @@
SvnJavaScmProviderRepository javaRepo = (SvnJavaScmProviderRepository) repo;
- ScmFileEventHandler handler = new ScmFileEventHandler( getLogger() );
+ ScmFileEventHandler handler = new ScmFileEventHandler( getLogger(), fileSet.getBasedir() );
javaRepo.getClientManager().getUpdateClient().setEventHandler( handler );
Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/diff/SvnDiffCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/diff/SvnDiffCommand.java?rev=381421&r1=381420&r2=381421&view=diff
==============================================================================
--- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/diff/SvnDiffCommand.java (original)
+++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/diff/SvnDiffCommand.java Mon Feb 27 11:58:09 2006
@@ -52,7 +52,7 @@
SvnJavaScmProviderRepository javaRepo = (SvnJavaScmProviderRepository) repo;
- ScmFileEventHandler handler = new ScmFileEventHandler( getLogger() );
+ ScmFileEventHandler handler = new ScmFileEventHandler( getLogger(), fileSet.getBasedir() );
try
{
Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/remove/SvnRemoveCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/remove/SvnRemoveCommand.java?rev=381421&r1=381420&r2=381421&view=diff
==============================================================================
--- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/remove/SvnRemoveCommand.java (original)
+++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/remove/SvnRemoveCommand.java Mon Feb 27 11:58:09 2006
@@ -49,7 +49,7 @@
SvnJavaScmProviderRepository javaRepo = (SvnJavaScmProviderRepository) repo;
- ScmFileEventHandler handler = new ScmFileEventHandler( getLogger() );
+ ScmFileEventHandler handler = new ScmFileEventHandler( getLogger(), fileSet.getBasedir() );
javaRepo.getClientManager().getWCClient().setEventHandler( handler );
Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/update/SvnUpdateCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/update/SvnUpdateCommand.java?rev=381421&r1=381420&r2=381421&view=diff
==============================================================================
--- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/update/SvnUpdateCommand.java (original)
+++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/update/SvnUpdateCommand.java Mon Feb 27 11:58:09 2006
@@ -54,7 +54,7 @@
try
{
- ScmFileEventHandler handler = new ScmFileEventHandler( getLogger() );
+ ScmFileEventHandler handler = new ScmFileEventHandler( getLogger(), fileSet.getBasedir() );
javaRepo.getClientManager().getUpdateClient().setEventHandler( handler );
Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java?rev=381421&r1=381420&r2=381421&view=diff
==============================================================================
--- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java (original)
+++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java Mon Feb 27 11:58:09 2006
@@ -26,6 +26,7 @@
import org.tmatesoft.svn.core.wc.SVNEvent;
import org.tmatesoft.svn.core.wc.SVNEventAction;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -45,12 +46,16 @@
private final List files = new ArrayList();
+ private final File baseDirectory;
+
/**
* The logger is used in alerting the user to unknown file statuses.
*/
- public ScmFileEventHandler( ScmLogger logger )
+ public ScmFileEventHandler( ScmLogger logger, File baseDirectory )
{
this.logger = logger;
+
+ this.baseDirectory = baseDirectory;
}
/**
@@ -82,7 +87,13 @@
event.getFile().getAbsolutePath() );
}
- files.add( new ScmFile( event.getFile().toString(), status ) );
+ String currentFile = event.getFile().getAbsolutePath();
+ if ( currentFile.startsWith( baseDirectory.getAbsolutePath() ) )
+ {
+ currentFile = currentFile.substring( baseDirectory.getAbsolutePath().length() + 1 );
+ }
+
+ files.add( new ScmFile( currentFile, status ) );
}
public void checkCancelled()
Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java?rev=381421&r1=381420&r2=381421&view=diff
==============================================================================
--- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java (original)
+++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java Mon Feb 27 11:58:09 2006
@@ -50,13 +50,19 @@
public void testFileURLNotSupported()
throws Exception
{
- testIllegalUrl( "scm:svn:file:///tmp/repo" );
+ testUrl( "scm:svn:file:///tmp/repo", "file:///tmp/repo", null );
}
public void testLocalhostFileURLNotSupported()
throws Exception
{
- testIllegalUrl( "scm:svn:file://localhost/tmp/repo" );
+ testUrl( "scm:svn:file://localhost/tmp/repo", "file://localhost/tmp/repo", null );
+ }
+
+ public void testLocalhostFileURLNotSupportedBis()
+ throws Exception
+ {
+ testUrl( "scm:svn:file://toto/tmp/repo", "file://toto/tmp/repo", null );
}
public void testLegalHttpURL()
@@ -136,7 +142,7 @@
repository.getProviderRepository() instanceof SvnScmProviderRepository );
SvnScmProviderRepository providerRepository = (SvnScmProviderRepository) repository.getProviderRepository();
-
+System.out.println(expectedUrl + " - " + providerRepository.getUrl() );
assertEquals( "url is incorrect", expectedUrl, providerRepository.getUrl() );
assertEquals( "User is incorrect", expectedUser, providerRepository.getUser() );