IDEX-3726: adopt ws agent to run it as common machine process

eclipse-che · Dec 25, 2015 · 1a5ee0d · 1a5ee0d
1 parent 2815a83
commit 1a5ee0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/assembly-ide-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java b/assembly-ide-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java
@@ -113,9 +113,9 @@ protected void configure() {
                    .addBinding()
                    .toInstance("predefined-recipes.json");
 
-        bindConstant().annotatedWith(Names.named(DockerMachineExtServerLauncher.START_EXT_SERVER_COMMAND))
+        bindConstant().annotatedWith(Names.named(DockerMachineExtServerLauncher.WS_AGENT_PROCESS_START_COMMAND))
                       .to("rm -rf ~/che && mkdir -p ~/che && unzip /mnt/che/ext-server.zip -d ~/che/ext-server && " +
-                          "export JPDA_ADDRESS=\"4403\" && ~/che/ext-server/bin/catalina.sh jpda start");
+                          "export JPDA_ADDRESS=\"4403\" && ~/che/ext-server/bin/catalina.sh jpda run");
 
         install(new org.eclipse.che.plugin.docker.machine.ext.LocalStorageModule());
 

diff --git a/assembly-ide-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties b/assembly-ide-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties
@@ -79,5 +79,4 @@ machine.docker.che_api.endpoint=http://che-host:8080/che/api
 docker.connection.tcp.connection_timeout_ms=600000
 docker.connection.tcp.read_timeout_ms=600000
 machine.docker.pull_image=true
-machine.docker.pull_image=true
 machine.docker.local_node_host=NULL