Author: evenisse
Date: Fri Mar 3 03:55:22 2006
New Revision: 382774
URL: http://svn.apache.org/viewcvs?rev=382774&view=rev
Log:
Allow username and password for all providers
Modified:
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Modified:
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?rev=382774&r1=382773&r2=382774&view=diff
==============================================================================
---
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
(original)
+++
maven/sandbox/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Fri Mar 3 03:55:22 2006
@@ -22,7 +22,7 @@
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.ScmProvider;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.wagon.AbstractWagon;
@@ -33,6 +33,7 @@
import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
@@ -105,20 +106,18 @@
throw new TransferFailedException( "Unknown SCM type", e );
}
- // TODO: this should be generic...
- if ( scmRepository.getProvider().equals( "svn" ) )
+ ScmProviderRepository providerRepository =
scmRepository.getProviderRepository();
+
+ if ( StringUtils.isNotEmpty( username ) )
{
- SvnScmProviderRepository svnRepo = (SvnScmProviderRepository)
scmRepository.getProviderRepository();
+ providerRepository.setUser( username );
+ }
- if ( username != null && username.length() > 0 )
- {
- svnRepo.setUser( username );
- }
- if ( password != null && password.length() > 0 )
- {
- svnRepo.setPassword( password );
- }
+ if ( StringUtils.isNotEmpty( password ) )
+ {
+ providerRepository.setPassword( password );
}
+
return scmRepository;
}