Merge branch 'master' into B1

# Conflicts:
#	build.gradle

Author: host6

README.md

@@ -1,10 +1,10 @@
-[![Release](https://jitpack.io/v/ProjectKaiser/pk-vcs-api.svg)](https://jitpack.io/#ProjectKaiser/pk-vcs-api)	
+[![Release](https://jitpack.io/v/scm4j/scm4j-vcs-api.svg)](https://jitpack.io/#scm4j/scm4j-vcs-api)	
 
 # Overview
-Pk-vcs-api is set of base classes and interfaces to build VCS support (Git, SVN, etc) libraries which exposes basic vcs-related operations: merge, branch create etc. Pk-vcs-api consists of:
-Pk-vcs-api provides:
+scm4j-vcs-api is set of base classes and interfaces to build VCS support (Git, SVN, etc) libraries which exposes basic vcs-related operations: merge, branch create etc.
+scm4j-vcs-api provides:
 - A simple interface to implement basic VCS-related operations
-- Set of functional tests which are common to each VCS implementation. Functional tests for a certain VCS implementation are done by implementing few abstract methods of base test class. Implemented in [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test)
+- Set of functional tests which are common to each VCS implementation. Functional tests for a certain VCS implementation are done by implementing few abstract methods of base test class. Implemented in [scm4j-vcs-test](https://github.com/scm4j/scm4j-vcs-test)
 - Working copy management for operations which must be executed on local file system
 
 # Terms
@@ -19,15 +19,15 @@ Pk-vcs-api provides:
 - Locked Working Copy, LWC
 	- A separate folder used to execute VCS-related operations which are need to be executed on a local file system. E.g. in Git it is need to make checkout somewhere on local file system before making a merge.
 	- Named automatically as uuid, located within Repository Workspace folder
-	- Can be reused for another vcs-related operation automatically. I.e. checkouted once, then switches between branches.
+	- Can be reused for another vcs-related operation automatically. I.e. checked out once, then switches between branches.
 	- Deletes automatically if last VCS-related operation left the Working Copy in corrupted state, i.e. can not be reverted, re-checked out and so on
 - Lock File
 	- A special empty file which is used to show if according LWC locked or free. If a Lock File has exclusive file system lock then the according LWC folder is considered as locked, otherwise as free
 	- Lock way: `new FileOutputStream(lockFile, false).getChannel.lock()`
 	- named as "lock_" + <LWC folder name>
 - Abstract Test
 	- Base functional tests of VCS-related functions which are exposed by IVCS. To implement functional test for a certain IVCS implementation (Git, SVN, etc) just implement VCSAbstractTest subclass
-	- Implemented as [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) separate project
+	- Implemented as [scm4j-vcs-test](https://github.com/scm4j/scm4j-vcs-test) separate project
 - `VCSMergeResult`, Merge Result
 	- Result of vcs merge operation. Could be successful or failed. Provides list of conflicting files if failed.
 - `VCSDiffEntry`, Diff Entry
@@ -82,6 +82,8 @@ Note: null passed as a branch name is considered as Master Branch. Any non-null
 	- Returns commit id (hash, revision number etc)
 - `List<VCSCommit> getCommitsRange(String branchName, String afterCommitId, String untilCommitId);`
 	- Returns ordered list of all commits located between commits specified by `aftercommitId` and `untilCommitId` within branch `branchName` 
+	- If `aftercommitId` is null then all commits until commit specified by `untilCommitId` are fetched 
+	- If `untilCommitId` is null then all commits after commit specified by `afterCommitId` are fetched  
 
 # Using Locked Working Copy
 Let's assume we developing a multiuser server which has ability to merge branches of user's repositories. So few users could request to merge theirs branches of different repositories simultaneously. For example, Git merge operation consists of few underlying operations (check in\out, merge itself, push) which must be executed on a local file system in a certain folder. So we have following requirements:
@@ -94,14 +96,14 @@ Locked Working Copy is a solution which solves these requirements by providing a
 LWC usage scenario:
 - 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") + "pk-vcs-workspaces";
+	public static final String WORKSPACE_DIR = System.getProperty("java.io.tmpdir") + "scm4j-vcs-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/scm4j/scm4j-vcs-api";
 	IVCSRepositoryWorkspace repoWorkspace = workspace.getVCSRepositoryWorkspace(repoUrl);
 ```
 - Obtain Locked Working Copy from Repository Workspace when necessary. The obtained LWC will represent a locked folder within Workspace Repository. The folder is protected from simultaneously execute different vcs-related operations by another thread or even process. Use try-with-resources or try...finally to release Working Copy after vcs-related operations will be completed
@@ -120,8 +122,8 @@ LWC usage scenario:
 - If a Working copy can not be reused due of VCS system data damage (e.g. .git, .svn folders) or due of vcs Working Copy can not be cleaned, reverted, switched, checked out etc, execute `IVCSLockedWorkingCopy.setCorrupted(true)`. LWC folder will be deleted on close.
 
 # Folder structure
-- Workspace Home folder (e.g. c:\temp\pk-vcs-workspces\)
-	- Repository Workspace 2 (e.g. <Workspace Home>\https_github_com_projectkaiser\
+- Workspace Home folder (e.g. c:\temp\scm4j-vcs-workspces\)
+	- Repository Workspace 2 (e.g. <Workspace Home>\https_github_com_scm4j\
 		- Working Copy 1 
 			- Branch1 is checked out, merging executes
 		- Working Copy 2
@@ -138,7 +140,7 @@ So actually a Lock File is locked, not the LWC folder itself.
 Lock way: `new FileOutputStream(lockFile, false).getChannel.lock()`
 
 # Developing IVCS implementation
-- Add github-hosted VCS API as maven artifact using [jitpack.io](https://jitpack.io/). As an example, add following to gradle.build file:
+- Add github-hosted scm4j-vcs-api and scm4j-vcs-test projects as maven artifacts using [jitpack.io](https://jitpack.io/). As an example, add following to gradle.build file:
 	```gradle
 	allprojects {
 		repositories {
@@ -148,12 +150,12 @@ Lock way: `new FileOutputStream(lockFile, false).getChannel.lock()`
 
 	dependencies {
 		// versioning: master-SNAPSHOT (lastest build, unstable), + (lastest release, stable) or certain version (e.g. 1.0)
-		compile 'com.github.ProjectKaiser:pk-vcs-api:+'
-		testCompile 'com.github.ProjectKaiser:pk-vcs-test:+'
+		compile 'com.github.scm4j:scm4j-vcs-api:+'
+		testCompile 'com.github.scm4j:scm4j-vcs-test:+'
 	}
 	```
 	This will include VCS API (IVCS, LWC) and Abstract Test to your project.
-	Also you can download release jars from https://github.com/ProjectKaiser/pk-vcs-api/releases, https://github.com/ProjectKaiser/pk-vcs-test/releases
+	Also you can download release jars from https://github.com/scm4j/scm4j-vcs-api/releases, https://github.com/scm4j/scm4j-vcs-test/releases
 - Implement IVCS interface
 	- IVCS implementation should be separate object which normally holds all VCS-related data within
 	- Normally IVCSRepositoryWorkspace instance is passed to constructor and stored within IVCS implementation. 
@@ -181,11 +183,11 @@ Lock way: `new FileOutputStream(lockFile, false).getChannel.lock()`
 		// ...
 	} 
 	```	
-	- Throw exceptions from exceptions package. Abstract Test checks throwning of these exceptions.
+	- Throw exceptions from scm4j.vcs.api.exceptions package. Abstract Test checks throwning of these exceptions.
 - Implement functional tests
 	- Create VCSAbstractTest subclass within test package, implement all abstract methods
 	- Normally test class should not include any test, just @After\@Before methods. All necessary functional testing is implemented within VCSAbstractTest
-	- See [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) for details
+	- See [scm4j-vcs-test](https://github.com/scm4j/scm4j-vcs-test) for details
 - Example of gradle usage to export IVCS implementation, its sources and javadoc as separate single JARs:
 ```gradle
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -206,6 +208,6 @@ artifacts {
 After that the `gralde build` command will produce 3 JARs.
 
 # See also
-- [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test)
-- [pk-vcs-git](https://github.com/ProjectKaiser/pk-vcs-git)
-- [pk-vcs-svn](https://github.com/ProjectKaiser/pk-vcs-svn)
+- [scm4j-vcs-test](https://github.com/scm4j/scm4j-vcs-test)
+- [scm4j-vcs-git](https://github.com/scm4j/scm4j-vcs-git)
+- [scm4j-vcs-svn](https://github.com/scm4j/scm4j-vcs-svn)

build.gradle

@@ -4,18 +4,18 @@ apply plugin: 'maven'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-group = 'com.projectkaiser.scm'
+group = 'org.scm4j'
 version = '1.3'
 
 repositories {
 	mavenCentral()
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.0.62-beta'
-    
-    compile 'commons-io:commons-io:2.4'
+	testCompile 'junit:junit:4.12'
+	testCompile 'org.mockito:mockito-core:2.0.62-beta'
+	
+	compile 'commons-io:commons-io:[0,)'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip

settings.gradle

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

…/com/projectkaiser/scm/vcs/api/IVCS.java src/main/java/org/scm4j/vcs/api/IVCS.javasrc/main/java/com/projectkaiser/scm/vcs/api/IVCS.java renamed to src/main/java/org/scm4j/vcs/api/IVCS.java src/main/java/com/projectkaiser/scm/vcs/api/IVCS.java renamed to src/main/java/org/scm4j/vcs/api/IVCS.java

@@ -1,9 +1,10 @@
-package com.projectkaiser.scm.vcs.api;
+package org.scm4j.vcs.api;
 
 import java.util.List;
 import java.util.Set;
 
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSFileNotFound;
+import org.scm4j.vcs.api.exceptions.EVCSFileNotFound;
+import org.scm4j.vcs.api.workingcopy.IVCSWorkspace;
 
 public interface IVCS {
 	void createBranch(String srcBranchName, String dstBranchName, String commitMessage);
@@ -35,4 +36,6 @@ public interface IVCS {
 	String removeFile(String branchName, String filePath, String commitMessage);
 
 	List<VCSCommit> getCommitsRange(String branchName, String afterCommitId, String untilCommitId);
+	
+	IVCSWorkspace getWorkspace(); 
 }

…ectkaiser/scm/vcs/api/VCSChangeType.java …ava/org/scm4j/vcs/api/VCSChangeType.javasrc/main/java/com/projectkaiser/scm/vcs/api/VCSChangeType.java renamed to src/main/java/org/scm4j/vcs/api/VCSChangeType.java src/main/java/com/projectkaiser/scm/vcs/api/VCSChangeType.java renamed to src/main/java/org/scm4j/vcs/api/VCSChangeType.java

@@ -1,4 +1,4 @@
-package com.projectkaiser.scm.vcs.api;
+package org.scm4j.vcs.api;
 
 public enum VCSChangeType {
 

…projectkaiser/scm/vcs/api/VCSCommit.java …in/java/org/scm4j/vcs/api/VCSCommit.javasrc/main/java/com/projectkaiser/scm/vcs/api/VCSCommit.java renamed to src/main/java/org/scm4j/vcs/api/VCSCommit.java src/main/java/com/projectkaiser/scm/vcs/api/VCSCommit.java renamed to src/main/java/org/scm4j/vcs/api/VCSCommit.java

@@ -1,9 +1,9 @@
-package com.projectkaiser.scm.vcs.api;
+package org.scm4j.vcs.api;
 
 public class VCSCommit {
-	private String id;
-	private String logMessage;
-	private String author;
+	private final String id;
+	private final String logMessage;
+	private final String author;
 
 	public String getAuthor() {
 		return author;

…jectkaiser/scm/vcs/api/VCSDiffEntry.java …java/org/scm4j/vcs/api/VCSDiffEntry.javasrc/main/java/com/projectkaiser/scm/vcs/api/VCSDiffEntry.java renamed to src/main/java/org/scm4j/vcs/api/VCSDiffEntry.java src/main/java/com/projectkaiser/scm/vcs/api/VCSDiffEntry.java renamed to src/main/java/org/scm4j/vcs/api/VCSDiffEntry.java

@@ -1,4 +1,4 @@
-package com.projectkaiser.scm.vcs.api;
+package org.scm4j.vcs.api;
 
 public class VCSDiffEntry {
 

…ctkaiser/scm/vcs/api/VCSMergeResult.java …va/org/scm4j/vcs/api/VCSMergeResult.javasrc/main/java/com/projectkaiser/scm/vcs/api/VCSMergeResult.java renamed to src/main/java/org/scm4j/vcs/api/VCSMergeResult.java src/main/java/com/projectkaiser/scm/vcs/api/VCSMergeResult.java renamed to src/main/java/org/scm4j/vcs/api/VCSMergeResult.java

@@ -1,12 +1,12 @@
-package com.projectkaiser.scm.vcs.api;
+package org.scm4j.vcs.api;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class VCSMergeResult {
 
 	private Boolean success;
-	private List<String> conflictingFiles = new ArrayList<String>();
+	private List<String> conflictingFiles = new ArrayList<>();
 
 	public Boolean getSuccess() {
 		return success;

…vcs/api/exceptions/EVCSBranchExists.java …vcs/api/exceptions/EVCSBranchExists.javasrc/main/java/com/projectkaiser/scm/vcs/api/exceptions/EVCSBranchExists.java renamed to src/main/java/org/scm4j/vcs/api/exceptions/EVCSBranchExists.java src/main/java/com/projectkaiser/scm/vcs/api/exceptions/EVCSBranchExists.java renamed to src/main/java/org/scm4j/vcs/api/exceptions/EVCSBranchExists.java

@@ -1,4 +1,4 @@
-package com.projectkaiser.scm.vcs.api.exceptions;
+package org.scm4j.vcs.api.exceptions;
 
 public class EVCSBranchExists extends EVCSException {