Author: olamy
Date: Sun Jul 18 20:25:44 2010
New Revision: 965281
URL: http://svn.apache.org/viewvc?rev=965281&view=rev
Log:
[SCM-562] Don't overwrite SVN auth cache
Submitted by Lenik
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo?rev=965281&r1=965280&r2=965281&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
Sun Jul 18 20:25:44 2010
@@ -73,6 +73,15 @@
Switch off if you do not like to use --non-interactive e.g. on
Leopard (see SCM-402).
]]></description>
</field>
+ <field>
+ <name>useAuthCache</name>
+ <version>1.1.0+</version>
+ <type>boolean</type>
+ <defaultValue>false</defaultValue>
+ <description><![CDATA[
+ Switch on if you want to cache authentication credentials
(Warning: this will overwrite existing authentication credentials on your
working copy)
+ ]]></description>
+ </field>
</fields>
</class>
</classes>
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java?rev=965281&r1=965280&r2=965281&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
Sun Jul 18 20:25:44 2010
@@ -104,20 +104,27 @@ public class SvnCommandLineUtils
cl.createArg().setValue(
SvnUtil.getSettings().getConfigDirectory() );
}
+ boolean hasAuthInfo = false;
if ( repository != null && !StringUtils.isEmpty( repository.getUser()
) )
{
+ hasAuthInfo = true;
cl.createArg().setValue( "--username" );
-
cl.createArg().setValue( repository.getUser() );
}
if ( repository != null && !StringUtils.isEmpty(
repository.getPassword() ) )
{
+ hasAuthInfo = true;
cl.createArg().setValue( "--password" );
-
cl.createArg().setValue( repository.getPassword() );
}
+ // [by Lenik] don't overwrite existing auth cache by default.
+ if ( hasAuthInfo && !SvnUtil.getSettings().isUseAuthCache() )
+ {
+ cl.createArg().setValue( "--no-auth-cache" );
+ }
+
if ( SvnUtil.getSettings().isUseNonInteractive() ) {
cl.createArg().setValue( "--non-interactive" );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java?rev=965281&r1=965280&r2=965281&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
Sun Jul 18 20:25:44 2010
@@ -36,7 +36,7 @@ import java.io.File;
public class SvnExeBranchCommandTckTest
extends SvnBranchCommandTckTest
{
-
+ //--no-auth-cache
public void testBranchUserNameSvnHttpsRemoteBranchingWithRev()
throws Exception
{
