Merge branch 'master' into B1

# Conflicts:
#	README.md
#	build.gradle

Author: host6

.gitignore

@@ -14,4 +14,4 @@ hs_err_pid*
 /gradle
 build
 bin
-/pk-vcs-svn_gradle.launch
+*.iml

README.md

@@ -1,7 +1,7 @@
-[![Release](https://jitpack.io/v/ProjectKaiser/pk-vcs-svn.svg)](https://jitpack.io/#ProjectKaiser/pk-vcs-svn)	
+[![Release](https://jitpack.io/v/scm4j/scm4j-vcs-svn.svg)](https://jitpack.io/#scm4j/scm4j-vcs-svn)	
 
 # Overview
-Pk-vcs-svn is lightweight library for execute basic SVN VCS operations (merge, branch create etc). It uses [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) exposing IVCS implementation for SVN repositories and [SVNKit](https://svnkit.com/) as framework to work with SVN repositories.
+scm4j-vcs-svn is lightweight library for execute basic SVN VCS operations (merge, branch create etc). It uses [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) exposing IVCS implementation for SVN repositories and [SVNKit](https://svnkit.com/) as framework to work with SVN repositories.
 Features:
 - Branch create and remove
 - Branch merge returning result(success or list of conflicted files)
@@ -13,19 +13,18 @@ Features:
 
 # Terms
 - Workspace Home
-  - Home folder of all folders used by vcs-related operations. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+  - Local home folder of all folders used by vcs-related operations. See [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) for details
 - Repository Workspace
-  - Folder for LWC folders related to Repository of one type. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+  - Local folder for LWC folders related to Repository of one type. See [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) for details
 - Locked Working Copy, LWC
-  - Folder where vcs-related operations are executed. Provides thread- and process-safe repository of working folders. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+  - Local folder where vcs-related operations are executed. Provides thread- and process-safe repository of working folders. See [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) for details
 - Test Repository
-  - A SVN repository used for functional testing
-  - Local file system is used, no dedicated server
-  - Creates new before and deletes after each test
+  - A local file-based SVN repository used for functional testing
+  - Creates new before and deletes after each test automatically
   - Named randomly (uuid is used) 
 
-# Using pk-vcs-svn
-- Add github-hosted pk-vcs-svn and pk-vcs-api projects as maven dependencies using [jitpack.io](https://jitpack.io/). As an example, add following to gradle.build file:
+# Using scm4j-vcs-svn
+- Add github-hosted scm4j-vcs-svn project as maven dependency using [jitpack.io](https://jitpack.io/). As an example, add following to gradle.build file:
 	```gradle
 	allprojects {
 		repositories {
@@ -35,36 +34,35 @@ Features:
 
 	dependencies {
 		// versioning: master-SNAPSHOT (lastest build, unstable), + (lastest release, stable) or certain version (e.g. 1.1)
-		compile 'com.github.ProjectKaiser:pk-vcs-svn:1.0'
-		compile 'com.github.ProjectKaiser:pk-vcs-api:1.1'
+		compile 'com.github.scm4j:scm4j-vcs-svn:+'
 	}
 	```
-Or download release jars from https://github.com/ProjectKaiser/pk-vcs-svn/releases, https://github.com/ProjectKaiser/pk-vcs-api/releases
+	Or download release jars from https://github.com/scm4j/scm4j-vcs-svn/releases
 - Create Workspace Home instance providing path to any folder as Workspace Home folder path. This folder will contain repositories folders (if different vcs or repositories are used)
 ```java
-	public static final String WORKSPACE_DIR = System.getProperty("java.io.tmpdir") + "git-workspaces";
+	public static final String WORKSPACE_DIR = System.getProperty("java.io.tmpdir") + "svn-workspaces";
 	...
 	IVCSWorkspace workspace = new VCSWorkspace(WORKSPACE_DIR);
 	...
 ```
 - Obtain Repository Workspace from Workspace Home providing a certain Repository's url. The obtained Repository Workspace will represent a folder within Workspace Home dir which will contain all Working Copies relating to the provided VCS Repository  
 ```java
-	String repoUrl = "https://github.com/ProjectKaiser/pk-vcs-api";
+	String repoUrl = "https://github.com/MyUser/MyRepo";
 	IVCSRepositoryWorkspace repoWorkspace = workspace.getVCSRepositoryWorkspace(repoUrl);
 ```
 - Create `SVNVCS` instance providing Repository Workspace, username and password for Repository
 ```java
 	IVCS vcs = new SVNVCS(repoWorkspace, username, pass);
 ```
-- Use methods of `IVCS` interface. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+- Use methods of `IVCS` interface. See [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) for details
 - Use `vcs.setProxy()` and `vcs.setCredentials()` if necessary
 
 # Implementation details
 - [SVNKit](https://svnkit.com/) is used for manage SVN repositories
 - LWC is obtained automatically when necessary
 
 # Functional testing
-- To execute tests just run SVNVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See  [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) for details
+- To execute tests just run SVNVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See  [scm4j-vcs-test](https://github.com/scm4j/scm4j-vcs-test) for details
 - Or run `gradle test`
 
 # Limitations

build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'eclipse'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-group = 'com.projectkaiser.scm'
+group = 'org.scm4j'
 version = '1.3'
 
 repositories {
@@ -18,11 +18,11 @@ repositories {
 defaultTasks 'build';
 
 dependencies {
-	compile 'com.github.ProjectKaiser:pk-vcs-api:1.2'
+	compile 'com.github.scm4j:scm4j-vcs-api:master-SNAPSHOT'
 	compile 'org.tmatesoft.svnkit:svnkit:1.8.14'
 
 	testCompile 'junit:junit:4.12'
-	testCompile 'com.github.ProjectKaiser:pk-vcs-test:1.2'
+	testCompile 'com.github.scm4j:scm4j-vcs-test:master-SNAPSHOT'
 	testCompile 'org.mockito:mockito-core:2.0.62-beta'
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Fri Apr 07 15:40:18 GMT+03:00 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1 +1 @@
-rootProject.name = 'pk-vcs-svn'
+rootProject.name = 'scm4j-vcs-svn'

settings.gradle

@@ -1,4 +1,4 @@
-package com.projectkaiser.scm.vcs.svn;
+package org.scm4j.vcs.svn;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -50,16 +50,17 @@
 import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
 import org.tmatesoft.svn.core.wc2.SvnTarget;
 
-import com.projectkaiser.scm.vcs.api.IVCS;
-import com.projectkaiser.scm.vcs.api.VCSChangeType;
-import com.projectkaiser.scm.vcs.api.VCSCommit;
-import com.projectkaiser.scm.vcs.api.VCSDiffEntry;
-import com.projectkaiser.scm.vcs.api.VCSMergeResult;
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSBranchExists;
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSException;
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSFileNotFound;
-import com.projectkaiser.scm.vcs.api.workingcopy.IVCSLockedWorkingCopy;
-import com.projectkaiser.scm.vcs.api.workingcopy.IVCSRepositoryWorkspace;
+import org.scm4j.vcs.api.IVCS;
+import org.scm4j.vcs.api.VCSChangeType;
+import org.scm4j.vcs.api.VCSCommit;
+import org.scm4j.vcs.api.VCSDiffEntry;
+import org.scm4j.vcs.api.VCSMergeResult;
+import org.scm4j.vcs.api.exceptions.EVCSBranchExists;
+import org.scm4j.vcs.api.exceptions.EVCSException;
+import org.scm4j.vcs.api.exceptions.EVCSFileNotFound;
+import org.scm4j.vcs.api.workingcopy.IVCSLockedWorkingCopy;
+import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
+import org.scm4j.vcs.api.workingcopy.IVCSWorkspace;
 
 public class SVNVCS implements IVCS {
 
@@ -72,7 +73,7 @@ public class SVNVCS implements IVCS {
 	private SVNClientManager clientManager;
 	private SVNURL trunkSVNUrl;
 	private SVNAuthentication userPassAuth;
-	private IVCSRepositoryWorkspace repo;
+	private final IVCSRepositoryWorkspace repo;
 	private String repoUrl;
 
 	public static final String MASTER_PATH= "trunk/";
@@ -334,8 +335,8 @@ public String getRepoUrl() {
 		return repo.getRepoUrl();
 	}
 
-	private void fillUnifiedDiffs(final String srcBranchName, final String dstBranchName, List<VCSDiffEntry> entries, 
-			IVCSLockedWorkingCopy wc) throws SVNException {
+	private void fillUnifiedDiffs(final String srcBranchName, final String dstBranchName, List<VCSDiffEntry> entries)
+			throws SVNException {
 		for (VCSDiffEntry entry : entries) {
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
@@ -381,8 +382,8 @@ public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
 	}
 
 
-	private List<VCSDiffEntry> getDiffEntries(final String srcBranchName, final String dstBranchName, 
-			final IVCSLockedWorkingCopy wc) throws SVNException {
+	private List<VCSDiffEntry> getDiffEntries(final String srcBranchName, final String dstBranchName)
+			throws SVNException {
 		final SvnOperationFactory svnOperationFactory = new SvnOperationFactory();
 		final SvnDiffSummarize summarizeDiff = svnOperationFactory.createDiffSummarize();
 		final List<VCSDiffEntry> res = new ArrayList<>();
@@ -423,8 +424,8 @@ public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final Stri
 		try {
 			try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
 				checkout(getBranchUrl(dstBranchName), wc.getFolder());
-				List<VCSDiffEntry> entries = getDiffEntries(srcBranchName, dstBranchName, wc);
-				fillUnifiedDiffs(srcBranchName, dstBranchName, entries, wc);
+				List<VCSDiffEntry> entries = getDiffEntries(srcBranchName, dstBranchName);
+				fillUnifiedDiffs(srcBranchName, dstBranchName, entries);
 				return entries;
 			}
 		} catch (SVNException e) {
@@ -545,4 +546,9 @@ public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
 			throw new RuntimeException(e);
 		}
 	}
+
+	@Override
+	public IVCSWorkspace getWorkspace() {
+		return repo.getWorkspace();
+	}
 }

src/main/java/com/projectkaiser/scm/vcs/svn/SVNVCS.java renamed to src/main/java/org/scm4j/vcs/svn/SVNVCS.java

@@ -1,11 +1,12 @@
-package com.projectkaiser.scm.vcs.svn;
+package org.scm4j.vcs.svn;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
 import org.junit.After;
 import org.mockito.Mockito;
+import org.scm4j.vcs.svn.SVNVCS;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
@@ -14,25 +15,24 @@
 import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
 import org.tmatesoft.svn.core.wc.SVNWCClient;
 
-import com.projectkaiser.scm.vcs.api.IVCS;
-import com.projectkaiser.scm.vcs.api.abstracttest.VCSAbstractTest;
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSException;
-import com.projectkaiser.scm.vcs.api.workingcopy.IVCSRepositoryWorkspace;
+import org.scm4j.vcs.api.IVCS;
+import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
+import org.scm4j.vcs.api.exceptions.EVCSException;
+import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 
 public class SVNVCSTest extends VCSAbstractTest {
 
 	private static final String TRUNK_CREATED_COMMIT_MESSAGE = "trunk/ created";
 	private static final String BRANCHES_CREATED_COMMIT_MESSAGE = "branches/ created";
 	private SVNVCS svn;
-	private SVNURL localRepoUrl;
 	private SVNRepository svnRepo;
 	private SVNWCClient mockedSVNRevertClient;
-	private RuntimeException testSvnRevertException = new RuntimeException("test exeption on svn revert");
+	private final RuntimeException testSvnRevertException = new RuntimeException("test exeption on svn revert");
 
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		localRepoUrl = SVNRepositoryFactory.createLocalRepository(new File(repoUrl.replace("file://", "")), true, true);
+		SVNURL localRepoUrl = SVNRepositoryFactory.createLocalRepository(new File(repoUrl.replace("file://", "")), true, true);
 
 		svnRepo = SVNRepositoryFactory.create(localRepoUrl);