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 21:47:38 UTC
[2/6] git commit: https://jira.codehaus.org/browse/SCM-750: support
TFS checkin-policies
https://jira.codehaus.org/browse/SCM-750: support TFS checkin-policies
https://jira.codehaus.org/browse/SCM-750: support TFS checkin-policies
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/89dbddc1
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/89dbddc1
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/89dbddc1
Branch: refs/heads/master
Commit: 89dbddc1eb836a628c777193df3fad71ad0b5290
Parents: 53e7f3e
Author: OhadR <oh...@gmail.com>
Authored: Mon May 19 18:27:17 2014 +0300
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun May 25 21:32:15 2014 +0200
----------------------------------------------------------------------
.../org/apache/maven/scm/provider/tfs/TfsScmProvider.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/89dbddc1/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 11052cf..554f047 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
@@ -99,6 +99,13 @@ public class TfsScmProvider
int workspacePos = tfsUrl.lastIndexOf( delimiter );
String workspace = tfsUrl.substring( workspacePos + 1 );
tfsUrl = tfsUrl.substring( 0, workspacePos );
+ getLogger().info( "workspace: " + workspace );
+
+ // Look for workspace ater the end of the TFS URL
+ int checkinPoliciesPos = tfsUrl.lastIndexOf( delimiter );
+ String checkinPolicies = tfsUrl.substring( checkinPoliciesPos + 1 );
+ tfsUrl = tfsUrl.substring( 0, checkinPoliciesPos );
+ getLogger().info( "checkinPolicies: " + checkinPolicies );
try
{
@@ -130,7 +137,8 @@ public class TfsScmProvider
password = ( delimPos < 0 ) ? null : usernamePassword.substring( delimPos + 1 );
}
- boolean useCheckinPolicies = false; //ToDo: prase this indicator from the scmUrl
+ boolean useCheckinPolicies = Boolean.parseBoolean(checkinPolicies);
+
return new TfsScmProviderRepository( tfsUrl, username, password, serverPath, workspace,
useCheckinPolicies );
}