From c8fd6177b50d60add231f02ace2bfa800fb8b436 Mon Sep 17 00:00:00 2001
From: Eugene Ivantsov <eivantsov@redhat.com>
Date: Wed, 29 Nov 2017 18:15:21 +0200
Subject: [PATCH] Che in che improvements (#7633)

* Che in che stack improvements

* Edited commands
---
 .../src/main/resources/che-in-che.json        | 24 ++++++++++++-------
 dockerfiles/dev/Dockerfile                    |  1 +
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json b/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json
index 0811e8abd7..91da42fdf9 100644
--- a/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json
+++ b/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json
@@ -40,7 +40,6 @@
                 "org.eclipse.che.exec",
                 "org.eclipse.che.terminal",
                 "org.eclipse.che.ws-agent",
-                "org.eclipse.che.ssh",
                 "org.eclipse.che.ls.js-ts"
               ],
               "servers": {
@@ -79,7 +78,7 @@
       "description": null,
       "commands": [
         {
-          "commandLine": "cd ${current.project.path} && mvn clean install  -Pnative",
+          "commandLine": "cd ${current.project.path} && mvn clean install",
           "name": "Build project",
           "type": "custom",
           "attributes": {
@@ -88,7 +87,7 @@
           }
         },
         {
-          "commandLine": "cd ${current.project.path} && mvn gwt:codeserver -pl :assembly-ide-war -am -Psdm-in-che -Dskip-enforce -Dskip-validate-sources -Dche.dto.skip -Dmaven.main.skip -Dmaven.resources.skip -Dmaven.buildNumber.skip",
+          "commandLine": "cd ${current.project.eldest.parent.path}\n mvn gwt:codeserver -pl :assembly-ide-war -am -Psdm-in-che -Dskip-enforce -Dskip-validate-sources -Dche.dto.skip -Dmaven.main.skip -Dmaven.resources.skip -Dmaven.buildNumber.skip",
           "name": "GWT SDM",
           "type": "gwt_sdm_che",
           "attributes": {
@@ -97,7 +96,7 @@
           }
         },
         {
-          "commandLine": "cd /home/user/tomcat8/bin && export SERVER_PORT=8080 && ./catalina.sh run",
+          "commandLine": "cd /home/user/tomcat8/bin\n export SERVER_PORT=8080\n export JPDA_ADDRESS=9000\n ./catalina.sh jpda run",
           "name": "Tomcat8-IDE Start",
           "type": "custom",
           "attributes": {
@@ -115,21 +114,30 @@
           }
         },
         {
-          "commandLine": "cd ${current.project.path} && mvn clean install -pl :assembly-wsagent-war -am && cp ${current.project.path}/assembly/assembly-wsagent-war/target/*.war /home/user/tomcat8/webapps/ROOT.war",
+          "commandLine": "cd ${current.project.eldest.parent.path}\n mvn clean install -pl :assembly-wsagent-war -am\n cp ${current.project.eldest.parent.path}/assembly/assembly-wsagent-war/target/*.war /home/user/tomcat8/webapps/ROOT.war",
           "name": "Deploy Workspace Agent",
           "type": "custom",
           "attributes": {
             "goal": "Run",
-            "previewUrl": "${server.IDE-agent-server}/che/che-in-che?wsagent-ref-prefix=dev-"
+            "previewUrl": "${server.IDE-agent-server}/${workspace.namespace}/${workspace.name}?wsagent-ref-prefix=dev-"
           }
         },
         {
-          "commandLine": "cd ${current.project.path} && mvn clean install -pl :assembly-ide-war -am && cp ${current.project.path}/assembly/assembly-ide-war/target/*.war /home/user/tomcat8/webapps/ide.war",
+          "commandLine": "cd ${current.project.eldest.parent.path}\n mvn clean install -pl :assembly-ide-war -am\n cp ${current.project.eldest.parent.path}/assembly/assembly-ide-war/target/*.war /home/user/tomcat8/webapps/ide.war",
           "name": "Deploy IDE",
           "type": "custom",
           "attributes": {
             "goal": "Run",
-            "previewUrl": "${server.IDE-agent-server}/che/che-in-che?wsagent-ref-prefix=dev-"
+            "previewUrl": "${server.IDE-agent-server}/${workspace.namespace}/${workspace.name}?wsagent-ref-prefix=dev-"
+          }
+        },
+        {
+          "commandLine": "cp ${current.project.path}/target/*.jar /home/user/tomcat8/webapps/ROOT/WEB-INF/lib/\n echo \"Artifact copied. It takes a few seconds for Tomcat to hot deploy it.\"",
+          "name": "Hot Deploy Workspace Agent",
+          "type": "custom",
+          "attributes": {
+            "goal": "Run",
+            "previewUrl": ""
           }
         }
       ]
diff --git a/dockerfiles/dev/Dockerfile b/dockerfiles/dev/Dockerfile
index ccaeb31d15..9811ac8a89 100644
--- a/dockerfiles/dev/Dockerfile
+++ b/dockerfiles/dev/Dockerfile
@@ -36,6 +36,7 @@ RUN mkdir $HOME/.m2 && \
    rm /home/user/tomcat8.zip;\
    mkdir /home/user/tomcat8/webapps;\
    sed -i -- 's/autoDeploy=\"false\"/autoDeploy=\"true\"/g' /home/user/tomcat8/conf/server.xml; \
+   sed -i 's/<Context>/<Context reloadable=\"true\">/g' /home/user/tomcat8/conf/context.xml; \
    echo "export MAVEN_OPTS=\$JAVA_OPTS" >> /home/user/.bashrc
 
 USER user