From 7798be0131a844b9abf056b7db8ba457bae82ffa Mon Sep 17 00:00:00 2001
From: Roman Iuvshin <riuvshin@codenvy.com>
Date: Wed, 20 Jul 2016 14:56:55 +0300
Subject: [PATCH 01/16] Fix path to the assemble in Dockerfile

---
 dockerfiles/che-server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfiles/che-server/Dockerfile b/dockerfiles/che-server/Dockerfile
index e281cab59c8..7c577e4ff84 100644
--- a/dockerfiles/che-server/Dockerfile
+++ b/dockerfiles/che-server/Dockerfile
@@ -40,7 +40,7 @@ EXPOSE 8000 8080
 
 USER user
 
-ADD assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/
+ADD ../../assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/
 
 ENV CHE_HOME /home/user/che
 

From 586a4d6b45944f7720123ff7e390ae23dfc90d43 Mon Sep 17 00:00:00 2001
From: Roman Iuvshin <riuvshin@codenvy.com>
Date: Wed, 20 Jul 2016 15:18:57 +0300
Subject: [PATCH 02/16] Revert "Fix path to the assemble in Dockerfile"

This reverts commit 7798be0131a844b9abf056b7db8ba457bae82ffa.
---
 dockerfiles/che-server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfiles/che-server/Dockerfile b/dockerfiles/che-server/Dockerfile
index 7c577e4ff84..e281cab59c8 100644
--- a/dockerfiles/che-server/Dockerfile
+++ b/dockerfiles/che-server/Dockerfile
@@ -40,7 +40,7 @@ EXPOSE 8000 8080
 
 USER user
 
-ADD ../../assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/
+ADD assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/
 
 ENV CHE_HOME /home/user/che
 

From 7a1c842ec006bc2f2ed6cb66444231531dc7442e Mon Sep 17 00:00:00 2001
From: Vitalii Parfonov <vparfonov@codenvy.com>
Date: Wed, 20 Jul 2016 15:26:25 +0300
Subject: [PATCH 03/16] [Issue #1413] register multiple callbacks (fixes #1413)
 (#1873)

Signed-off-by: Sven Efftinge <sven.efftinge@typefox.io>
---
 .../api/machine/WsAgentStateController.java   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java
index 7bfb2aae189..dd1e4427fbd 100644
--- a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java
+++ b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java
@@ -41,6 +41,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.collect.Lists.newArrayList;
 import static org.eclipse.che.ide.api.machine.WsAgentState.STARTED;
 import static org.eclipse.che.ide.api.machine.WsAgentState.STOPPED;
 import static org.eclipse.che.ide.ui.loaders.initialization.InitialLoadingInfo.Operations.WS_AGENT_BOOTING;
@@ -66,8 +67,8 @@ public class WsAgentStateController implements ConnectionOpenedHandler, Connecti
 
     private MessageBus                messageBus;
     private WsAgentState              state;
-    private AsyncCallback<MessageBus> messageBusCallback;
-    private AsyncCallback<DevMachine> devMachineCallback;
+    private List<AsyncCallback<MessageBus>> messageBusCallbacks = newArrayList();
+    private List<AsyncCallback<DevMachine>> devMachineCallbacks = newArrayList();
 
     @Inject
     public WsAgentStateController(EventBus eventBus,
@@ -111,7 +112,6 @@ public void onError() {
     @Override
     public void onOpen() {
         messageBus.removeOnOpenHandler(this);
-        MessageBus.ReadyState readyState = messageBus.getReadyState();
         //need to make sure ready state equals 1 (OPEN) in same situations after opening it still equals 0 (CONNECTING)
         new Timer() {
             @Override
@@ -129,12 +129,16 @@ private void started() {
         initialLoadingInfo.setOperationStatus(WS_AGENT_BOOTING.getValue(), SUCCESS);
         loader.hide();
 
-        if (messageBusCallback != null) {
-            messageBusCallback.onSuccess(messageBus);
-        }
-        if (devMachineCallback != null) {
-            devMachineCallback.onSuccess(devMachine);
+        for (AsyncCallback<MessageBus> callback : messageBusCallbacks) {
+        	callback.onSuccess(messageBus);
+		}
+        messageBusCallbacks = null;
+        
+        for (AsyncCallback<DevMachine> callback : devMachineCallbacks) {
+        	callback.onSuccess(devMachine);
         }
+        devMachineCallbacks = null;
+        
         eventBus.fireEvent(WsAgentStateEvent.createWsAgentStartedEvent());
     }
 
@@ -149,7 +153,7 @@ public void makeCall(AsyncCallback<MessageBus> callback) {
                 if (messageBus != null) {
                     callback.onSuccess(messageBus);
                 } else {
-                    WsAgentStateController.this.messageBusCallback = callback;
+                    WsAgentStateController.this.messageBusCallbacks.add(callback);
                 }
             }
         });
@@ -163,7 +167,7 @@ public void makeCall(AsyncCallback<DevMachine> callback) {
                 if (messageBus != null) {
                     callback.onSuccess(devMachine);
                 } else {
-                    WsAgentStateController.this.devMachineCallback = callback;
+                    WsAgentStateController.this.devMachineCallbacks.add(callback);
                 }
             }
         });

From 260bd6d9ca6df63602afe1f271e8dfc37fb43b2d Mon Sep 17 00:00:00 2001
From: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>
Date: Wed, 20 Jul 2016 15:40:02 +0300
Subject: [PATCH 04/16] CHE-1535: Reveal resources after move and copy
 operation

Now, it is possible to navigate to the copied and moved file after cut/copy/paste operation.
---
 .../eclipse/che/ide/resources/impl/CopyPasteManager.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/CopyPasteManager.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/CopyPasteManager.java
index 23908de886b..a2a388afb17 100644
--- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/CopyPasteManager.java
+++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/CopyPasteManager.java
@@ -36,6 +36,7 @@
 import org.eclipse.che.ide.api.resources.modification.ClipboardManager;
 import org.eclipse.che.ide.api.resources.modification.CutResourceMarker;
 import org.eclipse.che.ide.resource.Path;
+import org.eclipse.che.ide.resources.reveal.RevealResourceEvent;
 
 import static java.util.Arrays.copyOf;
 import static org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper.createFromAsyncRequest;
@@ -59,6 +60,7 @@ class CopyPasteManager implements ResourceChangedHandler {
     private final PromiseProvider     promises;
     private final DialogFactory       dialogFactory;
     private final NotificationManager notificationManager;
+    private final EventBus            eventBus;
     private       Resource[]          resources;
     private       boolean             move;
 
@@ -70,6 +72,7 @@ public CopyPasteManager(PromiseProvider promises,
         this.promises = promises;
         this.dialogFactory = dialogFactory;
         this.notificationManager = notificationManager;
+        this.eventBus = eventBus;
 
         eventBus.addHandler(ResourceChangedEvent.getType(), this);
     }
@@ -137,7 +140,8 @@ private Promise<Void> moveResource(final Resource resource, final Path destinati
         //simple move without overwriting
         return resource.move(destination).thenPromise(new Function<Resource, Promise<Void>>() {
             @Override
-            public Promise<Void> apply(Resource ignored) throws FunctionException {
+            public Promise<Void> apply(Resource resource) throws FunctionException {
+                eventBus.fireEvent(new RevealResourceEvent(resource));
                 return promises.resolve(null);
             }
         }).catchErrorPromise(new Function<PromiseError, Promise<Void>>() {
@@ -240,7 +244,8 @@ private Promise<Void> copyResource(final Resource resource, final Path destinati
         //simple copy without overwriting
         return resource.copy(destination).thenPromise(new Function<Resource, Promise<Void>>() {
             @Override
-            public Promise<Void> apply(Resource ignored) throws FunctionException {
+            public Promise<Void> apply(Resource resource) throws FunctionException {
+                eventBus.fireEvent(new RevealResourceEvent(resource));
                 return promises.resolve(null);
             }
         }).catchErrorPromise(new Function<PromiseError, Promise<Void>>() {

From fe0cb3bd0f0c535b6d70167a18d175386af829c8 Mon Sep 17 00:00:00 2001
From: Max Shaposhnik <mshaposhnik@codenvy.com>
Date: Wed, 20 Jul 2016 17:30:10 +0300
Subject: [PATCH 05/16] CHE-1248; remove workspace information from
 EnvironmentContext (#1658)

---
 .../che/DashboardRedirectionFilterTest.java   |  8 ----
 .../che/wsagent/server/WsAgentModule.java     |  7 ---
 .../wsagent/server/WsAgentServletModule.java  |  4 +-
 .../che/api/deploy/WsMasterModule.java        |  4 --
 .../che/api/deploy/WsMasterServletModule.java |  2 +-
 .../che/commons/env/EnvironmentContext.java   | 34 --------------
 .../che/everrest/CheAsynchronousJobPool.java  |  9 ----
 .../WebSocketMethodInvokerDecorator.java      |  6 +--
 .../commons/env/EnvironmentContextTest.java   |  7 ---
 .../machine/DockerInstanceProviderTest.java   |  1 -
 .../org-eclipse-jdt-ui/pom.xml                |  8 ++--
 .../internal/ui/text/java/ProposalInfo.java   | 21 +++++----
 .../server/jdt/CompletionJavadocTest.java     |  1 -
 wsagent/che-core-api-git/pom.xml              |  4 ++
 .../che/api/git/GitProjectImporter.java       |  3 +-
 .../api/project/server/ProjectService.java    |  2 +-
 wsagent/che-core-git-impl-jgit/pom.xml        |  4 ++
 wsagent/che-core-git-impl-native/pom.xml      |  4 ++
 ...a => EnvironmentInitializationFilter.java} | 25 ++--------
 ...sAgentEnvironmentInitializationFilter.java | 30 ------------
 ...a => EnvironmentInitializationFilter.java} | 25 ++--------
 ...MasterEnvironmentInitializationFilter.java | 47 -------------------
 22 files changed, 46 insertions(+), 210 deletions(-)
 rename wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/{AbstractEnvironmentInitializationFilter.java => EnvironmentInitializationFilter.java} (76%)
 delete mode 100644 wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/WsAgentEnvironmentInitializationFilter.java
 rename wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/{AbstractEnvironmentInitializationFilter.java => EnvironmentInitializationFilter.java} (76%)
 delete mode 100644 wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/WsMasterEnvironmentInitializationFilter.java

diff --git a/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java b/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java
index f114c15f108..c9753a4e2db 100644
--- a/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java
+++ b/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java
@@ -56,9 +56,6 @@ public void shouldSkipRequestToProject() throws Exception {
         when(request.getMethod()).thenReturn("GET");
         when(request.getRequestURI()).thenReturn("/namespace/ws-id/project1");
         when(request.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/namespace/ws-id/project1"));
-        EnvironmentContext context = new EnvironmentContext();
-        context.setWorkspaceId("ws-id");
-        EnvironmentContext.setCurrent(context);
 
         //when
         filter.doFilter(request, response, chain);
@@ -74,8 +71,6 @@ public void shouldRedirectIfRequestWithoutNamespace(String uri, String url) thro
         when(request.getRequestURI()).thenReturn(uri);
         when(request.getRequestURL()).thenReturn(new StringBuffer(url));
         EnvironmentContext context = new EnvironmentContext();
-        context.setWorkspaceId("ws-id");
-        context.setWorkspaceTemporary(false);
         context.setSubject(new SubjectImpl("id123", "name", "token123", false));
         EnvironmentContext.setCurrent(context);
 
@@ -99,9 +94,6 @@ public void shouldSkipNotGETRequest(String method) throws Exception {
         when(request.getMethod()).thenReturn(method);
         when(request.getRequestURI()).thenReturn("/ws-id/project1");
         when(request.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/ws-id/project1"));
-        EnvironmentContext context = new EnvironmentContext();
-        context.setWorkspaceId("ws-id");
-        EnvironmentContext.setCurrent(context);
 
         //when
         filter.doFilter(request, response, chain);
diff --git a/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentModule.java b/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentModule.java
index de7cbb0f84c..a4a529e0bca 100644
--- a/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentModule.java
+++ b/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentModule.java
@@ -31,15 +31,11 @@
 import org.eclipse.che.api.ssh.server.SshServiceClient;
 import org.eclipse.che.api.user.server.spi.PreferenceDao;
 import org.eclipse.che.commons.lang.Pair;
-import org.eclipse.che.everrest.CheAsynchronousJobPool;
 import org.eclipse.che.api.git.LocalGitUserResolver;
 import org.eclipse.che.git.impl.jgit.JGitConnectionFactory;
 import org.eclipse.che.inject.DynaModule;
 import org.eclipse.che.plugin.java.server.rest.WsAgentURLProvider;
 import org.eclipse.che.security.oauth.RemoteOAuthTokenProvider;
-import org.everrest.core.impl.async.AsynchronousJobPool;
-import org.everrest.core.impl.async.AsynchronousJobService;
-import org.everrest.guice.ServiceBindingHelper;
 
 import javax.inject.Named;
 import java.net.URI;
@@ -71,9 +67,6 @@ protected void configure() {
         bind(GitUserResolver.class).to(LocalGitUserResolver.class);
         bind(GitConnectionFactory.class).to(JGitConnectionFactory.class);
 
-        bind(AsynchronousJobPool.class).to(CheAsynchronousJobPool.class);
-        bind(ServiceBindingHelper.bindingKey(AsynchronousJobService.class, "/async/{ws-id}")).to(AsynchronousJobService.class);
-
         bind(String.class).annotatedWith(Names.named("api.endpoint")).toProvider(ApiEndpointProvider.class);
         bind(URI.class).annotatedWith(Names.named("api.endpoint")).toProvider(UriApiEndpointProvider.class);
         bind(String.class).annotatedWith(Names.named("user.token")).toProvider(UserTokenProvider.class);
diff --git a/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java b/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java
index a7abaa72545..1e2d8552375 100644
--- a/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java
+++ b/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java
@@ -14,7 +14,7 @@
 import com.google.inject.servlet.ServletModule;
 
 import org.eclipse.che.api.core.cors.CheCorsFilter;
-import org.eclipse.che.filters.WsAgentEnvironmentInitializationFilter;
+import org.eclipse.che.filters.EnvironmentInitializationFilter;
 import org.eclipse.che.inject.DynaModule;
 import org.everrest.guice.servlet.GuiceEverrestServlet;
 import org.everrest.websockets.WSConnectionTracker;
@@ -27,7 +27,7 @@ protected void configureServlets() {
         getServletContext().addListener(new WSConnectionTracker());
 
         filter("/*").through(CheCorsFilter.class);
-        filter("/ext/*").through(WsAgentEnvironmentInitializationFilter.class);
+        filter("/ext/*").through(EnvironmentInitializationFilter.class);
 
         serveRegex("^/ext((?!(/(ws|eventbus)($|/.*)))/.*)").with(GuiceEverrestServlet.class);
 
diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
index e0bfca91ff9..54628a97308 100644
--- a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
+++ b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
@@ -17,7 +17,6 @@
 import org.eclipse.che.api.machine.shared.Constants;
 import org.eclipse.che.api.user.server.ProfileService;
 import org.eclipse.che.inject.DynaModule;
-import org.everrest.guice.ServiceBindingHelper;
 
 /** @author andrew00x */
 @DynaModule
@@ -37,9 +36,6 @@ protected void configure() {
         bind(org.eclipse.che.api.workspace.server.stack.StackService.class);
         bind(org.eclipse.che.api.workspace.server.WorkspaceService.class);
         bind(org.eclipse.che.api.workspace.server.event.WorkspaceMessenger.class).asEagerSingleton();
-        bind(org.everrest.core.impl.async.AsynchronousJobPool.class).to(org.eclipse.che.everrest.CheAsynchronousJobPool.class);
-        bind(ServiceBindingHelper.bindingKey(org.everrest.core.impl.async.AsynchronousJobService.class, "/async/{ws-id}"))
-                .to(org.everrest.core.impl.async.AsynchronousJobService.class);
         bind(org.eclipse.che.plugin.docker.machine.ext.DockerMachineExtServerChecker.class);
         bind(org.eclipse.che.plugin.docker.machine.ext.DockerMachineTerminalChecker.class);
         bind(org.eclipse.che.everrest.EverrestDownloadFileResponseFilter.class);
diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterServletModule.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterServletModule.java
index e04997d24ab..0b4f6d82655 100644
--- a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterServletModule.java
+++ b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterServletModule.java
@@ -47,7 +47,7 @@ protected void configureServlets() {
 
         filter("/*").through(CorsFilter.class, corsFilterParams);
 
-        filter("/api/*").through(org.eclipse.che.api.local.filters.WsMasterEnvironmentInitializationFilter.class);
+        filter("/api/*").through(org.eclipse.che.api.local.filters.EnvironmentInitializationFilter.class);
         serveRegex("^/api((?!(/(ws|eventbus)($|/.*)))/.*)").with(org.eclipse.che.api.local.CheGuiceEverrestServlet.class);
         install(new org.eclipse.che.swagger.deploy.BasicSwaggerConfigurationModule());
     }
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/commons/env/EnvironmentContext.java b/core/che-core-api-core/src/main/java/org/eclipse/che/commons/env/EnvironmentContext.java
index 3321687628d..16eb416bb50 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/commons/env/EnvironmentContext.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/commons/env/EnvironmentContext.java
@@ -50,21 +50,11 @@ public static void reset() {
 
     private Subject subject;
 
-    private String workspaceName;
-
-    private String workspaceId;
-
-    private boolean workspaceTemporary;
-
-
     public EnvironmentContext() {
     }
 
     public EnvironmentContext(EnvironmentContext other) {
         setSubject(other.getSubject());
-        setWorkspaceName(other.getWorkspaceName());
-        setWorkspaceId(other.getWorkspaceId());
-        setWorkspaceTemporary(other.isWorkspaceTemporary());
     }
 
     public Subject getSubject() {
@@ -74,28 +64,4 @@ public Subject getSubject() {
     public void setSubject(Subject subject) {
         this.subject = subject;
     }
-
-    public String getWorkspaceName() {
-        return workspaceName;
-    }
-
-    public void setWorkspaceName(String workspaceName) {
-        this.workspaceName = workspaceName;
-    }
-
-    public String getWorkspaceId() {
-        return workspaceId;
-    }
-
-    public void setWorkspaceId(String workspaceId) {
-        this.workspaceId = workspaceId;
-    }
-
-    public boolean isWorkspaceTemporary() {
-        return workspaceTemporary;
-    }
-
-    public void setWorkspaceTemporary(boolean workspaceTemporary) {
-        this.workspaceTemporary = workspaceTemporary;
-    }
 }
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheAsynchronousJobPool.java b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheAsynchronousJobPool.java
index 4d685333672..c5e5c3a259c 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheAsynchronousJobPool.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheAsynchronousJobPool.java
@@ -35,15 +35,6 @@ public CheAsynchronousJobPool(EverrestConfiguration everrestConfiguration) {
         super(everrestConfiguration);
     }
 
-    @Override
-    protected UriBuilder getAsynchronousJobUriBuilder(AsynchronousJob job) {
-        final String wsId = EnvironmentContext.getCurrent().getWorkspaceId();
-        if (wsId == null) {
-            return super.getAsynchronousJobUriBuilder(job);
-        }
-        return UriBuilder.fromPath(asynchronousServicePath).path(wsId).path(Long.toString(job.getJobId()));
-    }
-
     @Override
     protected Callable<Object> newCallable(Object resource, Method method, Object[] params) {
         return ThreadLocalPropagateContext.wrap((super.newCallable(resource, method, params)));
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java
index 1dc8cf3797c..e4abda6b033 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java
@@ -46,11 +46,9 @@ public Object invokeMethod(Object resource, GenericMethodResource genericMethodR
 
                     EnvironmentContext.setCurrent(environmentContext);
 
-                    LOG.debug("Websocket {} in http session {} context of ws {} is temporary {}",
+                    LOG.debug("Websocket {} in http session {}",
                              wsConnection.getId(),
-                             wsConnection.getHttpSession(),
-                             EnvironmentContext.getCurrent().getWorkspaceName(),
-                             EnvironmentContext.getCurrent().isWorkspaceTemporary());
+                             wsConnection.getHttpSession());
                     return super.invokeMethod(resource, genericMethodResource, context);
                 } finally {
                     EnvironmentContext.reset();
diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/commons/env/EnvironmentContextTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/commons/env/EnvironmentContextTest.java
index 8cf1efb6be2..7b180460c67 100644
--- a/core/che-core-api-core/src/test/java/org/eclipse/che/commons/env/EnvironmentContextTest.java
+++ b/core/che-core-api-core/src/test/java/org/eclipse/che/commons/env/EnvironmentContextTest.java
@@ -16,7 +16,6 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class EnvironmentContextTest {
 
@@ -24,13 +23,9 @@ public class EnvironmentContextTest {
     public void shouldBeAbleToSetEnvContextInSameThread() {
         //given
         EnvironmentContext expected = EnvironmentContext.getCurrent();
-        expected.setWorkspaceId("ws1");
-        expected.setWorkspaceTemporary(true);
         expected.setSubject(new SubjectImpl("user", "id", "token", false));
 
         EnvironmentContext actual = EnvironmentContext.getCurrent();
-        assertEquals(actual.getWorkspaceId(), "ws1");
-        assertTrue(actual.isWorkspaceTemporary());
         Subject actualSubject = actual.getSubject();
         assertEquals(actualSubject.getUserName(), "user");
         assertEquals(actualSubject.getUserId(), "id");
@@ -42,8 +37,6 @@ public void shouldBeAbleToSetEnvContextInSameThread() {
     public void shouldNotBeAbleToSeeContextInOtherThread() {
         //given
         final EnvironmentContext expected = EnvironmentContext.getCurrent();
-        expected.setWorkspaceId("ws1");
-        expected.setWorkspaceTemporary(true);
         expected.setSubject(new SubjectImpl("user", "id", "token", false));
 
 
diff --git a/plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/DockerInstanceProviderTest.java b/plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/DockerInstanceProviderTest.java
index 44fe120aecf..3f9cbbd2ed9 100644
--- a/plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/DockerInstanceProviderTest.java
+++ b/plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/DockerInstanceProviderTest.java
@@ -156,7 +156,6 @@ public void setUp() throws Exception {
 
         EnvironmentContext envCont = new EnvironmentContext();
         envCont.setSubject(new SubjectImpl(USER_NAME, "userId", USER_TOKEN, false));
-        envCont.setWorkspaceId(WORKSPACE_ID);
         EnvironmentContext.setCurrent(envCont);
 
 
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml
index 64b7fca9950..80a66f41148 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml
@@ -46,10 +46,6 @@
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.equinox.common</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>
@@ -66,6 +62,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>wsagent-local</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-ext-lang-shared</artifactId>
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java
index cfda277baf9..dc823cd7764 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.ui.text.java;
 
-import org.eclipse.che.commons.env.EnvironmentContext;
+import org.eclipse.che.WorkspaceIdProvider;
 import org.eclipse.che.jdt.javadoc.JavaDocLocations;
 import org.eclipse.che.jdt.javadoc.JavadocContentAccess2;
 import org.eclipse.che.jdt.rest.UrlContextProvider;
@@ -89,14 +89,17 @@ private String computeInfo(IProgressMonitor monitor) {
 	 */
 	private String extractJavadoc(IJavaElement element) throws CoreException {
 		if (element instanceof IMember) {
-			return JavadocContentAccess2.getHTMLContent((IMember) element, true, UrlContextProvider.get(EnvironmentContext.getCurrent().getWorkspaceId(), element.getJavaProject().getPath().toString()));
-		} else if (element instanceof IPackageDeclaration) {
-			return JavadocContentAccess2.getHTMLContent((IPackageDeclaration)element,UrlContextProvider.get(EnvironmentContext.getCurrent().getWorkspaceId(),
-                    element.getJavaProject().getPath().toString()));
-		} else if (element instanceof IPackageFragment) {
-			return JavadocContentAccess2.getHTMLContent((IPackageFragment) element,UrlContextProvider.get(EnvironmentContext.getCurrent().getWorkspaceId(),
-                    element.getJavaProject().getPath().toString()));
-		}
+            return JavadocContentAccess2.getHTMLContent((IMember)element, true, UrlContextProvider
+                    .get(WorkspaceIdProvider.getWorkspaceId(), element.getJavaProject().getPath().toString()));
+        } else if (element instanceof IPackageDeclaration) {
+            return JavadocContentAccess2
+                    .getHTMLContent((IPackageDeclaration)element, UrlContextProvider.get(WorkspaceIdProvider.getWorkspaceId(),
+                                                                                         element.getJavaProject().getPath().toString()));
+        } else if (element instanceof IPackageFragment) {
+            return JavadocContentAccess2
+                    .getHTMLContent((IPackageFragment)element, UrlContextProvider.get(WorkspaceIdProvider.getWorkspaceId(),
+                                                                                      element.getJavaProject().getPath().toString()));
+        }
         return null;
 	}
 
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/CompletionJavadocTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/CompletionJavadocTest.java
index d47dc6a1922..608f3c87432 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/CompletionJavadocTest.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/CompletionJavadocTest.java
@@ -82,7 +82,6 @@ private static List<ICompletionProposal> computeProposals(ICompilationUnit compi
     public void setUp() throws Exception {
         super.setUp();
         EnvironmentContext customEnvironment = mock(EnvironmentContext.class);
-        doReturn("1q2w3e").when(customEnvironment).getWorkspaceId();
         doReturn(new SubjectImpl(vfsUser, "", "", false)).when(customEnvironment).getSubject();
         EnvironmentContext.setCurrent(customEnvironment);
         fJProject1 = Java18ProjectTestSetup.getProject();
diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml
index ce772a0357f..b39b99f95de 100644
--- a/wsagent/che-core-api-git/pom.xml
+++ b/wsagent/che-core-api-git/pom.xml
@@ -86,6 +86,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>wsagent-local</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.everrest</groupId>
             <artifactId>everrest-websockets</artifactId>
diff --git a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/GitProjectImporter.java b/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/GitProjectImporter.java
index cba993390df..e8ddf54ecc7 100644
--- a/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/GitProjectImporter.java
+++ b/wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/GitProjectImporter.java
@@ -13,6 +13,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import org.eclipse.che.WorkspaceIdProvider;
 import org.eclipse.che.api.core.ConflictException;
 import org.eclipse.che.api.core.ForbiddenException;
 import org.eclipse.che.api.core.ServerException;
@@ -265,7 +266,7 @@ private void checkoutBranch(GitConnection git,
                                        .stream()
                                        .anyMatch(branch -> branch.getName().equals(branchName));
         final GitCheckoutEvent checkout = dtoFactory.createDto(GitCheckoutEvent.class)
-                                                    .withWorkspaceId(System.getenv("CHE_WORKSPACE_ID"))
+                                                    .withWorkspaceId(WorkspaceIdProvider.getWorkspaceId())
                                                     .withProjectName(projectName);
         if (startPoint != null) {
             if (branchExist) {
diff --git a/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java b/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java
index 98a1e93cf27..ab9013ca579 100644
--- a/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java
+++ b/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java
@@ -872,7 +872,7 @@ private void logProjectCreatedEvent(@NotNull String projectName, @NotNull String
         LOG.info("EVENT#project-created# PROJECT#{}# TYPE#{}# WS#{}# USER#{}# PAAS#default#",
                  projectName,
                  projectType,
-                 EnvironmentContext.getCurrent().getWorkspaceId(),
+                 workspace,
                  EnvironmentContext.getCurrent().getSubject().getUserId());
     }
 
diff --git a/wsagent/che-core-git-impl-jgit/pom.xml b/wsagent/che-core-git-impl-jgit/pom.xml
index 6a6a673f62e..17e0483022e 100644
--- a/wsagent/che-core-git-impl-jgit/pom.xml
+++ b/wsagent/che-core-git-impl-jgit/pom.xml
@@ -99,6 +99,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>wsagent-local</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-ssh-key-server</artifactId>
diff --git a/wsagent/che-core-git-impl-native/pom.xml b/wsagent/che-core-git-impl-native/pom.xml
index 63a143fa393..d1b9372fb85 100644
--- a/wsagent/che-core-git-impl-native/pom.xml
+++ b/wsagent/che-core-git-impl-native/pom.xml
@@ -94,6 +94,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>wsagent-local</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-ssh-key-server</artifactId>
diff --git a/wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/AbstractEnvironmentInitializationFilter.java b/wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/EnvironmentInitializationFilter.java
similarity index 76%
rename from wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/AbstractEnvironmentInitializationFilter.java
rename to wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/EnvironmentInitializationFilter.java
index 7c90f39ab2f..8fef4660248 100644
--- a/wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/AbstractEnvironmentInitializationFilter.java
+++ b/wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/EnvironmentInitializationFilter.java
@@ -14,6 +14,7 @@
 import org.eclipse.che.commons.subject.Subject;
 import org.eclipse.che.commons.subject.SubjectImpl;
 
+import javax.inject.Singleton;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -27,12 +28,12 @@
 import java.security.Principal;
 
 /**
- * The  class contains commons business logic for all environment workspace id initialization filters. The filters are necessary to set
- * workspace meta information to environment context.
+ * Fills environment context with information about current subject.
  *
  * @author Dmitry Shnurenko
  */
-public abstract class AbstractEnvironmentInitializationFilter implements Filter {
+@Singleton
+public class EnvironmentInitializationFilter implements Filter {
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
@@ -50,23 +51,12 @@ public final void doFilter(ServletRequest request, ServletResponse response, Fil
 
         try {
             environmentContext.setSubject(subject);
-            environmentContext.setWorkspaceId(getWorkspaceId(request));
-
             filterChain.doFilter(addUserInRequest(httpRequest, subject), response);
         } finally {
             EnvironmentContext.reset();
         }
     }
 
-    /**
-     * Extracts workspace id from request.
-     *
-     * @param request
-     *         request which contains workspace id
-     * @return workspace id
-     */
-    protected abstract String getWorkspaceId(ServletRequest request);
-
     private HttpServletRequest addUserInRequest(final HttpServletRequest httpRequest, final Subject subject) {
         return new HttpServletRequestWrapper(httpRequest) {
             @Override
@@ -76,12 +66,7 @@ public String getRemoteUser() {
 
             @Override
             public Principal getUserPrincipal() {
-                return new Principal() {
-                    @Override
-                    public String getName() {
-                        return subject.getUserName();
-                    }
-                };
+                return () -> subject.getUserName();
             }
         };
     }
diff --git a/wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/WsAgentEnvironmentInitializationFilter.java b/wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/WsAgentEnvironmentInitializationFilter.java
deleted file mode 100644
index 406fbbb3fac..00000000000
--- a/wsagent/wsagent-local/src/main/java/org/eclipse/che/filters/WsAgentEnvironmentInitializationFilter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.che.filters;
-
-import com.google.inject.Singleton;
-
-import javax.servlet.ServletRequest;
-
-/**
- * The filter contains business logic which allows extract workspace id and sets it to environment context. Workspace id
- * has defined place in URL. The filter mapped for all requests to ws agent API.
- *
- * @author Dmitry Shnurenko
- */
-@Singleton
-public class WsAgentEnvironmentInitializationFilter extends AbstractEnvironmentInitializationFilter {
-
-    @Override
-    protected String getWorkspaceId(ServletRequest request) {
-        return System.getenv("CHE_WORKSPACE_ID");
-    }
-}
diff --git a/wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/AbstractEnvironmentInitializationFilter.java b/wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/EnvironmentInitializationFilter.java
similarity index 76%
rename from wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/AbstractEnvironmentInitializationFilter.java
rename to wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/EnvironmentInitializationFilter.java
index c42d095410d..8ba45caf22a 100644
--- a/wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/AbstractEnvironmentInitializationFilter.java
+++ b/wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/EnvironmentInitializationFilter.java
@@ -14,6 +14,7 @@
 import org.eclipse.che.commons.subject.Subject;
 import org.eclipse.che.commons.subject.SubjectImpl;
 
+import javax.inject.Singleton;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -27,12 +28,12 @@
 import java.security.Principal;
 
 /**
- * The  class contains commons business logic for all environment workspace id initialization filters. The filters are necessary to set
- * workspace meta information to environment context.
+ * Fills environment context with information about current subject.
  *
  * @author Dmitry Shnurenko
  */
-public abstract class AbstractEnvironmentInitializationFilter implements Filter {
+@Singleton
+public class EnvironmentInitializationFilter implements Filter {
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
@@ -50,23 +51,12 @@ public final void doFilter(ServletRequest request, ServletResponse response, Fil
 
         try {
             environmentContext.setSubject(subject);
-            environmentContext.setWorkspaceId(getWorkspaceId(request));
-
             filterChain.doFilter(addUserInRequest(httpRequest, subject), response);
         } finally {
             EnvironmentContext.reset();
         }
     }
 
-    /**
-     * Extracts workspace id from request.
-     *
-     * @param request
-     *         request which contains workspace id
-     * @return workspace id
-     */
-    protected abstract String getWorkspaceId(ServletRequest request);
-
     private HttpServletRequest addUserInRequest(final HttpServletRequest httpRequest, final Subject subject) {
         return new HttpServletRequestWrapper(httpRequest) {
             @Override
@@ -76,12 +66,7 @@ public String getRemoteUser() {
 
             @Override
             public Principal getUserPrincipal() {
-                return new Principal() {
-                    @Override
-                    public String getName() {
-                        return subject.getUserName();
-                    }
-                };
+                return () -> subject.getUserName();
             }
         };
     }
diff --git a/wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/WsMasterEnvironmentInitializationFilter.java b/wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/WsMasterEnvironmentInitializationFilter.java
deleted file mode 100644
index 5aac8155ecb..00000000000
--- a/wsmaster/wsmaster-local/src/main/java/org/eclipse/che/api/local/filters/WsMasterEnvironmentInitializationFilter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.che.api.local.filters;
-
-import com.google.inject.Singleton;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * The filter contains business logic which extracts workspace id and sets it to environment context. Workspace id
- * has defined place in URL. The filter mapped for all requests to master API.
- *
- * @author Dmitry Shnurenko
- */
-@Singleton
-public class WsMasterEnvironmentInitializationFilter extends AbstractEnvironmentInitializationFilter {
-
-    /**
-     * The index of workspace id inside request uri.
-     */
-    private static final int WORKSPACE_ID_INDEX = 4;
-
-    @Override
-    protected String getWorkspaceId(ServletRequest request) {
-        String requestUri = ((HttpServletRequest)request).getRequestURI();
-        String[] uriParts = requestUri.split("/");
-
-        if (uriParts.length >= 5) {
-            String workspaceId = uriParts[WORKSPACE_ID_INDEX];
-
-            if (workspaceId.startsWith("workspace")) {
-                return workspaceId;
-            }
-        }
-
-        return "";
-    }
-}

From 621a06c76fe780c99ae4af83a49edb3f9662299d Mon Sep 17 00:00:00 2001
From: Mario Loriedo <mario.loriedo@gmail.com>
Date: Wed, 20 Jul 2016 18:27:12 +0200
Subject: [PATCH 06/16] che-launcher infer Che version and self destruct itself
 (#1881)

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
---
 dockerfiles/che-launcher/launcher.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dockerfiles/che-launcher/launcher.sh b/dockerfiles/che-launcher/launcher.sh
index 12926184a53..28d34b2971e 100755
--- a/dockerfiles/che-launcher/launcher.sh
+++ b/dockerfiles/che-launcher/launcher.sh
@@ -30,7 +30,7 @@ init_global_variables() {
   DEFAULT_DOCKER_HOST_IP=$(get_docker_host_ip)
   DEFAULT_CHE_HOSTNAME=$(get_che_hostname)
   DEFAULT_CHE_PORT="8080"
-  DEFAULT_CHE_VERSION="latest"
+  DEFAULT_CHE_VERSION=$(get_che_launcher_version)
   DEFAULT_CHE_RESTART_POLICY="no"
   DEFAULT_CHE_USER="root"
   DEFAULT_CHE_LOG_LEVEL="info"
@@ -139,6 +139,16 @@ print_debug_info() {
   debug "---------------------------------------"
 }
 
+get_che_launcher_container_id() {
+  hostname
+}
+
+get_che_launcher_version() {
+  LAUNCHER_CONTAINER_ID=$(get_che_launcher_container_id)
+  LAUNCHER_IMAGE_NAME=$(docker inspect --format='{{.Config.Image}}' "${LAUNCHER_CONTAINER_ID}")
+  echo "${LAUNCHER_IMAGE_NAME}" | cut -d : -f2
+}
+
 is_boot2docker() {
   if uname -r | grep -q 'boot2docker'; then
     return 0
@@ -428,3 +438,6 @@ case ${CHE_SERVER_ACTION} in
     print_debug_info
   ;;
 esac
+
+# This container will self destruct after execution
+docker rm -f "$(get_che_launcher_container_id)" > /dev/null 2>&1

From 3d9060f4aeddca01bf109262e371370ba99b104d Mon Sep 17 00:00:00 2001
From: Florent BENOIT <fbenoit@codenvy.com>
Date: Thu, 21 Jul 2016 20:51:32 +0200
Subject: [PATCH 07/16] Add docker image to grab the ip used by docker (#1891)

Change-Id: Id781e34c99f14c87909197b99969d645268e62d3
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
---
 dockerfiles/che-ip/Dockerfile | 17 +++++++++++++++++
 dockerfiles/che-ip/getip.sh   | 29 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 dockerfiles/che-ip/Dockerfile
 create mode 100755 dockerfiles/che-ip/getip.sh

diff --git a/dockerfiles/che-ip/Dockerfile b/dockerfiles/che-ip/Dockerfile
new file mode 100644
index 00000000000..c9f6902d516
--- /dev/null
+++ b/dockerfiles/che-ip/Dockerfile
@@ -0,0 +1,17 @@
+# Copyright (c) 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
+#
+# To build, in this directory:
+#  `docker build -t codenvy/che-ip .`
+#
+# To use it:
+#  `docker run --rm --net=host codenvy/che-ip`
+
+FROM alpine:3.4
+
+ADD getip.sh /bin/getip.sh
+
+CMD /bin/getip.sh
diff --git a/dockerfiles/che-ip/getip.sh b/dockerfiles/che-ip/getip.sh
new file mode 100755
index 00000000000..25a582e17d6
--- /dev/null
+++ b/dockerfiles/che-ip/getip.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Copyright (c) 2012-2016 Codenvy, S.A., Red Hat, Inc
+# 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
+
+
+# return true if system is using boot2docker
+is_boot2docker() {
+  if uname -r | grep -q 'boot2docker'; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# network interface to use to grab local ip
+NETWORK_IF="eth0"
+if is_boot2docker; then
+  NETWORK_IF="eth1"
+fi
+
+# grab ip from the following command
+ip a show "${NETWORK_IF}" | \
+            grep 'inet ' | \
+            cut -d/ -f1 | \
+            awk '{print $2}'
+

From 51903bfdcd5b008f21e21be4337b531191358cf2 Mon Sep 17 00:00:00 2001
From: Florent BENOIT <fbenoit@codenvy.com>
Date: Thu, 21 Jul 2016 20:53:18 +0200
Subject: [PATCH 08/16] Fix the ENV about configuration folder to set when
 using docker image in the launcher (#1896)

Change-Id: Ic88018709671e36e23fbceeb9e5cee5dd5ee0129
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
---
 dockerfiles/che-launcher/launcher.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfiles/che-launcher/launcher.sh b/dockerfiles/che-launcher/launcher.sh
index 28d34b2971e..4df9d7a034b 100755
--- a/dockerfiles/che-launcher/launcher.sh
+++ b/dockerfiles/che-launcher/launcher.sh
@@ -48,7 +48,7 @@ init_global_variables() {
   # CHE_CONF_ARGS are the Docker run options that need to be used if users set CHE_CONF_FOLDER:
   #   - empty if CHE_CONF_FOLDER is not set
   #   - -v ${CHE_CONF_FOLDER}:/conf -e "CHE_LOCAL_CONF_DIR=/conf" if CHE_CONF_FOLDER is set
-  CHE_CONF_ARGS=${CHE_CONF_FOLDER:+-v ${CHE_CONF_FOLDER}:/conf -e \"CHE_LOCAL_CONF_DIR=/conf\"}
+  CHE_CONF_ARGS=${CHE_CONF_FOLDER:+-v ${CHE_CONF_FOLDER}:/conf -e CHE_LOCAL_CONF_DIR=/conf}
   CHE_LOCAL_BINARY_ARGS=${CHE_LOCAL_BINARY:+-v ${CHE_LOCAL_BINARY}:/home/user/che}
 
   if is_docker_for_mac || is_docker_for_windows; then

From e69e1a5840af1b20ac365193a4d6143d6748e65c Mon Sep 17 00:00:00 2001
From: Oleksii Kurinnyi <okurinnyi@codenvy.com>
Date: Fri, 22 Jul 2016 13:48:47 +0300
Subject: [PATCH 09/16] #1903: fix export a workspace from the Dashboard

Signed-off-by: Oleksii Kurinnyi <okurinnyi@codenvy.com>
---
 dashboard/bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/bower.json b/dashboard/bower.json
index 0ff01351a6f..087ebb12b1a 100644
--- a/dashboard/bower.json
+++ b/dashboard/bower.json
@@ -33,7 +33,7 @@
     "zeroclipboard": "2.2.0",
     "angular-uuid4": "0.3.0",
     "angular-file-upload": "2.0.0",
-    "jquery": "1.8.1"
+    "jquery": "2.1.3"
   },
   "devDependencies": {
   },

From 4fdecd8d97172763d1072ce339015ab0861a203b Mon Sep 17 00:00:00 2001
From: Max Shaposhnik <mshaposhnik@codenvy.com>
Date: Fri, 22 Jul 2016 15:25:20 +0300
Subject: [PATCH 10/16] CHE-1893; fix authorization flow during clone from
 private repo (#1905)

---
 .../che/git/impl/jgit/JGitConnection.java     | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/wsagent/che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnection.java b/wsagent/che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnection.java
index bde03f88bd4..2ef753170d6 100644
--- a/wsagent/che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnection.java
+++ b/wsagent/che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnection.java
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.eclipse.che.git.impl.jgit;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
@@ -51,6 +52,7 @@
 import org.eclipse.che.api.git.shared.MergeRequest;
 import org.eclipse.che.api.git.shared.MergeResult;
 import org.eclipse.che.api.git.shared.MoveRequest;
+import org.eclipse.che.api.git.shared.ProviderInfo;
 import org.eclipse.che.api.git.shared.PullRequest;
 import org.eclipse.che.api.git.shared.PullResponse;
 import org.eclipse.che.api.git.shared.PushRequest;
@@ -170,6 +172,8 @@
 import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.eclipse.che.api.git.shared.ProviderInfo.AUTHENTICATE_URL;
+import static org.eclipse.che.api.git.shared.ProviderInfo.PROVIDER_NAME;
 import static org.eclipse.che.dto.server.DtoFactory.newDto;
 
 /**
@@ -1564,12 +1568,12 @@ public boolean accept(File dir) {
      */
     private Object executeRemoteCommand(String remoteUrl, TransportCommand command)
             throws GitException, GitAPIException, UnauthorizedException {
-        String sshKeyDirectoryPath = "";
+        File keyDirectory = null;
+        UserCredential credentials = null;
         try {
             if (GitUrlUtils.isSSH(remoteUrl)) {
-                File keyDirectory = Files.createTempDir();
-                sshKeyDirectoryPath = keyDirectory.getPath();
-                File sshKey = writePrivateKeyFile(remoteUrl, keyDirectory);
+                keyDirectory =  Files.createTempDir();
+                final File sshKey = writePrivateKeyFile(remoteUrl, keyDirectory);
 
                 SshSessionFactory sshSessionFactory = new JschConfigSessionFactory() {
                     @Override
@@ -1593,7 +1597,7 @@ public void configure(Transport transport) {
                     }
                 });
             } else {
-                UserCredential credentials = credentialsLoader.getUserCredential(remoteUrl);
+                credentials = credentialsLoader.getUserCredential(remoteUrl);
                 if (credentials != null) {
                     command.setCredentialsProvider(new UsernamePasswordCredentialsProvider(credentials.getUserName(),
                                                                                            credentials.getPassword()));
@@ -1604,16 +1608,25 @@ public void configure(Transport transport) {
 
             return command.call();
         } catch (GitException | TransportException exception) {
-            if ("Unable get private ssh key".equals(exception.getMessage())
-                || exception.getMessage().contains(ERROR_AUTHENTICATION_REQUIRED)) {
-                throw new UnauthorizedException(exception.getMessage());
+            if ("Unable get private ssh key".equals(exception.getMessage())) {
+                throw new UnauthorizedException(exception.getMessage(), ErrorCodes.UNABLE_GET_PRIVATE_SSH_KEY);
+            } else if (exception.getMessage().contains(ERROR_AUTHENTICATION_REQUIRED)) {
+                final ProviderInfo info = credentialsLoader.getProviderInfo(remoteUrl);
+                if (info != null) {
+                    throw new UnauthorizedException(exception.getMessage(),
+                                                    ErrorCodes.UNAUTHORIZED_GIT_OPERATION,
+                                                    ImmutableMap.of(PROVIDER_NAME, info.getProviderName(),
+                                                                    AUTHENTICATE_URL, info.getAuthenticateUrl(),
+                                                                    "authenticated", Boolean.toString(credentials != null)));
+                }
+                throw new UnauthorizedException(exception.getMessage(), ErrorCodes.UNAUTHORIZED_GIT_OPERATION);
             } else {
                 throw exception;
             }
         } finally {
-            if (!sshKeyDirectoryPath.isEmpty()) {
+            if (keyDirectory != null && keyDirectory.exists()) {
                 try {
-                    FileUtils.delete(new File(sshKeyDirectoryPath), FileUtils.RECURSIVE);
+                    FileUtils.delete(keyDirectory, FileUtils.RECURSIVE);
                 } catch (IOException exception) {
                     throw new GitException("Can't remove SSH key directory", exception);
                 }

From 826f637a7aba2065628ac3cb841db8d6624f6437 Mon Sep 17 00:00:00 2001
From: Sergii Kabashniuk <skabashnyuk@codenvy.com>
Date: Fri, 22 Jul 2016 15:39:19 +0300
Subject: [PATCH 11/16] Code cleanup

---
 .../che/wsagent/server/WsAgentAnalyticsAddresser.java     | 8 ++++----
 .../che/api/deploy/WsMasterAnalyticsAddresser.java        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentAnalyticsAddresser.java b/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentAnalyticsAddresser.java
index c27b86efa73..77b80e45755 100644
--- a/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentAnalyticsAddresser.java
+++ b/assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentAnalyticsAddresser.java
@@ -30,15 +30,15 @@ public class WsAgentAnalyticsAddresser {
     void send() {
         HttpURLConnection connection = null;
         try {
-            final URL url = new URL("https://install.codenvycorp.com/che/telemetry/workspace");
+            final URL url = new URL("https://install.codenvycorp.com/che/init/workspace");
             connection = (HttpsURLConnection)url.openConnection();
             connection.getResponseCode();
         } catch (IOException e) {
             LOG.error("Failed to send agent analytics", e);
         } finally {
-          if (connection != null) {
-              connection.disconnect();
-          }
+            if (connection != null) {
+                connection.disconnect();
+            }
         }
     }
 }
diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterAnalyticsAddresser.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterAnalyticsAddresser.java
index 67b7419fb65..d2c839eb4ee 100644
--- a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterAnalyticsAddresser.java
+++ b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterAnalyticsAddresser.java
@@ -30,7 +30,7 @@ public class WsMasterAnalyticsAddresser {
     void send() {
         HttpURLConnection connection = null;
         try {
-            final URL url = new URL("https://install.codenvycorp.com/che/telemetry/master");
+            final URL url = new URL("https://install.codenvycorp.com/che/init/server");
             connection = (HttpsURLConnection)url.openConnection();
             connection.getResponseCode();
         } catch (IOException e) {

From e0db4445cc8af290ca1c63f1374a5f0e11c178f4 Mon Sep 17 00:00:00 2001
From: Mario Loriedo <mario.loriedo@gmail.com>
Date: Fri, 22 Jul 2016 15:42:54 +0200
Subject: [PATCH 12/16] [Replaces #1885] Launcher: fixed Path problems,
 splitted in 3 files and added tests (#1914)

* Fix environment variables for CHE_DATA_FOLDER

Cleaned up syntax so that the variables will work on Windows.

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* Launcher: fixed Path problems, splitted in 3 files and added tests

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* Launcher tests: added instructions to run bats tests
---
 dockerfiles/che-launcher/Dockerfile         |  10 +-
 dockerfiles/che-launcher/launcher.sh        | 139 ++----------
 dockerfiles/che-launcher/launcher_cmds.sh   | 124 +++++++++++
 dockerfiles/che-launcher/launcher_funcs.sh  | 224 ++++++++++++++++++++
 dockerfiles/che-launcher/launcher_test.bats |  40 ++++
 5 files changed, 411 insertions(+), 126 deletions(-)
 create mode 100644 dockerfiles/che-launcher/launcher_cmds.sh
 create mode 100644 dockerfiles/che-launcher/launcher_funcs.sh
 create mode 100644 dockerfiles/che-launcher/launcher_test.bats

diff --git a/dockerfiles/che-launcher/Dockerfile b/dockerfiles/che-launcher/Dockerfile
index 2d25f8c1643..4e58cc48e0a 100644
--- a/dockerfiles/che-launcher/Dockerfile
+++ b/dockerfiles/che-launcher/Dockerfile
@@ -11,10 +11,10 @@
 #  `docker build -t codenvy/che-launcher .`
 #
 # To use it:
-#  `docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che start`
-#  `docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che stop`
-#  `docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che restart`
-#  `docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che update`
+#  `docker run -v /var/run/docker.sock:/var/run/docker.sock codenvy/che start`
+#  `docker run -v /var/run/docker.sock:/var/run/docker.sock codenvy/che stop`
+#  `docker run -v /var/run/docker.sock:/var/run/docker.sock codenvy/che restart`
+#  `docker run -v /var/run/docker.sock:/var/run/docker.sock codenvy/che update`
 #
 
 FROM alpine:3.4
@@ -31,6 +31,8 @@ RUN set -x \
   && curl -sL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-$DOCKER_VERSION" \
   > /usr/bin/docker; chmod +x /usr/bin/docker
 
+COPY /launcher_cmds.sh /bin/launcher_cmds.sh
+COPY /launcher_funcs.sh /bin/launcher_funcs.sh
 COPY /launcher.sh /bin/launcher.sh
 
 ENTRYPOINT ["bin/launcher.sh"]
diff --git a/dockerfiles/che-launcher/launcher.sh b/dockerfiles/che-launcher/launcher.sh
index 4df9d7a034b..2d489918d7b 100755
--- a/dockerfiles/che-launcher/launcher.sh
+++ b/dockerfiles/che-launcher/launcher.sh
@@ -9,6 +9,10 @@
 #   Mario Loriedo - Initial implementation
 #
 
+launcher_dir="$(dirname "$0")"
+source "$launcher_dir/launcher_funcs.sh"
+source "$launcher_dir/launcher_cmds.sh"
+
 init_logging() {
   BLUE='\033[1;34m'
   GREEN='\033[0;32m'
@@ -36,6 +40,10 @@ init_global_variables() {
   DEFAULT_CHE_LOG_LEVEL="info"
   DEFAULT_CHE_DATA_FOLDER="/home/user/che"
 
+  # Clean eventual user provided paths
+  CHE_CONF_FOLDER=${CHE_CONF_FOLDER:+$(get_clean_path ${CHE_CONF_FOLDER})}
+  CHE_DATA_FOLDER=${CHE_DATA_FOLDER:+$(get_clean_path ${CHE_DATA_FOLDER})}
+
   CHE_HOSTNAME=${CHE_HOSTNAME:-${DEFAULT_CHE_HOSTNAME}}
   CHE_PORT=${CHE_PORT:-${DEFAULT_CHE_PORT}}
   CHE_VERSION=${CHE_VERSION:-${DEFAULT_CHE_VERSION}}
@@ -48,16 +56,16 @@ init_global_variables() {
   # CHE_CONF_ARGS are the Docker run options that need to be used if users set CHE_CONF_FOLDER:
   #   - empty if CHE_CONF_FOLDER is not set
   #   - -v ${CHE_CONF_FOLDER}:/conf -e "CHE_LOCAL_CONF_DIR=/conf" if CHE_CONF_FOLDER is set
-  CHE_CONF_ARGS=${CHE_CONF_FOLDER:+-v ${CHE_CONF_FOLDER}:/conf -e CHE_LOCAL_CONF_DIR=/conf}
+  CHE_CONF_ARGS=${CHE_CONF_FOLDER:+-v "${CHE_CONF_FOLDER}":/conf -e "CHE_LOCAL_CONF_DIR=/conf"}
   CHE_LOCAL_BINARY_ARGS=${CHE_LOCAL_BINARY:+-v ${CHE_LOCAL_BINARY}:/home/user/che}
 
   if is_docker_for_mac || is_docker_for_windows; then
-    CHE_STORAGE_ARGS=${CHE_DATA_FOLDER:+-v ${CHE_DATA_FOLDER}/storage:/home/user/che/storage \
-                                        -e \"CHE_WORKSPACE_STORAGE=${CHE_DATA_FOLDER}/workspaces\" \
-                                        -e \"CHE_WORKSPACE_STORAGE_CREATE_FOLDERS=false\"}
+    CHE_STORAGE_ARGS=${CHE_DATA_FOLDER:+-v "${CHE_DATA_FOLDER}/storage":/home/user/che/storage \
+                                        -e "CHE_WORKSPACE_STORAGE=${CHE_DATA_FOLDER}/workspaces" \
+                                        -e "CHE_WORKSPACE_STORAGE_CREATE_FOLDERS=false"}
   else
-    CHE_STORAGE_ARGS=${CHE_DATA_FOLDER:+-v ${CHE_DATA_FOLDER}/storage:/home/user/che/storage \
-                                        -v ${CHE_DATA_FOLDER}/workspaces:/home/user/che/workspaces}
+    CHE_STORAGE_ARGS=${CHE_DATA_FOLDER:+-v "${CHE_DATA_FOLDER}/storage":/home/user/che/storage \
+                                        -v "${CHE_DATA_FOLDER}/workspaces":/home/user/che/workspaces}
   fi
 
   if [ "${CHE_LOG_LEVEL}" = "debug" ]; then
@@ -274,19 +282,10 @@ server_is_booted() {
   fi
 }
 
-wait_until_server_is_booted () {
-  SERVER_BOOT_TIMEOUT=${1}
-
-  ELAPSED=0
-  until server_is_booted || [ ${ELAPSED} -eq "${SERVER_BOOT_TIMEOUT}" ]; do
-    sleep 1
-    ELAPSED=$((ELAPSED+1))
-  done
-}
-
 parse_command_line () {
   if [ $# -eq 0 ]; then
     usage
+    container_self_destruction
     exit
   fi
 
@@ -297,6 +296,7 @@ parse_command_line () {
       ;;
       -h|--help)
         usage
+        container_self_destruction
         exit
       ;;
       *)
@@ -307,111 +307,6 @@ parse_command_line () {
   done
 }
 
-start_che_server() {
-  if che_container_exist; then
-    error_exit "A container named \"${CHE_SERVER_CONTAINER_NAME}\" already exists. Please remove it manually (docker rm -f ${CHE_SERVER_CONTAINER_NAME}) and try again."
-  fi
-
-  CURRENT_IMAGE=$(docker images -q "${CHE_SERVER_IMAGE_NAME}":"${CHE_VERSION}")
-
-  if [ "${CURRENT_IMAGE}" != "" ]; then
-    info "ECLIPSE CHE: ALREADY HAVE IMAGE ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION}"
-  else
-    update_che_server
-  fi
-
-  info "ECLIPSE CHE: CONTAINER STARTING"
-  docker run -d --name "${CHE_SERVER_CONTAINER_NAME}" \
-    -v /var/run/docker.sock:/var/run/docker.sock \
-    -v /home/user/che/lib:/home/user/che/lib-copy \
-    ${CHE_LOCAL_BINARY_ARGS} \
-    -p "${CHE_PORT}":8080 \
-    --restart="${CHE_RESTART_POLICY}" \
-    --user="${CHE_USER}" \
-    ${CHE_CONF_ARGS} \
-    ${CHE_STORAGE_ARGS} \
-    "${CHE_SERVER_IMAGE_NAME}":"${CHE_VERSION}" \
-                --remote:"${CHE_HOST_IP}" \
-                -s:uid \
-                -s:client \
-                ${CHE_DEBUG_OPTION} \
-                run > /dev/null
-
-  wait_until_container_is_running 10
-  if ! che_container_is_running; then
-    error_exit "ECLIPSE CHE: Timeout waiting Che container to start."
-  fi
-
-  info "ECLIPSE CHE: SERVER LOGS AT \"docker logs -f ${CHE_SERVER_CONTAINER_NAME}\""
-  info "ECLIPSE CHE: SERVER BOOTING..."
-  wait_until_server_is_booted 20
-
-  if server_is_booted; then
-    info "ECLIPSE CHE: BOOTED AND REACHABLE"
-    info "ECLIPSE CHE: http://${CHE_HOSTNAME}:${CHE_PORT}"
-  else
-    error_exit "ECLIPSE CHE: Timeout waiting Che server to boot. Run \"docker logs ${CHE_SERVER_CONTAINER_NAME}\" to see the logs."
-  fi
-}
-
-execute_command_with_progress() {
-  progress=$1
-  command=$2
-  shift 2
-
-  pid=""
-  printf "\n"
-
-  case "$progress" in
-    extended)
-      $command "$@"
-      ;;
-    basic|*)
-      $command "$@" &>/dev/null &
-      pid=$!
-      while kill -0 "$pid" >/dev/null 2>&1; do
-        printf "#"
-        sleep 10
-      done
-      wait $pid # return pid's exit code
-      printf "\n"
-    ;;
-  esac
-  printf "\n"
-}
-
-stop_che_server() {
-  if ! che_container_is_running; then
-    info "-------------------------------------------------------"
-    info "ECLIPSE CHE: CONTAINER IS NOT RUNNING. NOTHING TO DO."
-    info "-------------------------------------------------------"
-  else
-    info "ECLIPSE CHE: STOPPING SERVER..."
-    docker exec ${CHE_SERVER_CONTAINER_NAME} /home/user/che/bin/che.sh -c stop > /dev/null 2>&1
-    sleep 5
-    info "ECLIPSE CHE: REMOVING CONTAINER"
-    docker rm -f ${CHE_SERVER_CONTAINER_NAME} > /dev/null 2>&1
-    info "ECLIPSE CHE: STOPPED"
-  fi
-}
-
-restart_che_server() {
-  if che_container_is_running; then
-    stop_che_server
-  fi
-  start_che_server
-}
-
-update_che_server() {
-  if [ -z "${CHE_VERSION}" ]; then
-    CHE_VERSION=${DEFAULT_CHE_VERSION}
-  fi
-
-  info "ECLIPSE CHE: PULLING IMAGE ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION}"
-  execute_command_with_progress extended docker pull ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION}
-  info "ECLIPSE CHE: IMAGE ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION} INSTALLED"
-}
-
 # See: https://sipb.mit.edu/doc/safe-shell/
 set -e
 set -u
@@ -440,4 +335,4 @@ case ${CHE_SERVER_ACTION} in
 esac
 
 # This container will self destruct after execution
-docker rm -f "$(get_che_launcher_container_id)" > /dev/null 2>&1
+container_self_destruction
diff --git a/dockerfiles/che-launcher/launcher_cmds.sh b/dockerfiles/che-launcher/launcher_cmds.sh
new file mode 100644
index 00000000000..aad56ed8be4
--- /dev/null
+++ b/dockerfiles/che-launcher/launcher_cmds.sh
@@ -0,0 +1,124 @@
+#!/bin/sh
+# Copyright (c) 2012-2016 Codenvy, S.A., Red Hat, Inc
+# 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:
+#   Mario Loriedo - Initial implementation
+#
+
+start_che_server() {
+  if che_container_exist; then
+    error_exit "A container named \"${CHE_SERVER_CONTAINER_NAME}\" already exists. Please remove it manually (docker rm -f ${CHE_SERVER_CONTAINER_NAME}) and try again."
+  fi
+
+  CURRENT_IMAGE=$(docker images -q "${CHE_SERVER_IMAGE_NAME}":"${CHE_VERSION}")
+
+  if [ "${CURRENT_IMAGE}" != "" ]; then
+    info "ECLIPSE CHE: ALREADY HAVE IMAGE ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION}"
+  else
+    update_che_server
+  fi
+
+  info "ECLIPSE CHE: CONTAINER STARTING"
+  docker run -d --name "${CHE_SERVER_CONTAINER_NAME}" \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    -v /home/user/che/lib:/home/user/che/lib-copy \
+    ${CHE_LOCAL_BINARY_ARGS} \
+    -p "${CHE_PORT}":8080 \
+    --restart="${CHE_RESTART_POLICY}" \
+    --user="${CHE_USER}" \
+    ${CHE_CONF_ARGS} \
+    ${CHE_STORAGE_ARGS} \
+    "${CHE_SERVER_IMAGE_NAME}":"${CHE_VERSION}" \
+                --remote:"${CHE_HOST_IP}" \
+                -s:uid \
+                -s:client \
+                ${CHE_DEBUG_OPTION} \
+                run > /dev/null
+
+  wait_until_container_is_running 10
+  if ! che_container_is_running; then
+    error_exit "ECLIPSE CHE: Timeout waiting Che container to start."
+  fi
+
+  info "ECLIPSE CHE: SERVER LOGS AT \"docker logs -f ${CHE_SERVER_CONTAINER_NAME}\""
+  info "ECLIPSE CHE: SERVER BOOTING..."
+  wait_until_server_is_booted 20
+
+  if server_is_booted; then
+    info "ECLIPSE CHE: BOOTED AND REACHABLE"
+    info "ECLIPSE CHE: http://${CHE_HOSTNAME}:${CHE_PORT}"
+  else
+    error_exit "ECLIPSE CHE: Timeout waiting Che server to boot. Run \"docker logs ${CHE_SERVER_CONTAINER_NAME}\" to see the logs."
+  fi
+}
+
+stop_che_server() {
+  if ! che_container_is_running; then
+    info "-------------------------------------------------------"
+    info "ECLIPSE CHE: CONTAINER IS NOT RUNNING. NOTHING TO DO."
+    info "-------------------------------------------------------"
+  else
+    info "ECLIPSE CHE: STOPPING SERVER..."
+    docker exec ${CHE_SERVER_CONTAINER_NAME} /home/user/che/bin/che.sh -c stop > /dev/null 2>&1
+    sleep 5
+    info "ECLIPSE CHE: REMOVING CONTAINER"
+    docker rm -f ${CHE_SERVER_CONTAINER_NAME} > /dev/null 2>&1
+    info "ECLIPSE CHE: STOPPED"
+  fi
+}
+
+restart_che_server() {
+  if che_container_is_running; then
+    stop_che_server
+  fi
+  start_che_server
+}
+
+update_che_server() {
+  if [ -z "${CHE_VERSION}" ]; then
+    CHE_VERSION=${DEFAULT_CHE_VERSION}
+  fi
+
+  info "ECLIPSE CHE: PULLING IMAGE ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION}"
+  execute_command_with_progress extended docker pull ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION}
+  info "ECLIPSE CHE: IMAGE ${CHE_SERVER_IMAGE_NAME}:${CHE_VERSION} INSTALLED"
+}
+
+print_debug_info() {
+  debug "---------------------------------------"
+  debug "---------  CHE DEBUG INFO   -----------"
+  debug "---------------------------------------"
+  debug ""
+  debug "DOCKER_INSTALL_TYPE       = ${DOCKER_INSTALL_TYPE}"
+  debug ""
+  debug "CHE_SERVER_CONTAINER_NAME = ${CHE_SERVER_CONTAINER_NAME}"
+  debug "CHE_SERVER_IMAGE_NAME     = ${CHE_SERVER_IMAGE_NAME}"
+  debug ""
+  VAL=$(if che_container_exist;then echo "YES"; else echo "NO"; fi)
+  debug "CHE CONTAINER EXISTS?     ${VAL}"
+  VAL=$(if che_container_is_running;then echo "YES"; else echo "NO"; fi)
+  debug "CHE CONTAINER IS RUNNING? ${VAL}"
+  VAL=$(if che_container_is_stopped;then echo "YES"; else echo "NO"; fi)
+  debug "CHE CONTAINER IS STOPPED? ${VAL}"
+  VAL=$(if server_is_booted;then echo "YES"; else echo "NO"; fi)
+  debug "CHE SERVER IS BOOTED?     ${VAL}"
+  debug ""
+  debug "CHE_PORT                  = ${CHE_PORT}"
+  debug "CHE_VERSION               = ${CHE_VERSION}"
+  debug "CHE_RESTART_POLICY        = ${CHE_RESTART_POLICY}"
+  debug "CHE_USER                  = ${CHE_USER}"
+  debug "CHE_HOST_IP               = ${CHE_HOST_IP}"
+  debug "CHE_LOG_LEVEL             = ${CHE_LOG_LEVEL}"
+  debug "CHE_HOSTNAME              = ${CHE_HOSTNAME}"
+  debug "CHE_DATA_FOLDER           = ${CHE_DATA_FOLDER}"
+  debug "CHE_CONF_FOLDER           = ${CHE_CONF_FOLDER:-not set}"
+  debug "CHE_LOCAL_BINARY          = ${CHE_LOCAL_BINARY:-not set}"
+  debug ""
+  debug "---------------------------------------"
+  debug "---------------------------------------"
+  debug "---------------------------------------"
+}
diff --git a/dockerfiles/che-launcher/launcher_funcs.sh b/dockerfiles/che-launcher/launcher_funcs.sh
new file mode 100644
index 00000000000..9a00f5f78fc
--- /dev/null
+++ b/dockerfiles/che-launcher/launcher_funcs.sh
@@ -0,0 +1,224 @@
+#!/bin/sh
+# Copyright (c) 2012-2016 Codenvy, S.A., Red Hat, Inc
+# 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:
+#   Mario Loriedo - Initial implementation
+#
+
+usage () {
+  printf "%s" "${USAGE}"
+}
+
+info() {
+  printf  "${GREEN}INFO:${NC} %s\n" "${1}"
+}
+
+debug() {
+  printf  "${BLUE}DEBUG:${NC} %s\n" "${1}"
+}
+
+error() {
+  printf  "${RED}ERROR:${NC} %s\n" "${1}"
+}
+
+error_exit() {
+  echo  "---------------------------------------"
+  error "!!!"
+  error "!!! ${1}"
+  error "!!!"
+  echo  "---------------------------------------"
+  container_self_destruction
+  exit 1
+}
+
+get_clean_path() {
+  INPUT_PATH=$1
+  # \some\path => /some/path
+  OUTPUT_PATH=$(echo ${INPUT_PATH} | tr '\\' '/')
+  # /somepath/ => /somepath
+  OUTPUT_PATH=${OUTPUT_PATH%/}
+  # /some//path => /some/path
+  OUTPUT_PATH=$(echo ${OUTPUT_PATH} | tr -s '/')
+  # "/some/path" => /some/path
+  OUTPUT_PATH=${OUTPUT_PATH//\"}
+  echo ${OUTPUT_PATH}
+}
+
+get_che_launcher_container_id() {
+  hostname
+}
+
+get_che_launcher_version() {
+  LAUNCHER_CONTAINER_ID=$(get_che_launcher_container_id)
+  LAUNCHER_IMAGE_NAME=$(docker inspect --format='{{.Config.Image}}' "${LAUNCHER_CONTAINER_ID}")
+  echo "${LAUNCHER_IMAGE_NAME}" | cut -d : -f2
+}
+
+is_boot2docker() {
+  if uname -r | grep -q 'boot2docker'; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+has_docker_for_windows_ip() {
+  DOCKER_HOST_IP=$(get_docker_host_ip)
+  if [ "${DOCKER_HOST_IP}" = "10.0.75.2" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+is_docker_for_mac() {
+  if uname -r | grep -q 'moby' && ! has_docker_for_windows_ip; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+is_docker_for_windows() {
+  if uname -r | grep -q 'moby' && has_docker_for_windows_ip; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+get_docker_install_type() {
+  if is_boot2docker; then
+    echo "boot2docker"
+  elif is_docker_for_windows; then
+    echo "docker4windows"
+  elif is_docker_for_mac; then
+    echo "docker4mac"
+  else
+    echo "native"
+  fi
+}
+
+get_docker_host_ip() {
+  NETWORK_IF="eth0"
+  if is_boot2docker; then
+    NETWORK_IF="eth1"
+  fi
+
+  docker run --rm --net host \
+            alpine sh -c \
+            "ip a show ${NETWORK_IF}" | \
+            grep 'inet ' | \
+            cut -d/ -f1 | \
+            awk '{ print $2}'
+}
+
+get_che_hostname() {
+  INSTALL_TYPE=$(get_docker_install_type)
+  if [ "${INSTALL_TYPE}" = "boot2docker" ] ||
+     [ "${INSTALL_TYPE}" = "docker4windows" ]; then
+    get_docker_host_ip
+  else
+    echo "localhost"
+  fi
+}
+
+check_docker() {
+  if [ ! -S /var/run/docker.sock ]; then
+    error_exit "Docker socket (/var/run/docker.sock) hasn't be mounted \
+inside the container. Verify the syntax of the \"docker run\" command."
+  fi
+
+  if ! docker ps > /dev/null 2>&1; then
+    output=$(docker ps)
+    error_exit "Error when running \"docker ps\": ${output}"
+  fi
+}
+
+che_container_exist() {
+  if [ "$(docker ps -aq  -f "name=${CHE_SERVER_CONTAINER_NAME}" | wc -l)" = "0" ]; then
+    return 1
+  else
+    return 0
+  fi
+}
+
+che_container_is_running() {
+  if [ "$(docker ps -qa -f "status=running" -f "name=${CHE_SERVER_CONTAINER_NAME}" | wc -l)" = "0" ]; then
+    return 1
+  else
+    return 0
+  fi
+}
+
+che_container_is_stopped() {
+  if [ "$(docker ps -qa -f "status=exited" -f "name=${CHE_SERVER_CONTAINER_NAME}" | wc -l)" = "0" ]; then
+    return 1
+  else
+    return 0
+  fi
+}
+
+wait_until_container_is_running() {
+  CONTAINER_START_TIMEOUT=${1}
+
+  ELAPSED=0
+  until che_container_is_running || [ ${ELAPSED} -eq "${CONTAINER_START_TIMEOUT}" ]; do
+    sleep 1
+    ELAPSED=$((ELAPSED+1))
+  done
+}
+
+server_is_booted() {
+  HTTP_STATUS_CODE=$(curl -I http://"${CHE_HOST_IP}":"${CHE_PORT}"/api/  \
+                     -s -o /dev/null --write-out "%{http_code}")
+  if [ "${HTTP_STATUS_CODE}" = "200" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+wait_until_server_is_booted () {
+  SERVER_BOOT_TIMEOUT=${1}
+
+  ELAPSED=0
+  until server_is_booted || [ ${ELAPSED} -eq "${SERVER_BOOT_TIMEOUT}" ]; do
+    sleep 1
+    ELAPSED=$((ELAPSED+1))
+  done
+}
+
+execute_command_with_progress() {
+  progress=$1
+  command=$2
+  shift 2
+
+  pid=""
+  printf "\n"
+
+  case "$progress" in
+    extended)
+      $command "$@"
+      ;;
+    basic|*)
+      $command "$@" &>/dev/null &
+      pid=$!
+      while kill -0 "$pid" >/dev/null 2>&1; do
+        printf "#"
+        sleep 10
+      done
+      wait $pid # return pid's exit code
+      printf "\n"
+    ;;
+  esac
+  printf "\n"
+}
+
+container_self_destruction() {
+  docker rm -f "$(get_che_launcher_container_id)" > /dev/null 2>&1
+}
diff --git a/dockerfiles/che-launcher/launcher_test.bats b/dockerfiles/che-launcher/launcher_test.bats
new file mode 100644
index 00000000000..01ffcffba47
--- /dev/null
+++ b/dockerfiles/che-launcher/launcher_test.bats
@@ -0,0 +1,40 @@
+#!/usr/bin/env bats
+# Copyright (c) 2012-2016 Codenvy, S.A., Red Hat, Inc
+# 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:
+#   Mario Loriedo - Initial implementation
+#
+# To run the tests:
+#   docker run -w /tests/ -v $PWD:/tests dduportal/bats:0.4.0 /tests/launcher_test.bats
+#
+
+source ./launcher_funcs.sh
+
+@test "clean folder path that is already clean" {
+  result="$(get_clean_path /somefolder)"
+  [ "$result" = "/somefolder" ]
+}
+
+@test "clean folder path with extra slash" {
+  result="$(get_clean_path /somefolder/)"
+  [ "$result" = "/somefolder" ]
+}
+
+@test "clean folder path with two consecutive slashes" {
+  result="$(get_clean_path /some//path)"
+  [ "$result" = "/some/path" ]
+}
+
+@test "clean folder path with backslashes" {
+  result="$(get_clean_path \\some\\path)"
+  [ "$result" = "/some/path" ]
+}
+
+@test "clean folder path with quotes" {
+  result="$(get_clean_path \"/some\"/path\")"
+  [ "$result" = "/some/path" ]
+}

From 48c8f149bc7df9895c84fc9669017ab789d53d6f Mon Sep 17 00:00:00 2001
From: Florent BENOIT <fbenoit@codenvy.com>
Date: Fri, 22 Jul 2016 16:35:52 +0200
Subject: [PATCH 13/16] Allow to continue to start the script even if there is
 a chown failure (#1917)

When mounting a local folder with .git we have the following warnings
chown: changing permission on ....git.idx : permission denied

this new command allow to continue

Change-Id: Idbedd1958e4a60a2aea251d1a657bbcdec063ffb
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
---
 .../main/java/org/eclipse/che/api/deploy/WsMasterModule.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
index 54628a97308..bbc99a60939 100644
--- a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
+++ b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
@@ -64,7 +64,7 @@ protected void configure() {
 
         bindConstant().annotatedWith(Names.named(org.eclipse.che.api.machine.server.wsagent.WsAgentLauncherImpl.WS_AGENT_PROCESS_START_COMMAND))
                       .to("rm -rf ~/che && mkdir -p ~/che && unzip -qq /mnt/che/ws-agent.zip -d ~/che/ws-agent && " +
-                          "sudo chown -R $(id -u -n) /projects && " +
+                          "sudo sh -c \"chown -R $(id -u -n) /projects || true\" && " +
                           "export JPDA_ADDRESS=\"4403\" && ~/che/ws-agent/bin/catalina.sh jpda run");
         bindConstant().annotatedWith(Names.named(org.eclipse.che.plugin.docker.machine.DockerMachineImplTerminalLauncher.START_TERMINAL_COMMAND))
                       .to("mkdir -p ~/che " +

From f63d7a448dc678e87a38dbf6e24b6c80f6831ad1 Mon Sep 17 00:00:00 2001
From: Mihail Kuznyetsov <mkuznyetsov@codenvy.com>
Date: Wed, 20 Jul 2016 19:15:29 +0300
Subject: [PATCH 14/16] EVERREST-83 Update accordingly to the changes in
 Everrest

---
 .../che/api/core/rest/ApiInfoService.java     |  8 ++---
 .../che/everrest/CheMethodInvokerFilter.java  |  8 ++---
 .../che/everrest/ETagResponseFilter.java      |  5 ++-
 .../EverrestDownloadFileResponseFilter.java   |  5 ++-
 .../ServerContainerInitializeListener.java    | 30 +++++++----------
 .../WebSocketMethodInvokerDecorator.java      |  5 ++-
 .../api/core/rest/ServiceDescriptorTest.java  | 16 ++++++---
 .../DownloadFileResponseFilterTest.java       | 21 ++++++------
 .../che/everrest/ETagResponseFilterTest.java  | 21 ++++++------
 .../api/project/server/ProjectService.java    | 30 ++++++++---------
 .../api/project/server/WorkspaceHolder.java   |  4 +--
 .../project/server/ProjectServiceTest.java    | 33 ++++++++++---------
 12 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java
index 80337d9db9a..059e2bf1bc8 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java
@@ -20,7 +20,7 @@
 import org.eclipse.che.dto.server.DtoFactory;
 import org.everrest.core.ObjectFactory;
 import org.everrest.core.ResourceBinder;
-import org.everrest.core.resource.AbstractResourceDescriptor;
+import org.everrest.core.resource.ResourceDescriptor;
 import org.everrest.services.RestServicesList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,11 +85,11 @@ private ApiInfo readApiInfo() throws ServerException {
     public RestServicesList.RootResourcesList listJSON(@Context ServletContext context) {
         ResourceBinder binder = (ResourceBinder)context.getAttribute(ResourceBinder.class.getName());
         return new RestServicesList.RootResourcesList(FluentIterable.from(binder.getResources()).transform(
-                new Function<ObjectFactory<AbstractResourceDescriptor>, RestServicesList.RootResource>() {
+                new Function<ObjectFactory<ResourceDescriptor>, RestServicesList.RootResource>() {
                     @Nullable
                     @Override
-                    public RestServicesList.RootResource apply(ObjectFactory<AbstractResourceDescriptor> input) {
-                        AbstractResourceDescriptor descriptor = input.getObjectModel();
+                    public RestServicesList.RootResource apply(ObjectFactory<ResourceDescriptor> input) {
+                        ResourceDescriptor descriptor = input.getObjectModel();
                         return new RestServicesList.RootResource(descriptor.getObjectClass().getName(), //
                                                                  descriptor.getPathValue().getPath(), //
                                                                  descriptor.getUriPattern().getRegex());
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheMethodInvokerFilter.java b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheMethodInvokerFilter.java
index 8679a19ab3f..0a2e65e1302 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheMethodInvokerFilter.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/CheMethodInvokerFilter.java
@@ -19,7 +19,7 @@
 import org.eclipse.che.api.core.UnauthorizedException;
 import org.eclipse.che.dto.server.DtoFactory;
 import org.everrest.core.method.MethodInvokerFilter;
-import org.everrest.core.resource.GenericMethodResource;
+import org.everrest.core.resource.GenericResourceMethod;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
@@ -33,7 +33,7 @@
  */
 public abstract class CheMethodInvokerFilter implements MethodInvokerFilter {
     @Override
-    public void accept(GenericMethodResource genericMethodResource, Object[] arguments) throws WebApplicationException {
+    public void accept(GenericResourceMethod genericMethodResource, Object[] arguments) throws WebApplicationException {
         try {
             filter(genericMethodResource, arguments);
         } catch (ApiException exception) {
@@ -83,11 +83,11 @@ else if (exception instanceof BadRequestException) {
      * Check does supplied method can be invoked.
      *
      * @param genericMethodResource
-     *         See {@link GenericMethodResource}
+     *         See {@link GenericResourceMethod}
      * @param arguments
      *         actual method arguments that were created from request
      * @throws ApiException
      *         if method can not be invoked cause current environment context, e.g. for current user, with current request attributes, etc.
      */
-    protected abstract void filter(GenericMethodResource genericMethodResource, Object[] arguments) throws ApiException;
+    protected abstract void filter(GenericResourceMethod genericMethodResource, Object[] arguments) throws ApiException;
 }
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ETagResponseFilter.java b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ETagResponseFilter.java
index 81bef1ccb78..a5fcf9ce1c2 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ETagResponseFilter.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ETagResponseFilter.java
@@ -20,7 +20,6 @@
 import org.everrest.core.Filter;
 import org.everrest.core.GenericContainerResponse;
 import org.everrest.core.ResponseFilter;
-import org.everrest.core.impl.ApplicationContextImpl;
 
 import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.EntityTag;
@@ -55,7 +54,7 @@ public enum EntityType {
      * Filter the given container response
      *
      * @param containerResponse
-     *         the reponse to use
+     *         the response to use
      */
     public void doFilter(GenericContainerResponse containerResponse) {
 
@@ -73,7 +72,7 @@ public void doFilter(GenericContainerResponse containerResponse) {
         }
 
         // Get the request
-        ApplicationContext applicationContext = ApplicationContextImpl.getCurrent();
+        ApplicationContext applicationContext = ApplicationContext.getCurrent();
         Request request = applicationContext.getRequest();
 
         // manage only GET requests
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/EverrestDownloadFileResponseFilter.java b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/EverrestDownloadFileResponseFilter.java
index 94898dfd9c7..15e21bed4ee 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/EverrestDownloadFileResponseFilter.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/EverrestDownloadFileResponseFilter.java
@@ -15,7 +15,6 @@
 import org.everrest.core.Filter;
 import org.everrest.core.GenericContainerResponse;
 import org.everrest.core.ResponseFilter;
-import org.everrest.core.impl.ApplicationContextImpl;
 
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
@@ -33,13 +32,13 @@ public class EverrestDownloadFileResponseFilter extends DownloadFileResponseFilt
      * Filter the given container response.
      *
      * @param containerResponse
-     *         the reponse to use
+     *         the response to use
      */
     public void doFilter(GenericContainerResponse containerResponse) {
         containerResponse.getResponse();
 
         // Get the request
-        ApplicationContext applicationContext = ApplicationContextImpl.getCurrent();
+        ApplicationContext applicationContext = ApplicationContext.getCurrent();
         Request request = applicationContext.getRequest();
 
         // Apply header if all if correct
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ServerContainerInitializeListener.java b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ServerContainerInitializeListener.java
index 6374ce5cca8..12e224c3ff9 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ServerContainerInitializeListener.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/ServerContainerInitializeListener.java
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.che.everrest;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
 import org.eclipse.che.commons.env.EnvironmentContext;
 import org.eclipse.che.commons.subject.Subject;
 import org.everrest.core.DependencySupplier;
@@ -18,6 +21,8 @@
 import org.everrest.core.impl.EverrestConfiguration;
 import org.everrest.core.impl.EverrestProcessor;
 import org.everrest.core.impl.ProviderBinder;
+import org.everrest.core.impl.RequestDispatcher;
+import org.everrest.core.impl.RequestHandlerImpl;
 import org.everrest.core.impl.provider.json.JsonException;
 import org.everrest.core.tools.SimplePrincipal;
 import org.everrest.core.tools.SimpleSecurityContext;
@@ -47,14 +52,10 @@
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicLong;
 
 import static javax.websocket.server.ServerEndpointConfig.Builder.create;
 import static javax.websocket.server.ServerEndpointConfig.Configurator;
 
-import com.google.common.base.MoreObjects;
-
 /**
  * @author andrew00x
  */
@@ -66,8 +67,6 @@ public class ServerContainerInitializeListener implements ServletContextListener
     public static final String EXECUTOR_ATTRIBUTE           = "everrest.Executor";
     public static final String SECURITY_CONTEXT             = SecurityContext.class.getName();
 
-    private static final AtomicLong sequence = new AtomicLong(1);
-
     private WebApplicationDeclaredRoles webApplicationDeclaredRoles;
     private EverrestConfiguration       everrestConfiguration;
     private ServerEndpointConfig        wsServerEndpointConfig;
@@ -161,9 +160,10 @@ protected EverrestProcessor getEverrestProcessor(ServletContext servletContext)
         final DependencySupplier dependencies = (DependencySupplier)servletContext.getAttribute(DependencySupplier.class.getName());
         final ResourceBinder resources = (ResourceBinder)servletContext.getAttribute(ResourceBinder.class.getName());
         final ProviderBinder providers = (ProviderBinder)servletContext.getAttribute(ApplicationProviderBinder.class.getName());
-        final EverrestConfiguration copy = getEverrestConfiguration(servletContext);
-        copy.setProperty(EverrestConfiguration.METHOD_INVOKER_DECORATOR_FACTORY, WebSocketMethodInvokerDecoratorFactory.class.getName());
-        return new EverrestProcessor(resources, providers, dependencies, copy, null);
+        final EverrestConfiguration copyOfEverrestConfiguration = new EverrestConfiguration(getEverrestConfiguration(servletContext));
+        copyOfEverrestConfiguration.setProperty(EverrestConfiguration.METHOD_INVOKER_DECORATOR_FACTORY, WebSocketMethodInvokerDecoratorFactory.class.getName());
+        final RequestHandlerImpl requestHandler = new RequestHandlerImpl(new RequestDispatcher(resources), providers);
+        return new EverrestProcessor(copyOfEverrestConfiguration, dependencies, requestHandler, null);
     }
 
     protected EverrestConfiguration getEverrestConfiguration(ServletContext servletContext) {
@@ -172,15 +172,9 @@ protected EverrestConfiguration getEverrestConfiguration(ServletContext servletC
 
     protected ExecutorService createExecutor(final ServletContext servletContext) {
         final EverrestConfiguration everrestConfiguration = getEverrestConfiguration(servletContext);
-        return Executors.newFixedThreadPool(everrestConfiguration.getAsynchronousPoolSize(), new ThreadFactory() {
-            @Override
-            public Thread newThread(Runnable r) {
-                final Thread t =
-                        new Thread(r, "everrest.WSConnection." + servletContext.getServletContextName() + sequence.getAndIncrement());
-                t.setDaemon(true);
-                return t;
-            }
-        });
+        final String threadNameFormat = "everrest.WSConnection." + servletContext.getServletContextName() + "-%d";
+        return Executors.newFixedThreadPool(everrestConfiguration.getAsynchronousPoolSize(),
+                                            new ThreadFactoryBuilder().setNameFormat(threadNameFormat).setDaemon(true).build());
     }
 
     protected SecurityContext createSecurityContext(final HandshakeRequest req) {
diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java
index e4abda6b033..eba9e357888 100644
--- a/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java
+++ b/core/che-core-api-core/src/main/java/org/eclipse/che/everrest/WebSocketMethodInvokerDecorator.java
@@ -17,8 +17,7 @@
 import org.everrest.core.ApplicationContext;
 import org.everrest.core.impl.method.MethodInvokerDecorator;
 import org.everrest.core.method.MethodInvoker;
-import org.everrest.core.resource.GenericMethodResource;
-import org.everrest.websockets.ServerContainerInitializeListener;
+import org.everrest.core.resource.GenericResourceMethod;
 import org.everrest.websockets.WSConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,7 +35,7 @@ class WebSocketMethodInvokerDecorator extends MethodInvokerDecorator {
     }
 
     @Override
-    public Object invokeMethod(Object resource, GenericMethodResource genericMethodResource, ApplicationContext context) {
+    public Object invokeMethod(Object resource, GenericResourceMethod genericMethodResource, ApplicationContext context) {
         WSConnection wsConnection = (WSConnection)org.everrest.core.impl.EnvironmentContext.getCurrent().get(WSConnection.class);
         if (wsConnection != null) {
 
diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/ServiceDescriptorTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/ServiceDescriptorTest.java
index 1dbc6e13c1d..e3180aa9178 100644
--- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/ServiceDescriptorTest.java
+++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/ServiceDescriptorTest.java
@@ -18,13 +18,15 @@
 import org.eclipse.che.api.core.rest.shared.dto.Link;
 import org.eclipse.che.api.core.rest.shared.dto.LinkParameter;
 import org.eclipse.che.api.core.rest.shared.dto.ServiceDescriptor;
+import org.everrest.core.ApplicationContext;
 import org.everrest.core.ResourceBinder;
-import org.everrest.core.impl.ApplicationContextImpl;
 import org.everrest.core.impl.ApplicationProviderBinder;
 import org.everrest.core.impl.ContainerResponse;
 import org.everrest.core.impl.EverrestConfiguration;
 import org.everrest.core.impl.EverrestProcessor;
 import org.everrest.core.impl.ProviderBinder;
+import org.everrest.core.impl.RequestDispatcher;
+import org.everrest.core.impl.RequestHandlerImpl;
 import org.everrest.core.impl.ResourceBinderImpl;
 import org.everrest.core.tools.DependencySupplierImpl;
 import org.everrest.core.tools.ResourceLauncher;
@@ -40,12 +42,13 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.MediaType;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static org.everrest.core.ApplicationContext.anApplicationContext;
+
 /** @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> */
 public class ServiceDescriptorTest {
     final String BASE_URI    = "http://localhost/service";
@@ -91,11 +94,14 @@ public void setUp() throws Exception {
         DependencySupplierImpl dependencies = new DependencySupplierImpl();
         ResourceBinder resources = new ResourceBinderImpl();
         ProviderBinder providers = new ApplicationProviderBinder();
-        EverrestProcessor processor = new EverrestProcessor(resources,providers,dependencies,new EverrestConfiguration(), null);
+        EverrestProcessor processor = new EverrestProcessor(new EverrestConfiguration(),
+                                                            dependencies,
+                                                            new RequestHandlerImpl(new RequestDispatcher(resources), providers),
+                                                            null);
         launcher = new ResourceLauncher(processor);
         processor.addApplication(new Deployer());
-        ApplicationContextImpl.setCurrent(new ApplicationContextImpl(null, null, ProviderBinder.getInstance()));
-        System.out.println("initilize");
+        ApplicationContext.setCurrent(anApplicationContext().withProviders(providers).build());
+        System.out.println("initialized");
     }
 
     @Test
diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/DownloadFileResponseFilterTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/DownloadFileResponseFilterTest.java
index 14a61e66ff3..a22f96e093a 100644
--- a/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/DownloadFileResponseFilterTest.java
+++ b/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/DownloadFileResponseFilterTest.java
@@ -12,12 +12,14 @@
 
 import org.eclipse.che.api.core.rest.ApiExceptionMapper;
 import org.eclipse.che.api.core.rest.DownloadFileResponseFilter;
-import org.everrest.core.impl.ApplicationContextImpl;
+import org.everrest.core.ApplicationContext;
 import org.everrest.core.impl.ApplicationProviderBinder;
 import org.everrest.core.impl.ContainerRequest;
 import org.everrest.core.impl.ContainerResponse;
 import org.everrest.core.impl.EverrestConfiguration;
 import org.everrest.core.impl.EverrestProcessor;
+import org.everrest.core.impl.RequestDispatcher;
+import org.everrest.core.impl.RequestHandlerImpl;
 import org.everrest.core.impl.ResourceBinderImpl;
 import org.everrest.core.tools.DependencySupplierImpl;
 import org.everrest.core.tools.ResourceLauncher;
@@ -39,6 +41,7 @@
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static javax.ws.rs.core.Response.Status.OK;
+import static org.everrest.core.ApplicationContext.anApplicationContext;
 import static org.testng.Assert.assertEquals;
 
 /**
@@ -105,18 +108,16 @@ public void before() throws Exception {
         final ResourceBinderImpl resources = new ResourceBinderImpl();
         resources.addResource(MyJaxRSService.class, null);
         final DependencySupplierImpl dependencies = new DependencySupplierImpl();
-        final ApplicationProviderBinder binder = new ApplicationProviderBinder();
-        binder.addExceptionMapper(ApiExceptionMapper.class);
-        binder.addResponseFilter(EverrestDownloadFileResponseFilter.class);
+        final ApplicationProviderBinder providers = new ApplicationProviderBinder();
+        providers.addExceptionMapper(ApiExceptionMapper.class);
+        providers.addResponseFilter(EverrestDownloadFileResponseFilter.class);
         final URI uri = new URI(BASE_URI);
         final ContainerRequest req = new ContainerRequest(null, uri, uri, null, null, null);
-        final ApplicationContextImpl contextImpl = new ApplicationContextImpl(req, null, binder);
-        contextImpl.setDependencySupplier(dependencies);
-        ApplicationContextImpl.setCurrent(contextImpl);
-        final EverrestProcessor processor = new EverrestProcessor(resources,
-                                                                  binder,
+        final ApplicationContext context = anApplicationContext().withRequest(req).withProviders(providers).withDependencySupplier(dependencies).build();
+        ApplicationContext.setCurrent(context);
+        final EverrestProcessor processor = new EverrestProcessor(new EverrestConfiguration(),
                                                                   dependencies,
-                                                                  new EverrestConfiguration(),
+                                                                  new RequestHandlerImpl(new RequestDispatcher(resources), providers),
                                                                   null);
         resourceLauncher = new ResourceLauncher(processor);
     }
diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/ETagResponseFilterTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/ETagResponseFilterTest.java
index 46388d3bba2..fe9e6e3c49e 100644
--- a/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/ETagResponseFilterTest.java
+++ b/core/che-core-api-core/src/test/java/org/eclipse/che/everrest/ETagResponseFilterTest.java
@@ -11,12 +11,14 @@
 package org.eclipse.che.everrest;
 
 import org.eclipse.che.api.core.rest.ApiExceptionMapper;
-import org.everrest.core.impl.ApplicationContextImpl;
+import org.everrest.core.ApplicationContext;
 import org.everrest.core.impl.ApplicationProviderBinder;
 import org.everrest.core.impl.ContainerRequest;
 import org.everrest.core.impl.ContainerResponse;
 import org.everrest.core.impl.EverrestConfiguration;
 import org.everrest.core.impl.EverrestProcessor;
+import org.everrest.core.impl.RequestDispatcher;
+import org.everrest.core.impl.RequestHandlerImpl;
 import org.everrest.core.impl.ResourceBinderImpl;
 import org.everrest.core.tools.DependencySupplierImpl;
 import org.everrest.core.tools.ResourceLauncher;
@@ -31,7 +33,6 @@
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
-
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
@@ -42,6 +43,7 @@
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static javax.ws.rs.core.Response.Status.NOT_MODIFIED;
 import static javax.ws.rs.core.Response.Status.OK;
+import static org.everrest.core.ApplicationContext.anApplicationContext;
 import static org.testng.Assert.assertEquals;
 
 /**
@@ -109,18 +111,17 @@ public void before() throws Exception {
         final ResourceBinderImpl resources = new ResourceBinderImpl();
         resources.addResource(MyJaxRSService.class, null);
         final DependencySupplierImpl dependencies = new DependencySupplierImpl();
-        final ApplicationProviderBinder binder = new ApplicationProviderBinder();
-        binder.addExceptionMapper(ApiExceptionMapper.class);
-        binder.addResponseFilter(ETagResponseFilter.class);
+        final ApplicationProviderBinder providers = new ApplicationProviderBinder();
+        providers.addExceptionMapper(ApiExceptionMapper.class);
+        providers.addResponseFilter(ETagResponseFilter.class);
         final URI uri = new URI(BASE_URI);
         final ContainerRequest req = new ContainerRequest(null, uri, uri, null, null, null);
-        final ApplicationContextImpl contextImpl = new ApplicationContextImpl(req, null, binder);
+        final ApplicationContext contextImpl = anApplicationContext().withRequest(req).withProviders(providers).build();
         contextImpl.setDependencySupplier(dependencies);
-        ApplicationContextImpl.setCurrent(contextImpl);
-        final EverrestProcessor processor = new EverrestProcessor(resources,
-                                                                  binder,
+        ApplicationContext.setCurrent(contextImpl);
+        final EverrestProcessor processor = new EverrestProcessor(new EverrestConfiguration(),
                                                                   dependencies,
-                                                                  new EverrestConfiguration(),
+                                                                  new RequestHandlerImpl(new RequestDispatcher(resources), providers),
                                                                   null);
         resourceLauncher = new ResourceLauncher(processor);
     }
diff --git a/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java b/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java
index ab9013ca579..5458ca02494 100644
--- a/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java
+++ b/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectService.java
@@ -348,7 +348,7 @@ public Response createFile(@ApiParam(value = "Path to a target directory", requi
 
         final URI location = getServiceContext().getServiceUriBuilder().clone()
                                                 .path(getClass(), "getFile")
-                                                .build(newFile.getPath().toString().substring(1));
+                                                .build(new String[]{newFile.getPath().toString().substring(1)}, false);
         return Response.created(location)
                        .entity(injectFileLinks(asDto(newFile)))
                        .build();
@@ -372,7 +372,7 @@ public Response createFolder(@ApiParam(value = "Path to a new folder destination
         final FolderEntry newFolder = projectManager.getProjectsRoot().createFolder(path);
         final URI location = getServiceContext().getServiceUriBuilder().clone()
                                                 .path(getClass(), "getChildren")
-                                                .build(newFolder.getPath().toString().substring(1));
+                                                .build(new String[]{newFolder.getPath().toString().substring(1)}, false);
 
         eventService.publish(new ProjectItemModifiedEvent(ProjectItemModifiedEvent.EventType.CREATED,
                                                           workspace,
@@ -520,7 +520,7 @@ public Response copy(@ApiParam("Path to a resource") @PathParam("path") String p
 
         final URI location = getServiceContext().getServiceUriBuilder()
                                                 .path(getClass(), copy.isFile() ? "getFile" : "getChildren")
-                                                .build(copy.getPath().toString().substring(1));
+                                                .build(new String[]{copy.getPath().toString().substring(1)}, false);
 
         if (copy.isFolder()) {
             try {
@@ -567,7 +567,7 @@ public Response move(@ApiParam("Path to a resource to be moved") @PathParam("pat
 
         final URI location = getServiceContext().getServiceUriBuilder()
                                                 .path(getClass(), move.isFile() ? "getFile" : "getChildren")
-                                                .build(move.getPath().toString().substring(1));
+                                                .build(new String[]{move.getPath().toString().substring(1)}, false);
 
         eventService.publish(new ProjectItemModifiedEvent(ProjectItemModifiedEvent.EventType.MOVED,
                                                           workspace,
@@ -678,7 +678,7 @@ public Response importZip(@ApiParam(value = "Path to a location (where import to
 
         return Response.created(getServiceContext().getServiceUriBuilder()
                                                    .path(getClass(), "getChildren")
-                                                   .build(parent.getPath().toString().substring(1))).build();
+                                                   .build(new String[]{parent.getPath().toString().substring(1)}, false)).build();
     }
 
     @GET
@@ -1032,14 +1032,14 @@ private ItemReference injectFileLinks(ItemReference itemReference) {
         links.add(createLink(GET,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "getFile")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              APPLICATION_JSON,
                              LINK_REL_GET_CONTENT));
         links.add(createLink(PUT,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "updateFile")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              MediaType.WILDCARD,
                              null,
@@ -1047,7 +1047,7 @@ private ItemReference injectFileLinks(ItemReference itemReference) {
         links.add(createLink(DELETE,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "delete")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              LINK_REL_DELETE));
 
@@ -1062,21 +1062,21 @@ private ItemReference injectFolderLinks(ItemReference itemReference) {
         links.add(createLink(GET,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "getChildren")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              APPLICATION_JSON,
                              LINK_REL_CHILDREN));
         links.add(createLink(GET,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "getTree")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              APPLICATION_JSON,
                              LINK_REL_TREE));
         links.add(createLink(DELETE,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "delete")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              LINK_REL_DELETE));
 
@@ -1091,7 +1091,7 @@ private ProjectConfigDto injectProjectLinks(ProjectConfigDto projectConfig) {
         links.add(createLink(PUT,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "updateProject")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              APPLICATION_JSON,
                              APPLICATION_JSON,
@@ -1099,21 +1099,21 @@ private ProjectConfigDto injectProjectLinks(ProjectConfigDto projectConfig) {
         links.add(createLink(GET,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "getChildren")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              APPLICATION_JSON,
                              LINK_REL_CHILDREN));
         links.add(createLink(GET,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "getTree")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              APPLICATION_JSON,
                              LINK_REL_TREE));
         links.add(createLink(DELETE,
                              uriBuilder.clone()
                                        .path(ProjectService.class, "delete")
-                                       .build(relPath)
+                                       .build(new String[]{relPath}, false)
                                        .toString(),
                              LINK_REL_DELETE));
 
diff --git a/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java b/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java
index 68f62b890c3..3800e49983e 100644
--- a/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java
+++ b/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java
@@ -108,7 +108,7 @@ protected void updateProject(ProjectConfig project) throws ServerException {
         final String href = UriBuilder.fromUri(apiEndpoint)
                                       .path(WorkspaceService.class)
                                       .path(WorkspaceService.class, "updateProject")
-                                      .build(workspaceId, project.getPath()).toString();
+                                      .build(new String[] {workspaceId, project.getPath()}, false).toString();
         try {
             httpJsonRequestFactory.fromUrl(href).usePutMethod().setBody(asDto(project)).request();
         } catch (IOException | ApiException e) {
@@ -123,7 +123,7 @@ protected void removeProject(ProjectConfig project) throws ServerException {
          final String href = UriBuilder.fromUri(apiEndpoint)
                                       .path(WorkspaceService.class)
                                       .path(WorkspaceService.class, "deleteProject")
-                                      .build(workspaceId, project.getPath()).toString();
+                                      .build(new String[] {workspaceId, project.getPath()}, false).toString();
         try {
             httpJsonRequestFactory.fromUrl(href).useDeleteMethod().request();
         } catch (IOException | ApiException e) {
diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java
index d2bb1e393f8..e9ffee8ce08 100644
--- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java
+++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.che.api.project.server;
 
-import org.eclipse.che.WorkspaceIdProvider;
 import org.eclipse.che.api.core.ConflictException;
 import org.eclipse.che.api.core.ForbiddenException;
 import org.eclipse.che.api.core.NotFoundException;
@@ -42,13 +41,10 @@
 import org.eclipse.che.api.project.shared.dto.TreeElement;
 import org.eclipse.che.api.user.server.spi.UserDao;
 import org.eclipse.che.api.vfs.VirtualFile;
-import org.eclipse.che.api.vfs.VirtualFileSystem;
 import org.eclipse.che.api.vfs.impl.file.DefaultFileWatcherNotificationHandler;
 import org.eclipse.che.api.vfs.impl.file.FileTreeWatcher;
 import org.eclipse.che.api.vfs.impl.file.FileWatcherNotificationHandler;
 import org.eclipse.che.api.vfs.impl.file.LocalVirtualFileSystemProvider;
-import org.eclipse.che.api.vfs.search.Searcher;
-import org.eclipse.che.api.vfs.search.SearcherProvider;
 import org.eclipse.che.api.vfs.search.impl.FSLuceneSearcherProvider;
 import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto;
 import org.eclipse.che.api.workspace.shared.dto.SourceStorageDto;
@@ -57,16 +53,17 @@
 import org.eclipse.che.commons.json.JsonHelper;
 import org.eclipse.che.commons.lang.IoUtil;
 import org.eclipse.che.commons.lang.ws.rs.ExtMediaType;
-import org.eclipse.che.commons.test.SelfReturningAnswer;
 import org.eclipse.che.commons.subject.SubjectImpl;
+import org.eclipse.che.commons.test.SelfReturningAnswer;
 import org.eclipse.che.dto.server.DtoFactory;
+import org.everrest.core.ApplicationContext;
 import org.everrest.core.ResourceBinder;
-import org.everrest.core.impl.ApplicationContextImpl;
-import org.everrest.core.impl.ApplicationProviderBinder;
 import org.everrest.core.impl.ContainerResponse;
 import org.everrest.core.impl.EverrestConfiguration;
 import org.everrest.core.impl.EverrestProcessor;
 import org.everrest.core.impl.ProviderBinder;
+import org.everrest.core.impl.RequestDispatcher;
+import org.everrest.core.impl.RequestHandlerImpl;
 import org.everrest.core.impl.ResourceBinderImpl;
 import org.everrest.core.tools.ByteArrayContainerResponseWriter;
 import org.everrest.core.tools.DependencySupplierImpl;
@@ -114,6 +111,7 @@
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
 import static org.eclipse.che.commons.lang.ws.rs.ExtMediaType.APPLICATION_ZIP;
+import static org.everrest.core.ApplicationContext.anApplicationContext;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -249,16 +247,19 @@ public void setUp() throws Exception {
         DependencySupplierImpl dependencies = new DependencySupplierImpl();
 
 
-        dependencies.addComponent(ProjectTypeRegistry.class, ptRegistry);
-        dependencies.addComponent(UserDao.class, userDao);
-        dependencies.addComponent(ProjectManager.class, pm);
-        dependencies.addComponent(ProjectImporterRegistry.class, importerRegistry);
-        dependencies.addComponent(ProjectHandlerRegistry.class, phRegistry);
-        dependencies.addComponent(EventService.class, eventService);
+        dependencies.addInstance(ProjectTypeRegistry.class, ptRegistry);
+        dependencies.addInstance(UserDao.class, userDao);
+        dependencies.addInstance(ProjectManager.class, pm);
+        dependencies.addInstance(ProjectImporterRegistry.class, importerRegistry);
+        dependencies.addInstance(ProjectHandlerRegistry.class, phRegistry);
+        dependencies.addInstance(EventService.class, eventService);
 
         ResourceBinder resources = new ResourceBinderImpl();
-        ProviderBinder providers = new ApplicationProviderBinder();
-        EverrestProcessor processor = new EverrestProcessor(resources, providers, dependencies, new EverrestConfiguration(), null);
+        ProviderBinder providers = ProviderBinder.getInstance();
+        EverrestProcessor processor = new EverrestProcessor(new EverrestConfiguration(),
+                                                            dependencies,
+                                                            new RequestHandlerImpl(new RequestDispatcher(resources), providers),
+                                                            null);
         launcher = new ResourceLauncher(processor);
 
         processor.addApplication(new Application() {
@@ -273,7 +274,7 @@ public Set<Object> getSingletons() {
             }
         });
 
-        ApplicationContextImpl.setCurrent(new ApplicationContextImpl(null, null, ProviderBinder.getInstance()));
+        ApplicationContext.setCurrent(anApplicationContext().withProviders(providers).build());
 
         env = org.eclipse.che.commons.env.EnvironmentContext.getCurrent();
     }

From 5feed9afdc96b4e364f128a9fc59080a7bd8b0d2 Mon Sep 17 00:00:00 2001
From: Mihail Kuznyetsov <mkuznyetsov@codenvy.com>
Date: Thu, 7 Jul 2016 12:37:27 +0300
Subject: [PATCH 15/16] CODENVY-651 Save machine config with 'dev' instead of
 'isDev' field

---
 .../server/model/impl/MachineConfigImpl.java  | 24 +++++++++----------
 .../workspace/server/stack/StackLoader.java   |  3 +--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/model/impl/MachineConfigImpl.java b/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/model/impl/MachineConfigImpl.java
index eb31c55ebaf..31446fe7b36 100644
--- a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/model/impl/MachineConfigImpl.java
+++ b/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/model/impl/MachineConfigImpl.java
@@ -33,7 +33,7 @@ public static MachineConfigImplBuilder builder() {
         return new MachineConfigImplBuilder();
     }
 
-    private boolean              isDev;
+    private boolean              dev;
     private String               name;
     private String               type;
     private MachineSourceImpl    source;
@@ -44,14 +44,14 @@ public static MachineConfigImplBuilder builder() {
     public MachineConfigImpl() {
     }
 
-    public MachineConfigImpl(boolean isDev,
+    public MachineConfigImpl(boolean dev,
                              String name,
                              String type,
                              MachineSource source,
                              Limits limits,
                              List<? extends ServerConf> servers,
                              Map<String, String> envVariables) {
-        this.isDev = isDev;
+        this.dev = dev;
         this.name = name;
         this.type = type;
         this.envVariables = envVariables;
@@ -97,7 +97,7 @@ public void setSource(MachineSource machineSource) {
 
     @Override
     public boolean isDev() {
-        return isDev;
+        return dev;
     }
 
     @Override
@@ -135,7 +135,7 @@ public boolean equals(Object obj) {
         if (this == obj) return true;
         if (!(obj instanceof MachineConfigImpl)) return false;
         final MachineConfigImpl other = (MachineConfigImpl)obj;
-        return isDev == other.isDev &&
+        return dev == other.dev &&
                Objects.equals(name, other.name) &&
                Objects.equals(source, other.source) &&
                Objects.equals(limits, other.limits) &&
@@ -147,7 +147,7 @@ public boolean equals(Object obj) {
     @Override
     public int hashCode() {
         int hash = 7;
-        hash = hash * 31 + Boolean.hashCode(isDev);
+        hash = hash * 31 + Boolean.hashCode(dev);
         hash = hash * 31 + Objects.hashCode(name);
         hash = hash * 31 + Objects.hashCode(type);
         hash = hash * 31 + Objects.hashCode(source);
@@ -160,7 +160,7 @@ public int hashCode() {
     @Override
     public String toString() {
         return "MachineConfigImpl{" +
-               "isDev=" + isDev +
+               "dev=" + dev +
                ", name='" + name + '\'' +
                ", type='" + type + '\'' +
                ", source=" + source +
@@ -177,7 +177,7 @@ public String toString() {
      */
     public static class MachineConfigImplBuilder {
 
-        private boolean                    isDev;
+        private boolean                    dev;
         private String                     name;
         private String                     type;
         private MachineSource              source;
@@ -186,7 +186,7 @@ public static class MachineConfigImplBuilder {
         private Map<String, String>        envVariables;
 
         public MachineConfigImpl build() {
-            return new MachineConfigImpl(isDev,
+            return new MachineConfigImpl(dev,
                                          name,
                                          type,
                                          source,
@@ -196,7 +196,7 @@ public MachineConfigImpl build() {
         }
 
         public MachineConfigImplBuilder fromConfig(MachineConfig machineConfig) {
-            isDev = machineConfig.isDev();
+            dev = machineConfig.isDev();
             name = machineConfig.getName();
             type = machineConfig.getType();
             source = machineConfig.getSource();
@@ -206,8 +206,8 @@ public MachineConfigImplBuilder fromConfig(MachineConfig machineConfig) {
             return this;
         }
 
-        public MachineConfigImplBuilder setDev(boolean isDev) {
-            this.isDev = isDev;
+        public MachineConfigImplBuilder setDev(boolean dev) {
+            this.dev = dev;
             return this;
         }
 
diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java
index d130ca44ebe..3bdb55ea40e 100644
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java
@@ -61,8 +61,7 @@ public StackLoader(@Named("che.stacks.default") String stacksPath,
         this.stackIconFolderPath = Paths.get(stackIconFolder);
         this.stackDao = stackDao;
 
-        //TODO remove this strategy after fix https://jira.codenvycorp.com/browse/CODENVY-651
-        GSON = new GsonBuilder().setFieldNamingStrategy(field -> field.getName().equals("isDev") ? "dev" : field.getName()).create();
+        GSON = new GsonBuilder().create();
     }
 
     /**

From 99afebd475d75ecc4581aa180ea675f2cadf0e41 Mon Sep 17 00:00:00 2001
From: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>
Date: Mon, 25 Jul 2016 13:10:30 +0300
Subject: [PATCH 16/16] Provide correct content url link for the image

Signed-off-by: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>
---
 .../java/org/eclipse/che/ide/imageviewer/ImageViewer.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java
index 8acd954f370..57b91f5670c 100644
--- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java
+++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java
@@ -31,6 +31,7 @@
 import org.eclipse.che.ide.api.editor.EditorInput;
 import org.eclipse.che.ide.api.event.FileEvent;
 import org.eclipse.che.ide.api.event.FileEventHandler;
+import org.eclipse.che.ide.api.machine.WsAgentURLModifier;
 import org.eclipse.che.ide.api.parts.WorkspaceAgent;
 import org.vectomatic.dom.svg.ui.SVGResource;
 
@@ -47,6 +48,7 @@ public class ImageViewer extends AbstractEditorPresenter implements FileEventHan
     private CoreLocalizationConstant constant;
     private DialogFactory            dialogFactory;
     private WorkspaceAgent           workspaceAgent;
+    private WsAgentURLModifier       urlModifier;
     private ScrollPanel              editorView;
 
     @Inject
@@ -54,11 +56,13 @@ public ImageViewer(ImageViewerResources resources,
                        CoreLocalizationConstant constant,
                        DialogFactory dialogFactory,
                        EventBus eventBus,
-                       WorkspaceAgent workspaceAgent) {
+                       WorkspaceAgent workspaceAgent,
+                       WsAgentURLModifier urlModifier) {
         this.resources = resources;
         this.constant = constant;
         this.dialogFactory = dialogFactory;
         this.workspaceAgent = workspaceAgent;
+        this.urlModifier = urlModifier;
 
         resources.imageViewerCss().ensureInjected();
 
@@ -150,7 +154,7 @@ public void go(AcceptsOneWidget container) {
      * @return {@link Image}
      */
     private Image getImage() {
-        String contentLink = input.getFile().getContentUrl();
+        String contentLink = urlModifier.modify(input.getFile().getContentUrl());
         Image image = (contentLink != null) ? new Image(contentLink) : new Image();
         image.setStyleName(resources.imageViewerCss().imageViewer());
         return image;