CHE-3439: Redirects stderr to stdout when tomcat is starting up (eclipse-che#3507)

Anatoliy Bazko · web-flow · commit 4bab8db7aa46 · 2016-12-23T17:45:31.000+02:00
diff --git a/ide/che-core-ide-templates/src/main/resources/samples.json b/ide/che-core-ide-templates/src/main/resources/samples.json
@@ -40,15 +40,15 @@
       {
         "name": "build and deploy",
         "type": "mvn",
-        "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run",
+        "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }
       },
       {
         "name": "debug",
         "type": "mvn",
-        "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run",
+        "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }
@@ -620,7 +620,7 @@
       {
         "name": "run tomcat",
         "type": "custom",
-        "commandLine": "$TOMCAT_HOME/bin/catalina.sh run",
+        "commandLine": "$TOMCAT_HOME/bin/catalina.sh run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }
@@ -636,15 +636,15 @@
       {
         "name": "build and run",
         "type": "mvn",
-        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run",
+        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }
       },
       {
         "name": "debug",
         "type": "mvn",
-        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run",
+        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }
@@ -942,7 +942,7 @@
       {
         "name": "run tomee",
         "type": "custom",
-        "commandLine": "$TOMEE_HOME/bin/catalina.sh run",
+        "commandLine": "$TOMEE_HOME/bin/catalina.sh run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }
@@ -958,15 +958,15 @@
       {
         "name": "build and run",
         "type": "mvn",
-        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh run",
+        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }
       },
       {
         "name": "debug",
         "type": "mvn",
-        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh jpda run",
+        "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh jpda run 2>&1",
         "attributes": {
           "previewUrl": "http://${server.port.8080}"
         }

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@`
`40`	`40`	`{`
`41`	`41`	`"name": "build and deploy",`
`42`	`42`	`"type": "mvn",`
`43`		`- "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run",`
	`43`	`+ "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run 2>&1",`
`44`	`44`	`"attributes": {`
`45`	`45`	`"previewUrl": "http://${server.port.8080}"`
`46`	`46`	`}`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`"name": "debug",`
`50`	`50`	`"type": "mvn",`
`51`		`- "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run",`
	`51`	`+ "commandLine": "mvn -f ${current.project.path} clean install -DskipTests && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run 2>&1",`
`52`	`52`	`"attributes": {`
`53`	`53`	`"previewUrl": "http://${server.port.8080}"`
`54`	`54`	`}`
`@@ -620,7 +620,7 @@`
`620`	`620`	`{`
`621`	`621`	`"name": "run tomcat",`
`622`	`622`	`"type": "custom",`
`623`		`- "commandLine": "$TOMCAT_HOME/bin/catalina.sh run",`
	`623`	`+ "commandLine": "$TOMCAT_HOME/bin/catalina.sh run 2>&1",`
`624`	`624`	`"attributes": {`
`625`	`625`	`"previewUrl": "http://${server.port.8080}"`
`626`	`626`	`}`
`@@ -636,15 +636,15 @@`
`636`	`636`	`{`
`637`	`637`	`"name": "build and run",`
`638`	`638`	`"type": "mvn",`
`639`		`- "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run",`
	`639`	`+ "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh run 2>&1",`
`640`	`640`	`"attributes": {`
`641`	`641`	`"previewUrl": "http://${server.port.8080}"`
`642`	`642`	`}`
`643`	`643`	`},`
`644`	`644`	`{`
`645`	`645`	`"name": "debug",`
`646`	`646`	`"type": "mvn",`
`647`		`- "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run",`
	`647`	`+ "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war && $TOMCAT_HOME/bin/catalina.sh jpda run 2>&1",`
`648`	`648`	`"attributes": {`
`649`	`649`	`"previewUrl": "http://${server.port.8080}"`
`650`	`650`	`}`
`@@ -942,7 +942,7 @@`
`942`	`942`	`{`
`943`	`943`	`"name": "run tomee",`
`944`	`944`	`"type": "custom",`
`945`		`- "commandLine": "$TOMEE_HOME/bin/catalina.sh run",`
	`945`	`+ "commandLine": "$TOMEE_HOME/bin/catalina.sh run 2>&1",`
`946`	`946`	`"attributes": {`
`947`	`947`	`"previewUrl": "http://${server.port.8080}"`
`948`	`948`	`}`
`@@ -958,15 +958,15 @@`
`958`	`958`	`{`
`959`	`959`	`"name": "build and run",`
`960`	`960`	`"type": "mvn",`
`961`		`- "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh run",`
	`961`	`+ "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh run 2>&1",`
`962`	`962`	`"attributes": {`
`963`	`963`	`"previewUrl": "http://${server.port.8080}"`
`964`	`964`	`}`
`965`	`965`	`},`
`966`	`966`	`{`
`967`	`967`	`"name": "debug",`
`968`	`968`	`"type": "mvn",`
`969`		`- "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh jpda run",`
	`969`	`+ "commandLine": "mvn -f ${current.project.path} clean install && cp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war && $TOMEE_HOME/bin/catalina.sh jpda run 2>&1",`
`970`	`970`	`"attributes": {`
`971`	`971`	`"previewUrl": "http://${server.port.8080}"`
`972`	`972`	`}`