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/24 17:59:36 UTC
svn commit: r380710 -
/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Author: evenisse
Date: Fri Feb 24 08:59:33 2006
New Revision: 380710
URL: http://svn.apache.org/viewcvs?rev=380710&view=rev
Log:
o Allow to set username/password for all provider
o Allow to define username/password in settings.xml for all providers that implements ScmProviderRepositoryWithHost
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=380710&r1=380709&r2=380710&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java (original)
+++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java Fri Feb 24 08:59:33 2006
@@ -22,11 +22,12 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
@@ -155,42 +156,32 @@
{
repository = getScmManager().makeScmRepository( getConnectionUrl() );
- //getScmManager().getProviderByRepository( repository ).addListener( new DefaultLog( getLog() ) );
+ ScmProviderRepository providerRepo = repository.getProviderRepository();
- if ( repository.getProvider().equals( "svn" ) )
+ if ( !StringUtils.isEmpty( username ) )
{
- SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();
-
- if ( username != null && username.length() > 0 )
- {
- svnRepo.setUser( username );
- }
- if ( password != null && password.length() > 0 )
- {
- svnRepo.setPassword( password );
- }
- if ( tagBase != null && tagBase.length() > 0 )
- {
- svnRepo.setTagBase( tagBase );
- }
+ providerRepo.setUser( username );
+ }
+ if ( !StringUtils.isEmpty( password ) )
+ {
+ providerRepo.setPassword( password );
}
- if ( repository.getProvider().equals( "starteam" ) )
+ if ( repository.getProviderRepository() instanceof ScmProviderRepositoryWithHost )
{
- StarteamScmProviderRepository starteamRepo =
- (StarteamScmProviderRepository) repository.getProviderRepository();
+ ScmProviderRepositoryWithHost repo = (ScmProviderRepositoryWithHost) repository.getProviderRepository();
- loadStarteamUserNamePasswordFromSettings( starteamRepo );
+ loadUserNamePasswordFromSettings( repo );
- if ( username != null && username.length() > 0 )
+ if ( !StringUtils.isEmpty( username ) )
{
- starteamRepo.setUser( username );
+ repo.setUser( username );
}
- if ( password != null && password.length() > 0 )
+ if ( !StringUtils.isEmpty( password ) )
{
- starteamRepo.setPassword( password );
+ repo.setPassword( password );
}
}
@@ -204,35 +195,35 @@
}
/**
- * Load Starteam username password from settings if user has not set them in JVM properties
+ * Load username password from settings if user has not set them in JVM properties
*
* @param repo
*/
- private void loadStarteamUserNamePasswordFromSettings( StarteamScmProviderRepository repo )
+ private void loadUserNamePasswordFromSettings( ScmProviderRepositoryWithHost repo )
{
if ( username == null || password == null )
{
- String starteamAddress = repo.getHost();
+ String host = repo.getHost();
- int starteamPort = repo.getPort();
+ int port = repo.getPort();
- if ( starteamPort != 0 )
+ if ( port > 0 )
{
- starteamAddress += ":" + starteamPort;
+ host += ":" + port;
}
- Server server = this.settings.getServer( starteamAddress );
+ Server server = this.settings.getServer( host );
if ( server != null )
{
if ( username == null )
{
- username = this.settings.getServer( starteamAddress ).getUsername();
+ username = this.settings.getServer( host ).getUsername();
}
if ( password == null )
{
- password = this.settings.getServer( starteamAddress ).getPassword();
+ password = this.settings.getServer( host ).getPassword();
}
}
}
@@ -251,7 +242,8 @@
getLog().error( result.getCommandOutput() == null ? "" : result.getCommandOutput() );
- throw new MojoExecutionException( "Command failed." );
+ throw new MojoExecutionException(
+ "Command failed." + StringUtils.defaultString( result.getProviderMessage() ) );
}
}
}
Re: svn commit: r380710 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Posted by Emmanuel Venisse <em...@venisse.net>.
Good eye ;-)
Fixed.
Thanks
Emmanuel
Dennis Lundberg a écrit :
> See inline comment...
>
> evenisse@apache.org wrote:
>
>> Author: evenisse
>> Date: Fri Feb 24 08:59:33 2006
>> New Revision: 380710
>>
>> URL: http://svn.apache.org/viewcvs?rev=380710&view=rev
>> Log:
>> o Allow to set username/password for all provider
>> o Allow to define username/password in settings.xml for all providers
>> that implements ScmProviderRepositoryWithHost
>>
>> Modified:
>>
>> maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
>>
>>
>> Modified:
>> maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
>>
>> URL:
>> http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=380710&r1=380709&r2=380710&view=diff
>>
>> ==============================================================================
>>
>> ---
>> maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
>> Fri Feb 24 08:59:33 2006
>> @@ -22,11 +22,12 @@
>> import org.apache.maven.scm.ScmFileSet;
>> import org.apache.maven.scm.ScmResult;
>> import org.apache.maven.scm.manager.ScmManager;
>> -import
>> org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
>>
>> -import
>> org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
>> +import org.apache.maven.scm.provider.ScmProviderRepository;
>> +import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
>> import org.apache.maven.scm.repository.ScmRepository;
>> import org.apache.maven.settings.Server;
>> import org.apache.maven.settings.Settings;
>> +import org.codehaus.plexus.util.StringUtils;
>>
>> import java.io.File;
>> import java.io.IOException;
>> @@ -155,42 +156,32 @@
>> {
>> repository = getScmManager().makeScmRepository(
>> getConnectionUrl() );
>>
>> - //getScmManager().getProviderByRepository( repository
>> ).addListener( new DefaultLog( getLog() ) );
>> + ScmProviderRepository providerRepo =
>> repository.getProviderRepository();
>>
>> - if ( repository.getProvider().equals( "svn" ) )
>> + if ( !StringUtils.isEmpty( username ) )
>> {
>> - SvnScmProviderRepository svnRepo =
>> (SvnScmProviderRepository) repository.getProviderRepository();
>> -
>> - if ( username != null && username.length() > 0 )
>> - {
>> - svnRepo.setUser( username );
>> - }
>> - if ( password != null && password.length() > 0 )
>> - {
>> - svnRepo.setPassword( password );
>> - }
>> - if ( tagBase != null && tagBase.length() > 0 )
>> - {
>> - svnRepo.setTagBase( tagBase );
>> - }
>
>
> Here we loose the code for setting tagBase.
> Was this intentional?
>
>> + providerRepo.setUser( username );
>> + }
>>
>> + if ( !StringUtils.isEmpty( password ) )
>> + {
>> + providerRepo.setPassword( password );
>> }
>>
>> - if ( repository.getProvider().equals( "starteam" ) )
>> + if ( repository.getProviderRepository() instanceof
>> ScmProviderRepositoryWithHost )
>> {
>> - StarteamScmProviderRepository starteamRepo =
>> - (StarteamScmProviderRepository)
>> repository.getProviderRepository();
>> + ScmProviderRepositoryWithHost repo =
>> (ScmProviderRepositoryWithHost) repository.getProviderRepository();
>>
>> - loadStarteamUserNamePasswordFromSettings(
>> starteamRepo );
>> + loadUserNamePasswordFromSettings( repo );
>>
>> - if ( username != null && username.length() > 0 )
>> + if ( !StringUtils.isEmpty( username ) )
>> {
>> - starteamRepo.setUser( username );
>> + repo.setUser( username );
>> }
>>
>> - if ( password != null && password.length() > 0 )
>> + if ( !StringUtils.isEmpty( password ) )
>> {
>> - starteamRepo.setPassword( password );
>> + repo.setPassword( password );
>> }
>> }
>>
>> @@ -204,35 +195,35 @@
>> }
>>
>> /**
>> - * Load Starteam username password from settings if user has not
>> set them in JVM properties
>> + * Load username password from settings if user has not set them
>> in JVM properties
>> *
>> * @param repo
>> */
>> - private void loadStarteamUserNamePasswordFromSettings(
>> StarteamScmProviderRepository repo )
>> + private void loadUserNamePasswordFromSettings(
>> ScmProviderRepositoryWithHost repo )
>> {
>> if ( username == null || password == null )
>> {
>> - String starteamAddress = repo.getHost();
>> + String host = repo.getHost();
>>
>> - int starteamPort = repo.getPort();
>> + int port = repo.getPort();
>>
>> - if ( starteamPort != 0 )
>> + if ( port > 0 )
>> {
>> - starteamAddress += ":" + starteamPort;
>> + host += ":" + port;
>> }
>>
>> - Server server = this.settings.getServer( starteamAddress );
>> + Server server = this.settings.getServer( host );
>>
>> if ( server != null )
>> {
>> if ( username == null )
>> {
>> - username = this.settings.getServer(
>> starteamAddress ).getUsername();
>> + username = this.settings.getServer( host
>> ).getUsername();
>> }
>>
>> if ( password == null )
>> {
>> - password = this.settings.getServer(
>> starteamAddress ).getPassword();
>> + password = this.settings.getServer( host
>> ).getPassword();
>> }
>> }
>> }
>> @@ -251,7 +242,8 @@
>>
>> getLog().error( result.getCommandOutput() == null ? "" :
>> result.getCommandOutput() );
>>
>> - throw new MojoExecutionException( "Command failed." );
>> + throw new MojoExecutionException(
>> + "Command failed." + StringUtils.defaultString(
>> result.getProviderMessage() ) );
>> }
>> }
>> }
>>
>>
>
>
Re: svn commit: r380710 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Posted by Dennis Lundberg <de...@apache.org>.
See inline comment...
evenisse@apache.org wrote:
> Author: evenisse
> Date: Fri Feb 24 08:59:33 2006
> New Revision: 380710
>
> URL: http://svn.apache.org/viewcvs?rev=380710&view=rev
> Log:
> o Allow to set username/password for all provider
> o Allow to define username/password in settings.xml for all providers that implements ScmProviderRepositoryWithHost
>
> Modified:
> maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
>
> Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
> URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=380710&r1=380709&r2=380710&view=diff
> ==============================================================================
> --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java (original)
> +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java Fri Feb 24 08:59:33 2006
> @@ -22,11 +22,12 @@
> import org.apache.maven.scm.ScmFileSet;
> import org.apache.maven.scm.ScmResult;
> import org.apache.maven.scm.manager.ScmManager;
> -import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
> -import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
> +import org.apache.maven.scm.provider.ScmProviderRepository;
> +import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
> import org.apache.maven.scm.repository.ScmRepository;
> import org.apache.maven.settings.Server;
> import org.apache.maven.settings.Settings;
> +import org.codehaus.plexus.util.StringUtils;
>
> import java.io.File;
> import java.io.IOException;
> @@ -155,42 +156,32 @@
> {
> repository = getScmManager().makeScmRepository( getConnectionUrl() );
>
> - //getScmManager().getProviderByRepository( repository ).addListener( new DefaultLog( getLog() ) );
> + ScmProviderRepository providerRepo = repository.getProviderRepository();
>
> - if ( repository.getProvider().equals( "svn" ) )
> + if ( !StringUtils.isEmpty( username ) )
> {
> - SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();
> -
> - if ( username != null && username.length() > 0 )
> - {
> - svnRepo.setUser( username );
> - }
> - if ( password != null && password.length() > 0 )
> - {
> - svnRepo.setPassword( password );
> - }
> - if ( tagBase != null && tagBase.length() > 0 )
> - {
> - svnRepo.setTagBase( tagBase );
> - }
Here we loose the code for setting tagBase.
Was this intentional?
> + providerRepo.setUser( username );
> + }
>
> + if ( !StringUtils.isEmpty( password ) )
> + {
> + providerRepo.setPassword( password );
> }
>
> - if ( repository.getProvider().equals( "starteam" ) )
> + if ( repository.getProviderRepository() instanceof ScmProviderRepositoryWithHost )
> {
> - StarteamScmProviderRepository starteamRepo =
> - (StarteamScmProviderRepository) repository.getProviderRepository();
> + ScmProviderRepositoryWithHost repo = (ScmProviderRepositoryWithHost) repository.getProviderRepository();
>
> - loadStarteamUserNamePasswordFromSettings( starteamRepo );
> + loadUserNamePasswordFromSettings( repo );
>
> - if ( username != null && username.length() > 0 )
> + if ( !StringUtils.isEmpty( username ) )
> {
> - starteamRepo.setUser( username );
> + repo.setUser( username );
> }
>
> - if ( password != null && password.length() > 0 )
> + if ( !StringUtils.isEmpty( password ) )
> {
> - starteamRepo.setPassword( password );
> + repo.setPassword( password );
> }
> }
>
> @@ -204,35 +195,35 @@
> }
>
> /**
> - * Load Starteam username password from settings if user has not set them in JVM properties
> + * Load username password from settings if user has not set them in JVM properties
> *
> * @param repo
> */
> - private void loadStarteamUserNamePasswordFromSettings( StarteamScmProviderRepository repo )
> + private void loadUserNamePasswordFromSettings( ScmProviderRepositoryWithHost repo )
> {
> if ( username == null || password == null )
> {
> - String starteamAddress = repo.getHost();
> + String host = repo.getHost();
>
> - int starteamPort = repo.getPort();
> + int port = repo.getPort();
>
> - if ( starteamPort != 0 )
> + if ( port > 0 )
> {
> - starteamAddress += ":" + starteamPort;
> + host += ":" + port;
> }
>
> - Server server = this.settings.getServer( starteamAddress );
> + Server server = this.settings.getServer( host );
>
> if ( server != null )
> {
> if ( username == null )
> {
> - username = this.settings.getServer( starteamAddress ).getUsername();
> + username = this.settings.getServer( host ).getUsername();
> }
>
> if ( password == null )
> {
> - password = this.settings.getServer( starteamAddress ).getPassword();
> + password = this.settings.getServer( host ).getPassword();
> }
> }
> }
> @@ -251,7 +242,8 @@
>
> getLog().error( result.getCommandOutput() == null ? "" : result.getCommandOutput() );
>
> - throw new MojoExecutionException( "Command failed." );
> + throw new MojoExecutionException(
> + "Command failed." + StringUtils.defaultString( result.getProviderMessage() ) );
> }
> }
> }
>
>
--
Dennis Lundberg