seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CHE-6215. Fix parsing of servers for creating preview URL 

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
6.19.x
Roman Nikitenko 2017-11-07 10:15:13 +02:00 committed by RomanNikitenko
parent 28a993cdf2
commit 46ecc609aa
2 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
ide/che-core-ide-stacks/src/main/resources/stacks.json
View File

@ -532,7 +532,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} && dotnet run",
"attributes": {
"previewUrl": "http://${server.port.5000}",
"previewUrl": "${server.dot.net.server}",
"goal": "Run"
}
}
@ -601,7 +601,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} && go get -d && go run main.go",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -824,13 +824,17 @@
"org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "org.eclipse.che.ssh", "org.eclipse.che.ls.php", "org.eclipse.che.ls.json"
],
"servers": {
"8080/tcp" : {
"port" : "8080",
"protocol" : "http"
"8080/tcp": {
"port": "8080",
"protocol": "http"
},
"8000/tcp" : {
"port" : "8000",
"protocol" : "http"
"8000/tcp": {
"port": "8000",
"protocol": "http"
},
"80/tcp": {
"port": "80",
"protocol": "http"
}
},
"attributes" : {
@ -871,7 +875,7 @@
"type": "custom",
"commandLine": "sudo service apache2 start && sudo tail -f /var/log/apache2/access.log -f /var/log/apache2/error.log",
"attributes": {
"previewUrl": "http://${server.port.80}/${current.project.relpath}",
"previewUrl": "${server.80/tcp}/${current.project.relpath}",
"goal": "Run"
}
},
@ -889,7 +893,7 @@
"type": "custom",
"commandLine": "sudo service apache2 restart",
"attributes": {
"previewUrl": "http://${server.port.80}/${current.project.relpath}",
"previewUrl": "${server.80/tcp}/${current.project.relpath}",
"goal": "Run"
}
}
@ -957,6 +961,10 @@
"8000/tcp" : {
"port" : "8000",
"protocol" : "http"
},
"80/tcp": {
"port": "80",
"protocol": "http"
}
},
"attributes" : {
@ -997,7 +1005,7 @@
"type": "custom",
"commandLine": "sudo service apache2 start && sudo tail -f /var/log/apache2/access.log -f /var/log/apache2/error.log",
"attributes": {
"previewUrl": "http://${server.port.80}/${current.project.relpath}",
"previewUrl": "${server.80/tcp}/${current.project.relpath}",
"goal": "Run"
}
},
@ -1015,7 +1023,7 @@
"type": "custom",
"commandLine": "sudo service apache2 restart",
"attributes": {
"previewUrl": "http://${server.port.80}/${current.project.relpath}",
"previewUrl": "${server.80/tcp}/${current.project.relpath}",
"goal": "Run"
}
}
@ -1175,7 +1183,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} && rails server -b 0.0.0.0",
"attributes": {
"previewUrl": "http://${server.port.3000}",
"previewUrl": "${server.3000/tcp}",
"goal": "Run"
}
}
@ -1519,7 +1527,7 @@
"type": "custom",
"commandLine": "cd ${GAE} && ./dev_appserver.py 2>&1 --php_executable_path=/usr/bin/php5-cgi --skip_sdk_update_check true --host=0.0.0.0 --admin_host=0.0.0.0 ${current.project.path}",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -1594,7 +1602,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} && sudo virtualenv /env && sudo pip install -r requirements.txt && python main.py",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -1666,7 +1674,7 @@
"type": "custom",
"commandLine": "cd ${GAE} && ./dev_appserver.py 2>&1 --skip_sdk_update_check true --host=0.0.0.0 --admin_host=0.0.0.0 ${current.project.path}",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -1981,7 +1989,7 @@
"type": "custom",
"commandLine": "sudo sqlite3 /usr/local/zend/var/db/zsd.db \"UPDATE ZSD_DIRECTIVES SET DISK_VALUE='http://${server.port.10081}/ZendServer' WHERE NAME='zray.zendserver_ui_url'\" && sudo sed -i 's#zray.zendserver_ui_url=.*#zray.zendserver_ui_url=http://${server.port.10081}/ZendServer#g' /usr/local/zend/etc/conf.d/zray.ini && sudo /usr/local/zend/bin/zendctl.sh restart",
"attributes": {
"previewUrl": "http://${server.port.80}",
"previewUrl": "${server.80/tcp}",
"goal": "Run"
}
},
@ -1999,7 +2007,7 @@
"type": "custom",
"commandLine": "echo \"Zend Server admin password is `sudo cat /root/zend-password`\"",
"attributes": {
"previewUrl": "http://${server.port.10081}",
"previewUrl": "${server.10081/tcp}",
"goal": ""
}
}
@ -2213,7 +2221,7 @@
"name": "run",
"type": "custom",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.vertx}",
"goal": "Run"
}
}, {
@ -2221,7 +2229,7 @@
"name": "debug",
"type": "custom",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.vertx}",
"goal": "Debug"
}
}]
@ -2325,7 +2333,7 @@
"name": "run",
"type": "custom",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.springboot}",
"goal": "Run"
}
},
@ -2334,7 +2342,7 @@
"name": "debug",
"type": "custom",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.springboot}",
"goal": "Debug"
}
}
@ -2410,7 +2418,7 @@
"name": "run",
"type": "custom",
"attributes": {
"previewUrl": "http://${server.port.8080}"
"previewUrl": "${server.wildfly}"
},
"commandLine": "cd ${current.project.path} && scl enable rh-maven33 'java -jar target/*-swarm.jar'"
}
@ -2474,17 +2482,21 @@
"org.eclipse.che.ssh"
],
"servers": {
"angular" : {
"port" : "8003",
"protocol" : "http"
"angular": {
"port": "8003",
"protocol": "http"
},
"node-3000" : {
"port" : "3000",
"protocol" : "http"
"3000/tcp": {
"port": "3000",
"protocol": "http"
},
"node-9000" : {
"port" : "9000",
"protocol" : "http"
"9000/tcp": {
"port": "9000",
"protocol": "http"
},
"8080/tcp": {
"port": "8080",
"protocol": "http"
}
}
}
@ -2497,7 +2509,7 @@
"type": "custom",
"attributes": {
"goal": "Run",
"previewUrl": "http://${server.port.8080}"
"previewUrl": "${server.8080/tcp}"
},
"commandLine": "cd ${current.project.path} && scl enable rh-nodejs4 'node app.js'"
}
@ -2633,7 +2645,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} && go get -d && go run main.go",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}

42
ide/che-core-ide-templates/src/main/resources/samples.json
View File

@ -44,7 +44,7 @@
"type": "mvn",
"commandLine": "mvn -f ${current.project.path} clean install -DskipTests \ncp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war \n$TOMCAT_HOME/bin/catalina.sh run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Run"
}
},
@ -53,7 +53,7 @@
"type": "mvn",
"commandLine": "mvn -f ${current.project.path} clean install -DskipTests \ncp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war \n$TOMCAT_HOME/bin/catalina.sh jpda run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Debug"
}
}
@ -172,7 +172,7 @@
"type": "custom",
"commandLine": "mvn -f ${current.project.path} clean install",
"attributes": {
"previewUrl": "http://${server.port.6080}",
"previewUrl": "${server.VNC}",
"goal": "Run"
}
}
@ -208,7 +208,7 @@
"type": "custom",
"commandLine": "mvn -f ${current.project.path} clean install",
"attributes": {
"previewUrl": "http://${server.port.6080}",
"previewUrl": "${server.VNC}",
"goal": "Run"
}
}
@ -244,7 +244,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} \ngo get -d \ngo run main.go",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -397,7 +397,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} \nsudo virtualenv /env \nsudo pip install -r requirements.txt \npython main.py",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -433,7 +433,7 @@
"type": "custom",
"commandLine": "cd ${GAE} \n./dev_appserver.py 2>&1 --skip_sdk_update_check true --host=0.0.0.0 --admin_host=0.0.0.0 ${current.project.path}",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -478,7 +478,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} \nrails server -b 0.0.0.0",
"attributes": {
"previewUrl": "http://${server.port.3000}",
"previewUrl": "${server.3000/tcp}",
"goal": "Run"
}
}
@ -553,7 +553,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} \nnode app/app.js",
"attributes": {
"previewUrl": "http://${server.port.3000}",
"previewUrl": "${server.3000/tcp}",
"goal": "Run"
}
}
@ -598,7 +598,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} \ngrunt server",
"attributes": {
"previewUrl": "http://${server.port.8003}",
"previewUrl": "${server.angular}",
"goal": "Run"
}
}
@ -646,7 +646,7 @@
"type": "custom",
"commandLine": "$TOMCAT_HOME/bin/catalina.sh run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Run"
}
},
@ -664,7 +664,7 @@
"type": "mvn",
"commandLine": "mvn -f ${current.project.path} clean install \ncp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war \n$TOMCAT_HOME/bin/catalina.sh run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Run"
}
},
@ -673,7 +673,7 @@
"type": "mvn",
"commandLine": "mvn -f ${current.project.path} clean install \ncp ${current.project.path}/target/*.war $TOMCAT_HOME/webapps/ROOT.war \n$TOMCAT_HOME/bin/catalina.sh jpda run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Debug"
}
}
@ -757,7 +757,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} \ngrunt serve",
"attributes": {
"previewUrl": "http://${server.port.9000}",
"previewUrl": "${server.9000/tcp}",
"goal": "Run"
}
}
@ -793,7 +793,7 @@
"type": "custom",
"commandLine": "sudo service apache2 start \nsudo tail -f /var/log/apache2/access.log -f /var/log/apache2/error.log",
"attributes": {
"previewUrl": "http://${server.port.80}/${current.project.relpath}",
"previewUrl": "${server.80/tcp}/${current.project.relpath}",
"goal": "Run"
}
},
@ -811,7 +811,7 @@
"type": "custom",
"commandLine": "sudo service apache2 restart",
"attributes": {
"previewUrl": "http://${server.port.80}/${current.project.relpath}",
"previewUrl": "${server.80/tcp}/${current.project.relpath}",
"goal": "Run"
}
}
@ -848,7 +848,7 @@
"type": "custom",
"commandLine": "cd ${GAE} \n./dev_appserver.py 2>&1 --php_executable_path=/usr/bin/php5-cgi --skip_sdk_update_check true --host=0.0.0.0 --admin_host=0.0.0.0 ${current.project.path}",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.8080/tcp}",
"goal": "Run"
}
}
@ -939,7 +939,7 @@
"type": "custom",
"commandLine": "cd ${current.project.path} \ndotnet run",
"attributes": {
"previewUrl": "http://${server.port.5000}",
"previewUrl": "${server.dot.net.server}",
"goal": "Run"
}
}
@ -984,7 +984,7 @@
"type": "custom",
"commandLine": "$TOMEE_HOME/bin/catalina.sh run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Run"
}
},
@ -1002,7 +1002,7 @@
"type": "mvn",
"commandLine": "mvn -f ${current.project.path} clean install \ncp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war \n$TOMEE_HOME/bin/catalina.sh run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Run"
}
},
@ -1011,7 +1011,7 @@
"type": "mvn",
"commandLine": "mvn -f ${current.project.path} clean install \ncp ${current.project.path}/target/*.war $TOMEE_HOME/webapps/ROOT.war \n$TOMEE_HOME/bin/catalina.sh jpda run 2>&1",
"attributes": {
"previewUrl": "http://${server.port.8080}",
"previewUrl": "${server.tomcat8}",
"goal": "Debug"
}
}