Author: oching
Date: Mon Jun 21 08:14:39 2010
New Revision: 956487
URL: http://svn.apache.org/viewvc?rev=956487&view=rev
Log:
[SCM-558] Add support for 'mkdir' command
o add param to specify whether mkdir should be executed in local path or in
repo url
o added tests for mkdir in local path
o execute mkdir tck test from svnexe module
Added:
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/mkdir/SvnExeMkdirCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/AbstractMkdirCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
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/mkdir/SvnMkdirCommand.java
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/mkdir/SvnMkdirConsumer.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/mkdir/SvnMkdirCommandTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
Mon Jun 21 08:14:39 2010
@@ -70,6 +70,8 @@ public class CommandParameter
public static final CommandParameter SCM_TAG_PARAMETERS = new
CommandParameter( "ScmTagParameters" );
public static final CommandParameter SCM_BRANCH_PARAMETERS = new
CommandParameter( "ScmBranchParameters" );
+
+ public static final CommandParameter SCM_MKDIR_CREATE_IN_LOCAL = new
CommandParameter( "createInLocal" );
/**
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/AbstractMkdirCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/AbstractMkdirCommand.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/AbstractMkdirCommand.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/AbstractMkdirCommand.java
Mon Jun 21 08:14:39 2010
@@ -39,12 +39,13 @@ public abstract class AbstractMkdirComma
*
* @param repository
* @param fileSet
+ * @param createInLocal TODO
* @param scmVersion
* @return
* @throws ScmException
*/
protected abstract MkdirScmResult executeMkdirCommand(
ScmProviderRepository repository, ScmFileSet fileSet,
- String message )
+ String message,
boolean createInLocal )
throws ScmException;
/** {...@inheritdoc} */
@@ -57,7 +58,8 @@ public abstract class AbstractMkdirComma
throw new IllegalArgumentException( "fileSet can not be empty" );
}
- return executeMkdirCommand( repository, fileSet, parameters.getString(
CommandParameter.MESSAGE ) );
+ return executeMkdirCommand( repository, fileSet, parameters.getString(
CommandParameter.MESSAGE ),
+ parameters.getBoolean(
CommandParameter.SCM_MKDIR_CREATE_IN_LOCAL ) );
}
}
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
Mon Jun 21 08:14:39 2010
@@ -19,6 +19,8 @@ package org.apache.maven.scm.command.mkd
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.scm.ScmResult;
/**
@@ -31,7 +33,9 @@ public class MkdirScmResult
extends ScmResult
{
private String revision;
-
+
+ private List createdDirs;
+
public MkdirScmResult( ScmResult scmResult )
{
super( scmResult );
@@ -48,6 +52,13 @@ public class MkdirScmResult
this.revision = revision;
}
+
+ public MkdirScmResult( String commandLine, List createdDirs )
+ {
+ this( commandLine, null, null, true );
+
+ this.createdDirs = createdDirs;
+ }
public MkdirScmResult( String revision, ScmResult result )
{
@@ -55,9 +66,21 @@ public class MkdirScmResult
this.revision = revision;
}
+
+ public MkdirScmResult( List createdDirs, ScmResult result )
+ {
+ super( result );
+
+ this.createdDirs = createdDirs;
+ }
public String getRevision()
{
return revision;
}
+
+ public List getCreatedDirs()
+ {
+ return createdDirs;
+ }
}
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
Mon Jun 21 08:14:39 2010
@@ -190,7 +190,7 @@ public abstract class AbstractScmManager
ScmProvider provider = getProviderByType( providerType );
String scmSpecificUrl = cleanScmUrl( scmUrl.substring(
providerType.length() + 5 ) );
-
+
ScmProviderRepository providerRepository =
provider.makeProviderScmRepository( scmSpecificUrl, delimiter );
return new ScmRepository( providerType, providerRepository );
@@ -465,10 +465,10 @@ public abstract class AbstractScmManager
}
/** {...@inheritdoc} */
- public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message )
+ public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message, boolean createInLocal )
throws ScmException
{
- return this.getProviderByRepository( repository ).mkdir( repository,
fileSet, message );
+ return this.getProviderByRepository( repository ).mkdir( repository,
fileSet, message, createInLocal );
}
/** {...@inheritdoc} */
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
Mon Jun 21 08:14:39 2010
@@ -415,10 +415,11 @@ public interface ScmManager
* @param repository
* @param fileSet
* @param message
+ * @param createInLocal
* @return
* @throws ScmException
*/
- MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet, String
message )
+ MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet, String
message, boolean createInLocal )
throws ScmException;
/**
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
Mon Jun 21 08:14:39 2010
@@ -610,7 +610,7 @@ public abstract class AbstractScmProvide
}
/** {...@inheritdoc} */
- public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message )
+ public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message, boolean createInLocal )
throws ScmException
{
login( repository, fileSet );
@@ -618,6 +618,8 @@ public abstract class AbstractScmProvide
CommandParameters parameters = new CommandParameters();
parameters.setString( CommandParameter.MESSAGE, message );
+
+ parameters.setString( CommandParameter.SCM_MKDIR_CREATE_IN_LOCAL,
Boolean.toString( createInLocal ) );
return mkdir( repository.getProviderRepository(), fileSet, parameters
);
}
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
Mon Jun 21 08:14:39 2010
@@ -854,10 +854,11 @@ public interface ScmProvider
*
* @param repository
* @param fileSet
+ * @param createInLocal
* @param messageFile
* @return
* @throws ScmException
*/
- MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet, String
message )
+ MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet, String
message, boolean createInLocal )
throws ScmException;
}
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/mkdir/SvnMkdirCommand.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/mkdir/SvnMkdirCommand.java?rev=956487&r1=956486&r2=956487&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/mkdir/SvnMkdirCommand.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/mkdir/SvnMkdirCommand.java
Mon Jun 21 08:14:39 2010
@@ -48,7 +48,7 @@ public class SvnMkdirCommand
implements SvnCommand
{
/** {...@inheritdoc} */
- protected MkdirScmResult executeMkdirCommand( ScmProviderRepository
repository, ScmFileSet fileSet, String message )
+ protected MkdirScmResult executeMkdirCommand( ScmProviderRepository
repository, ScmFileSet fileSet, String message, boolean createInLocal )
throws ScmException
{
File messageFile = FileUtils.createTempFile( "maven-scm-", ".commit",
null );
@@ -63,12 +63,12 @@ public class SvnMkdirCommand
ex.getMessage(), null, false );
}
- Commandline cl = createCommandLine( (SvnScmProviderRepository)
repository, fileSet, null );
+ Commandline cl = createCommandLine( (SvnScmProviderRepository)
repository, fileSet, messageFile, createInLocal );
- SvnMkdirConsumer consumer = new SvnMkdirConsumer();
+ SvnMkdirConsumer consumer = new SvnMkdirConsumer( getLogger() );
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
-
+
if ( getLogger().isInfoEnabled() )
{
getLogger().info( "Executing: " +
SvnCommandLineUtils.cryptPassword( cl ) );
@@ -102,11 +102,18 @@ public class SvnMkdirCommand
return new MkdirScmResult( cl.toString(), "The svn command
failed.", stderr.getOutput(), false );
}
- return new MkdirScmResult( cl.toString(), Integer.toString(
consumer.getRevision() ) );
+ if( createInLocal )
+ {
+ return new MkdirScmResult( cl.toString(),
consumer.getCreatedDirs() );
+ }
+ else
+ {
+ return new MkdirScmResult( cl.toString(), Integer.toString(
consumer.getRevision() ) );
+ }
}
protected static Commandline createCommandLine( SvnScmProviderRepository
repository, ScmFileSet fileSet,
- File messageFile )
+ File messageFile, boolean
createInLocal )
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(
fileSet.getBasedir(), repository );
@@ -119,7 +126,15 @@ public class SvnMkdirCommand
{
dirPath = StringUtils.replace( dirPath, "\\", "/" );
}
- cl.createArg().setValue( repository.getUrl() + "/" + dirPath );
+
+ if( !createInLocal )
+ {
+ cl.createArg().setValue( repository.getUrl() + "/" + dirPath );
+ }
+ else
+ {
+ cl.createArg().setValue( dirPath );
+ }
if ( messageFile != null )
{
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/mkdir/SvnMkdirConsumer.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/mkdir/SvnMkdirConsumer.java?rev=956487&r1=956486&r2=956487&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/mkdir/SvnMkdirConsumer.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/mkdir/SvnMkdirConsumer.java
Mon Jun 21 08:14:39 2010
@@ -19,6 +19,11 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.codehaus.plexus.util.cli.StreamConsumer;
@@ -34,18 +39,36 @@ public class SvnMkdirConsumer
private static final String COMMITTED_REVISION_TOKEN = "Committed
revision";
private int revision;
-
+
+ private List createdDirs = new ArrayList();
+
+ public SvnMkdirConsumer( ScmLogger logger )
+ {
+ this.logger = logger;
+ }
+
/** {...@inheritdoc} */
public void consumeLine( String line )
{
+ String statusString = line.substring( 0, 1 );
+ ScmFileStatus status;
+
if ( line.startsWith( COMMITTED_REVISION_TOKEN ) )
{
String revisionString = line.substring(
COMMITTED_REVISION_TOKEN.length() + 1, line.length() - 1 );
revision = Integer.parseInt( revisionString );
-
+
return;
}
+ else if( statusString.equals( "A" ) )
+ {
+ String file = line.substring( 3 );
+
+ status = ScmFileStatus.ADDED;
+
+ createdDirs.add( new ScmFile( file, status ) );
+ }
else
{
if ( logger.isInfoEnabled() )
@@ -61,4 +84,9 @@ public class SvnMkdirConsumer
{
return revision;
}
+
+ public List getCreatedDirs()
+ {
+ return createdDirs;
+ }
}
Added:
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/mkdir/SvnExeMkdirCommandTckTest.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/mkdir/SvnExeMkdirCommandTckTest.java?rev=956487&view=auto
==============================================================================
---
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/mkdir/SvnExeMkdirCommandTckTest.java
(added)
+++
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/mkdir/SvnExeMkdirCommandTckTest.java
Mon Jun 21 08:14:39 2010
@@ -0,0 +1,31 @@
+package org.apache.maven.scm.provider.svn.svnexe.command.mkdir;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.scm.provider.svn.command.mkdir.SvnMkdirCommandTckTest;
+
+/**
+ * @author <a href="mailto:och...@apache.org";>Maria Odea Ching</a>
+ * @version $Id$
+ */
+public class SvnExeMkdirCommandTckTest
+ extends SvnMkdirCommandTckTest
+{
+}
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/mkdir/SvnMkdirCommandTest.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/mkdir/SvnMkdirCommandTest.java?rev=956487&r1=956486&r2=956487&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/mkdir/SvnMkdirCommandTest.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/mkdir/SvnMkdirCommandTest.java
Mon Jun 21 08:14:39 2010
@@ -53,33 +53,47 @@ public class SvnMkdirCommandTest
messageFileString = "--file " + path;
}
- public void testCommandLine()
+ public void testCommandLineMkdirUrl()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";,
- "svn --non-interactive mkdir
http://foo.com/svn/trunk/missing/dir " + messageFileString );
+ "svn --non-interactive mkdir
http://foo.com/svn/trunk/missing " + messageFileString, false );
}
- public void testCommandLineWithUsername()
+ public void testCommandLineMkdirUrlWithUsername()
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";,
- "svn --username anonymous --non-interactive mkdir
http://foo.com/svn/trunk/missing/dir " +
- messageFileString );
+ "svn --username anonymous --non-interactive mkdir
http://foo.com/svn/trunk/missing " +
+ messageFileString, false );
}
- private void testCommandLine( String scmUrl, String commandLine )
+ public void testCommandLineMkdirLocalPath()
+ throws Exception
+ {
+ testCommandLine( "scm:svn:http://foo.com/svn/trunk";, "svn
--non-interactive mkdir missing " +
+ messageFileString, true );
+ }
+
+ public void testCommandLineMkdirLocalPathWithUsername()
+ throws Exception
+ {
+ testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";,
+ "svn --username anonymous --non-interactive mkdir
missing " + messageFileString, true );
+ }
+
+ private void testCommandLine( String scmUrl, String commandLine, boolean
createInLocal )
throws Exception
{
File workingDirectory = getTestFile( "target/svn-mkdir-command-test" );
- ScmFileSet fileSet = new ScmFileSet( workingDirectory, new File(
"missing/dir" ) );
+ ScmFileSet fileSet = new ScmFileSet( workingDirectory, new File(
"missing" ) );
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
SvnScmProviderRepository svnRepository = (SvnScmProviderRepository)
repository.getProviderRepository();
- Commandline cl = SvnMkdirCommand.createCommandLine( svnRepository,
fileSet, messageFile );
+ Commandline cl = SvnMkdirCommand.createCommandLine( svnRepository,
fileSet, messageFile, createInLocal );
assertCommandLine( commandLine, workingDirectory, cl );
}
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
Mon Jun 21 08:14:39 2010
@@ -452,9 +452,9 @@ public class ScmManagerStub
}
/** {...@inheritdoc} */
- public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message )
+ public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message, boolean createInLocal )
throws ScmException
{
- return this.getProviderByRepository( repository ).mkdir( repository,
fileSet, message );
+ return this.getProviderByRepository( repository ).mkdir( repository,
fileSet, message, createInLocal );
}
}
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
Mon Jun 21 08:14:39 2010
@@ -731,7 +731,7 @@ public class ScmProviderStub
}
/** {...@inheritdoc} */
- public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message )
+ public MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet,
String message, boolean createInLocal )
throws ScmException
{
return getMkdirScmResult();
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java?rev=956487&r1=956486&r2=956487&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java
Mon Jun 21 08:14:39 2010
@@ -38,9 +38,9 @@ public abstract class MkdirCommandTckTes
public void testMkdirCommand()
throws Exception
{
- ScmFileSet fileSet = new ScmFileSet( getWorkingCopy(), new File(
"missing/dir" ) );
+ ScmFileSet fileSet = new ScmFileSet( getWorkingCopy(), new File(
"missing" ) );
- MkdirScmResult result = getScmManager().mkdir( getScmRepository(),
fileSet, "Mkdir message" );
+ MkdirScmResult result = getScmManager().mkdir( getScmRepository(),
fileSet, "Mkdir message", false );
assertResultIsSuccess( result );
