From f7e8c09cc2dda61417b844b4a5ef518f4b0bfe4c Mon Sep 17 00:00:00 2001
From: Igor Vinokur <ivinokur@codenvy.com>
Date: Wed, 27 Apr 2016 12:43:44 +0300
Subject: [PATCH] CHE-1070: Decouple server and shared part of che-core-api-git

---
 core/ide/che-core-ide-app/pom.xml             |  2 +-
 .../che-core-client-gwt-git/pom.xml           |  4 +-
 .../plugin-git/che-plugin-git-ext-git/pom.xml |  2 +-
 .../che-plugin-git-provider-che/pom.xml       |  4 ++
 .../che-plugin-github-provider-github/pom.xml |  4 ++
 pom.xml                                       |  5 +++
 wsagent/che-core-api-git-shared/pom.xml       | 45 +++++++++++++++++++
 .../che/api/git/shared/AddRequest.java        |  2 +-
 .../eclipse/che/api/git/shared/Branch.java    |  0
 .../api/git/shared/BranchCreateRequest.java   |  0
 .../api/git/shared/BranchDeleteRequest.java   |  0
 .../che/api/git/shared/BranchListRequest.java |  0
 .../che/api/git/shared/CheckoutRequest.java   |  0
 .../che/api/git/shared/CloneRequest.java      |  0
 .../che/api/git/shared/CommitRequest.java     |  0
 .../eclipse/che/api/git/shared/Commiters.java |  0
 .../che/api/git/shared/ConfigRequest.java     |  0
 .../che/api/git/shared/DiffRequest.java       |  0
 .../che/api/git/shared/FetchRequest.java      |  0
 .../che/api/git/shared/GitCheckoutEvent.java  |  0
 .../che/api/git/shared/GitRequest.java        |  0
 .../che/api/git/shared/GitUrlVendorInfo.java  |  0
 .../eclipse/che/api/git/shared/GitUser.java   |  0
 .../eclipse/che/api/git/shared/IndexFile.java |  0
 .../che/api/git/shared/InitRequest.java       |  0
 .../org/eclipse/che/api/git/shared/Log.java   |  0
 .../che/api/git/shared/LogRequest.java        |  0
 .../che/api/git/shared/LogResponse.java       |  0
 .../che/api/git/shared/LsFilesRequest.java    |  0
 .../che/api/git/shared/LsRemoteRequest.java   |  0
 .../che/api/git/shared/MergeRequest.java      |  0
 .../che/api/git/shared/MergeResult.java       |  0
 .../che/api/git/shared/MoveRequest.java       |  0
 .../che/api/git/shared/ProviderInfo.java      |  0
 .../che/api/git/shared/PullRequest.java       |  0
 .../che/api/git/shared/PullResponse.java      |  0
 .../che/api/git/shared/PushRequest.java       |  0
 .../che/api/git/shared/PushResponse.java      |  0
 .../che/api/git/shared/RebaseRequest.java     |  0
 .../che/api/git/shared/RebaseResponse.java    |  0
 .../eclipse/che/api/git/shared/Remote.java    |  0
 .../che/api/git/shared/RemoteAddRequest.java  |  0
 .../che/api/git/shared/RemoteListRequest.java |  0
 .../che/api/git/shared/RemoteReference.java   |  0
 .../api/git/shared/RemoteUpdateRequest.java   |  0
 .../eclipse/che/api/git/shared/RepoInfo.java  |  0
 .../che/api/git/shared/ResetRequest.java      |  0
 .../eclipse/che/api/git/shared/Revision.java  |  0
 .../eclipse/che/api/git/shared/RmRequest.java |  0
 .../git/shared/ShowFileContentRequest.java    |  0
 .../git/shared/ShowFileContentResponse.java   |  0
 .../eclipse/che/api/git/shared/Status.java    |  0
 .../che/api/git/shared/StatusFormat.java      |  0
 .../org/eclipse/che/api/git/shared/Tag.java   |  0
 .../che/api/git/shared/TagCreateRequest.java  |  0
 .../che/api/git/shared/TagDeleteRequest.java  |  0
 .../che/api/git/shared/TagListRequest.java    |  0
 wsagent/che-core-api-git/pom.xml              | 10 ++---
 wsagent/che-core-git-impl-native/pom.xml      |  8 ++--
 wsagent/pom.xml                               |  1 +
 60 files changed, 73 insertions(+), 14 deletions(-)
 create mode 100644 wsagent/che-core-api-git-shared/pom.xml
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/AddRequest.java (99%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/Branch.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/BranchCreateRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/BranchDeleteRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/BranchListRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/CheckoutRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/CloneRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/CommitRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/Commiters.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/ConfigRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/DiffRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/FetchRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/GitCheckoutEvent.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/GitRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/GitUrlVendorInfo.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/GitUser.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/IndexFile.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/InitRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/Log.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/LogRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/LogResponse.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/LsFilesRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/LsRemoteRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/MergeRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/MergeResult.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/MoveRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/ProviderInfo.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/PullRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/PullResponse.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/PushRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/PushResponse.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RebaseRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RebaseResponse.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/Remote.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RemoteAddRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RemoteListRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RemoteReference.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RemoteUpdateRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RepoInfo.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/ResetRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/Revision.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/RmRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentResponse.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/Status.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/StatusFormat.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/Tag.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/TagCreateRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/TagDeleteRequest.java (100%)
 rename wsagent/{che-core-api-git => che-core-api-git-shared}/src/main/java/org/eclipse/che/api/git/shared/TagListRequest.java (100%)

diff --git a/core/ide/che-core-ide-app/pom.xml b/core/ide/che-core-ide-app/pom.xml
index ddc45cf95c..7db60db5e3 100644
--- a/core/ide/che-core-ide-app/pom.xml
+++ b/core/ide/che-core-ide-app/pom.xml
@@ -69,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-git</artifactId>
+            <artifactId>che-core-api-git-shared</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
diff --git a/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml
index 749545ecad..a6fd5b78fd 100644
--- a/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml
+++ b/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-git</artifactId>
+            <artifactId>che-core-api-git-shared</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
@@ -95,7 +95,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.eclipse.che.core</groupId>
-                        <artifactId>che-core-api-git</artifactId>
+                        <artifactId>che-core-api-git-shared</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                     <dependency>
diff --git a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
index e742b9a43e..6bee15dcde 100644
--- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
+++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-git</artifactId>
+            <artifactId>che-core-api-git-shared</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
diff --git a/plugins/plugin-git/che-plugin-git-provider-che/pom.xml b/plugins/plugin-git/che-plugin-git-provider-che/pom.xml
index 74f325009d..ce9b6003cd 100644
--- a/plugins/plugin-git/che-plugin-git-provider-che/pom.xml
+++ b/plugins/plugin-git/che-plugin-git-provider-che/pom.xml
@@ -37,6 +37,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-git</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-env</artifactId>
diff --git a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml
index c643c4e220..24c7e874c7 100644
--- a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml
@@ -45,6 +45,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-git</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-env</artifactId>
diff --git a/pom.xml b/pom.xml
index cee2287e47..0e218dfabc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,11 @@
                 <version>${project.version}</version>
                 <classifier>tests</classifier>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-git-shared</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-infrastructure-local</artifactId>
diff --git a/wsagent/che-core-api-git-shared/pom.xml b/wsagent/che-core-api-git-shared/pom.xml
new file mode 100644
index 0000000000..eb75adf7ca
--- /dev/null
+++ b/wsagent/che-core-api-git-shared/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2016 Codenvy, S.A.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Codenvy, S.A. - initial API and implementation
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>che-agent-parent</artifactId>
+        <groupId>org.eclipse.che.core</groupId>
+        <version>4.3.0-RC1-SNAPSHOT</version>
+    </parent>
+    <artifactId>che-core-api-git-shared</artifactId>
+    <packaging>jar</packaging>
+    <name>Che Core :: API :: Git :: Shared</name>
+    <dependencies>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-dto</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+        </resources>
+    </build>
+</project>
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/AddRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/AddRequest.java
similarity index 99%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/AddRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/AddRequest.java
index 228e8b6591..b838a9a212 100644
--- a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/AddRequest.java
+++ b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/AddRequest.java
@@ -44,4 +44,4 @@ public interface AddRequest extends GitRequest {
     void setUpdate(boolean isUpdate);
     
     AddRequest withUpdate(boolean isUpdate);
-}
\ No newline at end of file
+}
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Branch.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Branch.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Branch.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Branch.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/BranchCreateRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchCreateRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/BranchCreateRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchCreateRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/BranchDeleteRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchDeleteRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/BranchDeleteRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchDeleteRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/BranchListRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchListRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/BranchListRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchListRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/CheckoutRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/CheckoutRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/CheckoutRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/CheckoutRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/CloneRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/CloneRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/CloneRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/CloneRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/CommitRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/CommitRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/CommitRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/CommitRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Commiters.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Commiters.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Commiters.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Commiters.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ConfigRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ConfigRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ConfigRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ConfigRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/DiffRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/DiffRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/DiffRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/DiffRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/FetchRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/FetchRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/FetchRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/FetchRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitCheckoutEvent.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitCheckoutEvent.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitCheckoutEvent.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitCheckoutEvent.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitUrlVendorInfo.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitUrlVendorInfo.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitUrlVendorInfo.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitUrlVendorInfo.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitUser.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitUser.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/GitUser.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/GitUser.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/IndexFile.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/IndexFile.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/IndexFile.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/IndexFile.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/InitRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/InitRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/InitRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/InitRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Log.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Log.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Log.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Log.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LogRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LogRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LogRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LogRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LogResponse.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LogResponse.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LogResponse.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LogResponse.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LsFilesRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LsFilesRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LsFilesRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LsFilesRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LsRemoteRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LsRemoteRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/LsRemoteRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/LsRemoteRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/MergeRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/MergeRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/MergeRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/MergeRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/MergeResult.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/MergeResult.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/MergeResult.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/MergeResult.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/MoveRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/MoveRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/MoveRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/MoveRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ProviderInfo.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ProviderInfo.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ProviderInfo.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ProviderInfo.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PullRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PullRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PullRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PullRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PullResponse.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PullResponse.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PullResponse.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PullResponse.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PushRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PushRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PushRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PushRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PushResponse.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PushResponse.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/PushResponse.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/PushResponse.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RebaseRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RebaseRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RebaseRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RebaseRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RebaseResponse.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RebaseResponse.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RebaseResponse.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RebaseResponse.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Remote.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Remote.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Remote.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Remote.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteAddRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteAddRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteAddRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteAddRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteListRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteListRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteListRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteListRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteReference.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteReference.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteReference.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteReference.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteUpdateRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteUpdateRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RemoteUpdateRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RemoteUpdateRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RepoInfo.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RepoInfo.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RepoInfo.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RepoInfo.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ResetRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ResetRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ResetRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ResetRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Revision.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Revision.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Revision.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Revision.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RmRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RmRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/RmRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/RmRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentResponse.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentResponse.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentResponse.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/ShowFileContentResponse.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Status.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Status.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Status.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Status.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/StatusFormat.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/StatusFormat.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/StatusFormat.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/StatusFormat.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Tag.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Tag.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/Tag.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/Tag.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/TagCreateRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/TagCreateRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/TagCreateRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/TagCreateRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/TagDeleteRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/TagDeleteRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/TagDeleteRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/TagDeleteRequest.java
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/TagListRequest.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/TagListRequest.java
similarity index 100%
rename from wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/shared/TagListRequest.java
rename to wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/TagListRequest.java
diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml
index 3cc1fc0b64..983ab02523 100644
--- a/wsagent/che-core-api-git/pom.xml
+++ b/wsagent/che-core-api-git/pom.xml
@@ -46,10 +46,6 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
@@ -62,6 +58,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-dto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
@@ -224,7 +224,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.eclipse.che.core</groupId>
-                        <artifactId>che-core-api-git</artifactId>
+                        <artifactId>che-core-api-git-shared</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                 </dependencies>
diff --git a/wsagent/che-core-git-impl-native/pom.xml b/wsagent/che-core-git-impl-native/pom.xml
index d2061f727f..e1db7ce03d 100644
--- a/wsagent/che-core-git-impl-native/pom.xml
+++ b/wsagent/che-core-git-impl-native/pom.xml
@@ -54,10 +54,6 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
@@ -74,6 +70,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-git</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
diff --git a/wsagent/pom.xml b/wsagent/pom.xml
index 7dd1327c05..04403477e2 100644
--- a/wsagent/pom.xml
+++ b/wsagent/pom.xml
@@ -27,6 +27,7 @@
     <modules>
         <module>che-core-api-project</module>
         <module>che-core-api-git</module>
+        <module>che-core-api-git-shared</module>
         <module>che-core-git-impl-native</module>
     </modules>
 </project>