You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/05/25 22:32:42 UTC
git commit: [SCM-750] added checkin policy in url format string
Repository: maven-scm
Updated Branches:
refs/heads/master f1b4415b8 -> f493dfdbd
[SCM-750] added checkin policy in url format string
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/f493dfdb
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/f493dfdb
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/f493dfdb
Branch: refs/heads/master
Commit: f493dfdbd35daf2eb0f864afff0c00cc839543c6
Parents: f1b4415
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun May 25 22:32:38 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun May 25 22:32:38 2014 +0200
----------------------------------------------------------------------
.../apache/maven/scm/provider/tfs/TfsScmProvider.java | 11 +++++------
.../maven/scm/provider/tfs/TfsScmProviderRepository.java | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f493dfdb/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
index cfcf3b5..4790fbc 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
@@ -61,8 +61,8 @@ public class TfsScmProvider
extends AbstractScmProvider
{
- public static final String TFS_URL_FORMAT =
- "[[domain\\]username[;password]@]http[s]://server_name[:port]:workspace:$/TeamProject/Path/To/Project";
+ public static final String TFS_URL_FORMAT = "[[domain\\]username[;password]@]http[s]://server_name[:port]"
+ + "[:isCheckinPoliciesEnabled]:workspace:$/TeamProject/Path/To/Project";
// ----------------------------------------------------------------------
// ScmProvider Implementation
@@ -139,8 +139,7 @@ public class TfsScmProvider
boolean useCheckinPolicies = Boolean.parseBoolean( checkinPolicies );
- return new TfsScmProviderRepository( tfsUrl, username, password, serverPath, workspace,
- useCheckinPolicies );
+ return new TfsScmProviderRepository( tfsUrl, username, password, serverPath, workspace, useCheckinPolicies );
}
protected ChangeLogScmResult changelog( ScmProviderRepository repository, ScmFileSet fileSet,
@@ -149,7 +148,7 @@ public class TfsScmProvider
{
TfsChangeLogCommand command = new TfsChangeLogCommand();
command.setLogger( getLogger() );
- return ( ChangeLogScmResult ) command.execute( repository, fileSet, parameters );
+ return (ChangeLogScmResult) command.execute( repository, fileSet, parameters );
}
protected CheckOutScmResult checkout( ScmProviderRepository repository, ScmFileSet fileSet,
@@ -158,7 +157,7 @@ public class TfsScmProvider
{
TfsCheckOutCommand command = new TfsCheckOutCommand();
command.setLogger( getLogger() );
- return ( CheckOutScmResult ) command.execute( repository, fileSet, parameters );
+ return (CheckOutScmResult) command.execute( repository, fileSet, parameters );
}
protected EditScmResult edit( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f493dfdb/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
index d77358b..ecff574 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
@@ -34,7 +34,7 @@ public class TfsScmProviderRepository
private final boolean useCheckinPolicies;
public TfsScmProviderRepository( String tfsUrl, String user, String password, String serverPath, String workspace,
- boolean useCheckinPolicies )
+ boolean useCheckinPolicies )
{
super();
setUser( user );
@@ -76,7 +76,7 @@ public class TfsScmProviderRepository
return userPassword;
}
- public boolean isUseCheckinPolicies()
+ public boolean isUseCheckinPolicies()
{
return useCheckinPolicies;
}