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

Merge with master

6.19.x
Max Shaposhnik 2017-06-30 12:13:25 +03:00
parent b6ccb6e8b8 832509c5a4
commit ab6defa2de
338 changed files with 5290 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agents/che-core-api-agent-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-agent-shared</artifactId>

2
agents/che-core-api-agent/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-agent</artifactId>

2
agents/exec/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>exec-agent</artifactId>
<name>Agent :: Exec</name>

2
agents/git-credentials/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>git-credentials-agent</artifactId>
<name>Git Credentials Agent</name>

2
agents/go-agents/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>go-agents</artifactId>
<name>Agent :: Golang agents</name>

2
agents/ls-csharp/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>ls-csharp-agent</artifactId>
<name>Language Server C# Agent</name>

2
agents/ls-json/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>ls-json-agent</artifactId>
<name>Language Server Json Agent</name>

13
agents/ls-json/src/main/resources/org.eclipse.che.ls.json.script.sh
View File

@ -139,6 +139,19 @@ elif echo ${LINUX_TYPE} | grep -qi "opensuse"; then
${SUDO} zypper in nodejs
}
# Alpine 3.3
############
elif echo ${LINUX_TYPE} | grep -qi "alpine"; then
test "${PACKAGES}" = "" || {
${SUDO} apk update
${SUDO} apk add ${PACKAGES};
}
command -v nodejs >/dev/null 2>&1 || {
${SUDO} apk update
${SUDO} apk add nodejs;
}
else
>&2 echo "Unrecognized Linux Type"
>&2 cat $FILE

2
agents/ls-php/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>ls-php-agent</artifactId>
<name>Language Server PHP Agent</name>

8
agents/ls-php/src/main/resources/org.eclipse.che.ls.php.script.sh
View File

@ -94,6 +94,14 @@ elif echo ${LINUX_TYPE} | grep -qi "opensuse"; then
test "${PACKAGES}" = "" || {
${SUDO} zypper install -y ${PACKAGES};
}
# Alpine 3.3
############
elif echo ${LINUX_TYPE} | grep -qi "alpine"; then
test "${PACKAGES}" = "" || {
${SUDO} apk update
${SUDO} apk add ${PACKAGES};
}
else
>&2 echo "Unrecognized Linux Type"

2
agents/ls-python/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>ls-python-agent</artifactId>
<name>Language Server python Agent</name>

2
agents/ls-typescript/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>ls-typescript-agent</artifactId>
<name>Language Server typescript Agent</name>

4
agents/pom.xml
View File

@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-agents-parent</artifactId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Agents Parent</name>
<modules>

2
agents/ssh/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>ssh-agent</artifactId>
<name>SSH Agent</name>

2
agents/terminal/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>terminal-agent</artifactId>
<name>Agent :: Terminal</name>

2
agents/unison/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>unison-agent</artifactId>
<name>Unison Agent</name>

6
assembly/assembly-ide-war/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>
@ -199,6 +199,10 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-junit-ide</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-phpunit-ide</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-testng-ide</artifactId>

2
assembly/assembly-main/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>

2
assembly/assembly-wsagent-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>

6
assembly/assembly-wsagent-war/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>
@ -115,6 +115,10 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-junit-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-phpunit-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-testng-server</artifactId>

2
assembly/assembly-wsmaster-war/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>

4
assembly/pom.xml
View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE :: Parent</name>
<modules>

2
assembly2/assembly-wsagent-server/src/assembly/assembly.xml
View File

@ -25,7 +25,7 @@
<outputDirectory>webapps</outputDirectory>
<outputFileNameMapping>ROOT.war</outputFileNameMapping>
<includes>
<include>org.eclipse.che:fabric8-ide-assembly-wsagent-war</include>
<include>org.eclipse.che.assembly2:assembly-wsagent-war</include>
</includes>
</dependencySet>
</dependencySets>

3
assembly2/assembly-wsmaster-war/src/main/webapp/WEB-INF/keycloak.json
View File

@ -5,5 +5,8 @@
"resource": "che",
"credentials": {
"secret": "2c1b2621-d251-4701-82c4-a7dd447faa97"
},
"redirect-rewrite-rules" : {
"^/wsmaster/api/(.*)$" : "/api/$1"
}
}

2
core/che-core-api-core/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>

2
core/che-core-api-dto-maven-plugin/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

2
core/che-core-api-dto/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto</artifactId>
<packaging>jar</packaging>

2
core/che-core-api-model/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>

2
core/che-core-db-vendor-h2/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-h2</artifactId>
<name>Che Core :: DB :: Vendor H2</name>

2
core/che-core-db-vendor-postgresql/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-postgresql</artifactId>
<name>Che Core :: DB :: Vendor PostgreSQL</name>

2
core/che-core-db/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db</artifactId>
<name>Che Core :: DB</name>

2
core/che-core-typescript-dto-maven-plugin/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>

2
core/commons/che-core-commons-annotations/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-annotations</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-inject/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-inject</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-j2ee/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-j2ee</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-json/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-json</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-lang/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-lang</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-schedule/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-schedule</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-test/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-test</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-xml/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-xml</artifactId>
<packaging>jar</packaging>

2
core/commons/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-commons-parent</artifactId>

4
core/pom.xml
View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-parent</artifactId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Core Parent</name>
<modules>

4
dashboard/pom.xml
View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.dashboard</groupId>
<artifactId>che-dashboard-war</artifactId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Che Dashboard :: Web App</name>
<inceptionYear>2015</inceptionYear>

1
dockerfiles/che/Dockerfile
View File

@ -36,5 +36,6 @@ RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/reposit
EXPOSE 8000 8080
COPY entrypoint.sh /entrypoint.sh
COPY open-jdk-source-file-location /open-jdk-source-file-location
ENTRYPOINT ["/entrypoint.sh"]
ADD eclipse-che.tar.gz /home/user/

6
dockerfiles/che/entrypoint.sh
View File

@ -83,8 +83,10 @@ set_environment_variables () {
### Set value of derived environment variables.
# CHE_DOCKER_IP is used internally by Che to set its IP address
if [[ -n "${CHE_IP}" ]]; then
export CHE_DOCKER_IP="${CHE_IP}"
if [[ -z "${CHE_DOCKER_IP}" ]]; then
if [[ -n "${CHE_IP}" ]]; then
export CHE_DOCKER_IP="${CHE_IP}"
fi
fi
# Convert Tomcat environment variables to POSIX format.

12
dockerfiles/che/open-jdk-source-file-location Normal file
View File

@ -0,0 +1,12 @@
This package distributes OpenJDK binaries that are licensed under the GPL.
The source code and build scripts used to create this binary are available for download at:
* eclipse che image parent: `FROM openjdk:8u111-jre-alpine`
* official openjdk image parent: `FROM alpine:3.4`
* summary of alpine `openjdk8u111-b14` package reference - https://pkgs.alpinelinux.org/package/v3.4/community/x86_64/openjdk8-jre
* alpine build scripts for `openjdk8u111-b14` reference - https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8?id=027d8ceca1422c0ffc3fe3a22523f22abedd694c
* build performed by running `APKBUILD` script which will:
* define jdk version reference - https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/APKBUILD?id=027d8ceca1422c0ffc3fe3a22523f22abedd694c#n5
* grab official jdk sources by version from "http://hg.openjdk.java.net" reference - https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/APKBUILD?id=027d8ceca1422c0ffc3fe3a22523f22abedd694c#n43
* add alpine specific patches reference - https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8?id=027d8ceca1422c0ffc3fe3a22523f22abedd694c
* perform build

4
dockerfiles/cli/version/5.15.0/images Normal file
View File

@ -0,0 +1,4 @@
IMAGE_INIT=eclipse/che-init:5.15.0
IMAGE_CHE=eclipse/che-server:5.15.0
IMAGE_COMPOSE=docker/compose:1.8.1
IMAGE_TRAEFIK=traefik:v1.3.0-rc3

24
dockerfiles/cli/version/5.15.0/images-stacks Normal file
View File

@ -0,0 +1,24 @@
eclipse/alpine_jdk8
eclipse/aspnet
eclipse/centos_jdk8
eclipse/cpp_gcc
eclipse/debian_jdk8
eclipse/debian_jdk8_node
eclipse/debian_jre
eclipse/dotnet_core
eclipse/hadoop-dev
eclipse/meteor
eclipse/node
eclipse/php
eclipse/platformio
eclipse/ruby_rails
eclipse/selenium
eclipse/ubuntu_android
eclipse/ubuntu_go
eclipse/ubuntu_gradle
eclipse/ubuntu_jdk8
eclipse/ubuntu_jre
eclipse/ubuntu_python
eclipse/ubuntu_wildfly8
registry.centos.org/che-stacks/vertx

2
dockerfiles/cli/version/latest.ver
View File

@ -1 +1 @@
5.13.0
5.14.0

4
dockerfiles/lib/dto-pom.xml
View File

@ -17,13 +17,13 @@
<parent>
<artifactId>maven-depmgt-pom</artifactId>
<groupId>org.eclipse.che.depmgt</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>dto-typescript</artifactId>
<packaging>pom</packaging>
<name>Che TypeScript DTO</name>
<properties>
<che.version>5.14.0-SNAPSHOT</che.version>
<che.version>5.15.0-SNAPSHOT</che.version>
</properties>
<repositories>
<repository>

2
ide/che-core-dyna-provider-generator-maven-plugin/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-dyna-provider-generator-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

2
ide/che-core-ide-api/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-api</artifactId>

5
ide/che-core-ide-app/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-app</artifactId>
<packaging>jar</packaging>
@ -336,6 +336,9 @@
<exclude>**/*.png</exclude>
<exclude>**/*.gif</exclude>
<exclude>**/*.jpg</exclude>
<exclude>**/OutputCustomizer.java</exclude>
<exclude>**/DefaultOutputCustomizer.java</exclude>
<exclude>**/DefaultOutputCustomizerTest.java</exclude>
</excludes>
</configuration>
</plugin>

18
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsolePresenter.java
View File

@ -25,8 +25,10 @@ import org.eclipse.che.api.machine.shared.dto.execagent.event.ProcessStdOutEvent
import org.eclipse.che.api.promises.client.Operation;
import org.eclipse.che.api.promises.client.OperationException;
import org.eclipse.che.commons.annotation.Nullable;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.command.CommandExecutor;
import org.eclipse.che.ide.api.command.CommandImpl;
import org.eclipse.che.ide.api.editor.EditorAgent;
import org.eclipse.che.ide.api.machine.ExecAgentCommandManager;
import org.eclipse.che.ide.api.machine.events.ProcessFinishedEvent;
import org.eclipse.che.ide.api.machine.events.ProcessStartedEvent;
@ -66,6 +68,8 @@ public class CommandOutputConsolePresenter implements CommandOutputConsole, Outp
private boolean followOutput = true;
private final List<ActionDelegate> actionDelegates = new ArrayList<>();
private OutputCustomizer outputCustomizer = null;
@Inject
public CommandOutputConsolePresenter(final OutputConsoleView view,
@ -75,7 +79,9 @@ public class CommandOutputConsolePresenter implements CommandOutputConsole, Outp
EventBus eventBus,
ExecAgentCommandManager execAgentCommandManager,
@Assisted CommandImpl command,
@Assisted Machine machine) {
@Assisted Machine machine,
AppContext appContext,
EditorAgent editorAgent) {
this.view = view;
this.resources = resources;
this.execAgentCommandManager = execAgentCommandManager;
@ -84,6 +90,7 @@ public class CommandOutputConsolePresenter implements CommandOutputConsole, Outp
this.eventBus = eventBus;
this.commandExecutor = commandExecutor;
setCustomizer(new DefaultOutputCustomizer(appContext, editorAgent));
view.setDelegate(this);
final String previewUrl = command.getAttributes().get(COMMAND_PREVIEW_URL_ATTRIBUTE_NAME);
@ -275,4 +282,13 @@ public class CommandOutputConsolePresenter implements CommandOutputConsole, Outp
return view.getText();
}
@Override
public OutputCustomizer getCustomizer() {
return outputCustomizer;
}
/** Sets up the text output customizer */
public void setCustomizer(OutputCustomizer customizer) {
this.outputCustomizer = customizer;
}
}

18
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/DefaultOutputConsole.java
View File

@ -14,6 +14,8 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.editor.EditorAgent;
import org.eclipse.che.ide.api.outputconsole.OutputConsole;
import org.eclipse.che.ide.machine.MachineResources;
import org.vectomatic.dom.svg.ui.SVGResource;
@ -39,15 +41,21 @@ public class DefaultOutputConsole implements OutputConsole, OutputConsoleView.Ac
/** Follow output when printing text */
private boolean followOutput = true;
private OutputCustomizer customizer = null;
@Inject
public DefaultOutputConsole(OutputConsoleView view,
MachineResources resources,
AppContext appContext,
EditorAgent editorAgent,
@Assisted String title) {
this.view = view;
this.title = title;
this.resources = resources;
this.view.enableAutoScroll(true);
setCustomizer(new DefaultOutputCustomizer(appContext, editorAgent));
view.setDelegate(this);
view.hideCommand();
@ -182,4 +190,14 @@ public class DefaultOutputConsole implements OutputConsole, OutputConsoleView.Ac
view.toggleScrollToEndButton(bottomReached);
}
@Override
public OutputCustomizer getCustomizer() {
return customizer;
}
/** Sets up the text output customizer */
public void setCustomizer(OutputCustomizer customizer) {
this.customizer = customizer;
}
}

226
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/DefaultOutputCustomizer.java Normal file
View File

@ -0,0 +1,226 @@
/*******************************************************************************
* Copyright (c) 2017 RedHat, 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:
* RedHat, Inc. - initial API and implementation
*******************************************************************************/
package org.eclipse.che.ide.console;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Strings.nullToEmpty;
import static com.google.gwt.regexp.shared.RegExp.compile;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.eclipse.che.api.promises.client.Function;
import org.eclipse.che.api.promises.client.FunctionException;
import org.eclipse.che.api.promises.client.Promise;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.editor.EditorAgent;
import org.eclipse.che.ide.api.editor.EditorPartPresenter;
import org.eclipse.che.ide.api.editor.OpenEditorCallbackImpl;
import org.eclipse.che.ide.api.editor.text.TextPosition;
import org.eclipse.che.ide.api.editor.text.TextRange;
import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
import org.eclipse.che.ide.api.resources.Container;
import org.eclipse.che.ide.api.resources.File;
import org.eclipse.che.ide.api.resources.Resource;
import org.eclipse.che.ide.resource.Path;
import com.google.gwt.regexp.shared.MatchResult;
import com.google.gwt.regexp.shared.RegExp;
import com.google.gwt.user.client.Timer;
import com.google.inject.Inject;
/**
* Default customizer adds an anchor link to the lines that match a stack trace
* line pattern and installs a handler function for the link. The handler parses
* the stack trace line, searches for the candidate Java files to navigate to,
* opens the first file (of the found candidates) in editor and reveals it to
* the required line according to the stack trace line information
*/
public class DefaultOutputCustomizer implements OutputCustomizer {
private static final RegExp LINE_AT = compile("(\\s+at .+)");
private static final RegExp LINE_AT_EXCEPTION = compile("(\\s+at address:.+)");
private AppContext appContext;
private EditorAgent editorAgent;
@Inject
public DefaultOutputCustomizer(AppContext appContext, EditorAgent editorAgent) {
this.appContext = appContext;
this.editorAgent = editorAgent;
exportAnchorClickHandlerFunction();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.che.ide.extension.machine.client.outputspanel.console.
* OutputCustomizer#canCustomize(java.lang.String)
*/
@Override
public boolean canCustomize(String text) {
return (LINE_AT.exec(text) != null && LINE_AT_EXCEPTION.exec(text) == null);
}
/*
* (non-Javadoc)
*
* @see org.eclipse.che.ide.extension.machine.client.outputspanel.console.
* OutputCustomizer#customize(java.lang.String)
*/
@Override
public String customize(String text) {
String customText = text;
MatchResult matcher = LINE_AT.exec(text);
if (matcher != null) {
try {
int start = text.indexOf("at", 0) + "at".length(), openBracket = text.indexOf("(", start),
column = text.indexOf(":", openBracket), closingBracket = text.indexOf(")", column);
String qualifiedName = text.substring(start, openBracket).trim();
String fileName = text.substring(openBracket + "(".length(), column).trim();
int lineNumber = Integer.valueOf(text.substring(column + ":".length(), closingBracket).trim());
customText = text.substring(0, openBracket + "(".length());
customText += "<a href='javascript:open(\"" + qualifiedName + "\", \"" + fileName + "\", " + lineNumber
+ ");'>";
customText += text.substring(openBracket + "(".length(), closingBracket);
customText += "</a>";
customText += text.substring(closingBracket);
text = customText;
} catch (IndexOutOfBoundsException ex) {
// ignore
}
}
return text;
}
/**
* A callback that is to be called for an anchor
*
* @param qualifiedName
* @param fileName
* @param lineNumber
*/
public void handleAnchorClick(String qualifiedName, String fileName, final int lineNumber) {
if (qualifiedName == null || fileName == null) {
return;
}
String qualifiedClassName = qualifiedName.lastIndexOf('.') != -1
? qualifiedName.substring(0, qualifiedName.lastIndexOf('.'))
: qualifiedName;
final String packageName = qualifiedClassName.lastIndexOf('.') != -1
? qualifiedClassName.substring(0, qualifiedClassName.lastIndexOf('.'))
: "";
String relativeFilePath = (packageName.isEmpty() ? "" :
(packageName.replace(".", "/") + "/")) + fileName;
collectChildren(appContext.getWorkspaceRoot(), Path.valueOf(relativeFilePath)).then(files -> {
if (!files.isEmpty()) {
editorAgent.openEditor(files.get(0), new OpenEditorCallbackImpl() {
@Override
public void onEditorOpened(EditorPartPresenter editor) {
Timer t = new Timer() {
@Override
public void run() {
EditorPartPresenter editorPart = editorAgent.getActiveEditor();
selectRange(editorPart, lineNumber);
}
};
t.schedule(500);
}
@Override
public void onEditorActivated(EditorPartPresenter editor) {
selectRange(editor, lineNumber);
}
});
}
});
}
/*
* Returns the list of workspace files filtered by a relative path
*/
private Promise<List<File>> collectChildren(Container root, Path relativeFilePath) {
return root.getTree(-1).then(new Function<Resource[], List<File>>() {
@Override
public List<File> apply(Resource[] children) throws FunctionException {
return Stream.of(children).filter(
child -> child.isFile() && endsWith(child.asFile().getLocation(), relativeFilePath))
.map(Resource::asFile).collect(Collectors.toList());
}
});
}
/*
* Checks if a path's last segments are equal to the provided relative path
*/
private boolean endsWith(Path path, Path relativePath) {
checkNotNull(path);
checkNotNull(relativePath);
if (path.segmentCount() < relativePath.segmentCount())
return false;
for (int i = relativePath.segmentCount() - 1, j = path.segmentCount() - 1; i >= 0; i--, j--) {
if (!nullToEmpty(relativePath.segment(i)).equals(path.segment(j))) {
return false;
}
}
return true;
}
/*
* Selects and shows the specified line of text in editor
*/
private void selectRange(EditorPartPresenter editor, int line) {
if (editor instanceof TextEditor) {
TextPosition startPosition = new TextPosition(line - 1, 0);
int lineOffsetStart = ((TextEditor) editor).getDocument().getLineStart(line - 1);
if (lineOffsetStart == -1) {
lineOffsetStart = 0;
}
int lineOffsetEnd = ((TextEditor) editor).getDocument().getLineStart(line);
if (lineOffsetEnd == -1) {
lineOffsetEnd = 0;
}
while (((TextEditor) editor).getDocument().getLineAtOffset(lineOffsetEnd) > line - 1) {
lineOffsetEnd--;
}
if (lineOffsetStart > lineOffsetEnd) {
lineOffsetEnd = lineOffsetStart;
}
TextPosition endPosition = new TextPosition(line - 1, lineOffsetEnd - lineOffsetStart);
((TextEditor) editor).getDocument().setSelectedRange(new TextRange(startPosition, endPosition), true);
((TextEditor) editor).getDocument().setCursorPosition(startPosition);
}
}
/**
* Sets up a java callback to be called for an anchor
*/
public native void exportAnchorClickHandlerFunction() /*-{
var that = this;
$wnd.open = $entry(function(qualifiedName,fileName,lineNumber) {
that.@org.eclipse.che.ide.console.DefaultOutputCustomizer::handleAnchorClick(*)(qualifiedName,fileName,lineNumber);
});
}-*/;
}

3
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/OutputConsoleView.java
View File

@ -159,6 +159,9 @@ public interface OutputConsoleView extends View<OutputConsoleView.ActionDelegate
/** Handle scrolling the output. */
void onOutputScrolled(boolean bottomReached);
/** Returns the customizer for the console output */
OutputCustomizer getCustomizer();
}
}

16
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/OutputConsoleViewImpl.java
View File

@ -24,6 +24,7 @@ import com.google.gwt.event.dom.client.ScrollHandler;
import com.google.gwt.regexp.shared.MatchResult;
import com.google.gwt.regexp.shared.RegExp;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.DOM;
@ -336,16 +337,25 @@ public class OutputConsoleViewImpl extends Composite implements OutputConsoleVie
return " ";
}
String encoded = SafeHtmlUtils.htmlEscape(text);
if (delegate != null) {
if (delegate.getCustomizer() != null) {
if (delegate.getCustomizer().canCustomize(encoded)) {
encoded = delegate.getCustomizer().customize(encoded);
}
}
}
for (final Pair<RegExp, String> pair : output2Color) {
final MatchResult matcher = pair.first.exec(text);
final MatchResult matcher = pair.first.exec(encoded);
if (matcher != null) {
return text.replaceAll(matcher.getGroup(1),
return encoded.replaceAll(matcher.getGroup(1),
"<span style=\"color: " + pair.second + "\">" + matcher.getGroup(1) + "</span>");
}
}
return text;
return encoded;
}
};

22
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/OutputCustomizer.java Normal file
View File

@ -0,0 +1,22 @@
/*******************************************************************************
* Copyright (c) 2017 RedHat, 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:
* RedHat, Inc. - initial API and implementation
*******************************************************************************/
package org.eclipse.che.ide.console;
/**
* An interface to allow output text customizations
*/
public interface OutputCustomizer {
/** Checks if the specified text can be/has to be customized */
boolean canCustomize(String text);
/** Returns the result of customization for the specified text */
String customize(String text);
}

100
ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/console/DefaultOutputCustomizerTest.java Normal file
View File

@ -0,0 +1,100 @@
/*******************************************************************************
* Copyright (c) 2017 RedHat, 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:
* RedHat, Inc. - initial API and implementation
*******************************************************************************/
package org.eclipse.che.ide.console;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.editor.EditorAgent;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.testng.Assert;
import com.google.gwtmockito.GwtMockitoTestRunner;
/**
* JUnit test for stacktrace line detection in DefaultOutputCustomazer.
*
* See: CHE-15 - Java stacktrace support (From Platform to Che Workspace)
*/
@RunWith(GwtMockitoTestRunner.class)
public class DefaultOutputCustomizerTest {
@Mock
AppContext appContext;
@Mock
EditorAgent editorAgent;
private OutputCustomizer outputCustomizer;
@Before
public void setUp() throws Exception {
outputCustomizer = new DefaultOutputCustomizer(appContext, editorAgent);
}
private void testStackTraceLine(boolean shouldBeCustomizable, String line, String expectedCustomization) throws Exception {
Assert.assertEquals(outputCustomizer.canCustomize(line), shouldBeCustomizable,
"Line [" + line + "] is " + (shouldBeCustomizable ? "" : "not ") +
"customizable while it should" +
(shouldBeCustomizable ? "n\'t " : " ") + "be: ");
if (shouldBeCustomizable) {
Assert.assertEquals(outputCustomizer.customize(line), expectedCustomization,
"Wrong customization result:");
}
}
/**
* Test for the detection of initial stacktrace lines in DefaultOutputCustomazer.
* These lines are not to be customized, however these lines show an examples of beginning
* the StackTrace and might be used in future to set up the customizer properly.
* @throws Exception
*/
@Test
public void testInitialStackTraceLines() throws Exception {
testStackTraceLine(false, "org.test.HighLevelException: org.test.MidLevelException: org.test.LowLevelException", null);
testStackTraceLine(false, "Caused by: org.test.MidLevelException: org.test.LowLevelException", null);
testStackTraceLine(false, "Caused by: org.test.LowLevelException", null);
testStackTraceLine(false, "Exception in thread \"main\" java.lang.ArithmeticException: / by zero", null);
}
/**
* Test for the detection of informative stacktrace lines in DefaultOutputCustomazer.
* These lines have an information on qualified path, file name and line number for an
* exception
* @throws Exception
*/
@Test
public void testValuableStackTraceLines() throws Exception {
testStackTraceLine(true, " at org.test.Junk.main(Junk.java:6)", " at org.test.Junk.main(<a href='javascript:open(\"org.test.Junk.main\", \"Junk.java\", 6);'>Junk.java:6</a>)");
testStackTraceLine(true, " at org.test.TrashClass.throwItThere(Junk.java:51)", " at org.test.TrashClass.throwItThere(<a href='javascript:open(\"org.test.TrashClass.throwItThere\", \"Junk.java\", 51);'>Junk.java:51</a>)");
testStackTraceLine(true, " at MyClass$ThrowInConstructor.<init>(MyClass.java:16)", " at MyClass$ThrowInConstructor.<init>(<a href='javascript:open(\"MyClass$ThrowInConstructor.<init>\", \"MyClass.java\", 16);'>MyClass.java:16</a>)");
}
/**
* Test for the detection of other stacktrace lines in DefaultOutputCustomazer.
* Other lines that can be a part of Stack Trace, however do not contain any
* useful information
* @throws Exception
*/
@Test
public void testOtherStackTraceLines() throws Exception {
testStackTraceLine(false, " ... 1 more", null);
}
/**
* Test for the detection of non-stacktrace lines in DefaultOutputCustomazer.
* Other lines that might occur in output console
* @throws Exception
*/
@Test
public void testNonStackTraceLines() throws Exception {
testStackTraceLine(false, "[STDOUT] Listening for transport dt_socket at address: 4403", null);
}
}

2
ide/che-core-ide-generators/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-generators</artifactId>

2
ide/che-core-ide-stacks/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-stacks</artifactId>

2
ide/che-core-ide-templates/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-templates</artifactId>

2
ide/che-core-ide-ui/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-ui</artifactId>

2
ide/che-core-orion-editor/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-orion-editor</artifactId>
<packaging>jar</packaging>

2
ide/che-ide-core/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

2
ide/commons-gwt/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-gwt</artifactId>
<name>Che Core :: Commons :: GWT</name>

2
ide/gwt-logger/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-gwt-logger</artifactId>
<name>Che Core :: Commons :: GWT Logger</name>

2
ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

2
plugins/plugin-composer/che-plugin-composer-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-ide</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-composer/che-plugin-composer-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-server</artifactId>
<name>Che Plugin :: Composer :: Server</name>

2
plugins/plugin-composer/che-plugin-composer-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-shared</artifactId>
<name>Che Plugin :: Composer :: Shared</name>

2
plugins/plugin-composer/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-composer-parent</artifactId>

2
plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-ide</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-server</artifactId>
<name>Che Plugin :: C/C++ :: Extension Server</name>

2
plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-shared</artifactId>
<name>Che Plugin :: C/C++ :: Shared</name>

2
plugins/plugin-cpp/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-cpp-parent</artifactId>

2
plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-ide</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-server</artifactId>
<name>Che Plugin :: C# :: Extension Server</name>

2
plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-shared</artifactId>
<name>Che Plugin :: C# :: Shared</name>

2
plugins/plugin-csharp/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-csharp-parent</artifactId>

2
plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-dashboard-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-ext-dashboard-client</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-dashboard/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-dashboard-parent</artifactId>

2
plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-debugger-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-debugger-ide</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-debugger/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-debugger-parent</artifactId>

2
plugins/plugin-docker/che-plugin-docker-client/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-docker-client</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-docker/che-plugin-docker-compose/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-docker-compose</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-docker/che-plugin-docker-machine/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-docker-machine</artifactId>
<packaging>jar</packaging>

12
plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/DockerInstanceProvider.java
View File

@ -200,7 +200,11 @@ public class DockerInstanceProvider implements InstanceProvider {
conn.disconnect();
}
} catch (IOException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Failed to remove {} snapshot from {}. Cause: {}",
dockerMachineSource.getRepository(),
dockerMachineSource.getRegistry(),
e.getLocalizedMessage(),
e);
}
}
@ -239,7 +243,11 @@ public class DockerInstanceProvider implements InstanceProvider {
conn.disconnect();
}
} catch (IOException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Failed to remove {} snapshot from {}. Cause: {}",
repository,
DOCKER_HUB_BASE_URI,
e.getLocalizedMessage(),
e);
}
}

2
plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/MachineProviderImpl.java
View File

@ -554,7 +554,7 @@ public class MachineProviderImpl implements MachineInstanceProvider {
.withFilters(new Filters().withFilter("reference", imageName)))
.isEmpty();
} catch (IOException e) {
LOG.warn("Failed to check image {} availability. Cause: {}", imageName, e.getMessage(), e);
LOG.warn("Failed to check image {} availability. Cause: {}", imageName, e.getMessage());
return false; // consider that image doesn't exist locally
}
}

2
plugins/plugin-docker/che-plugin-openshift-client/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-openshift-client</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-docker/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-docker-parent</artifactId>

2
plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-ide</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-gdb/che-plugin-gdb-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-server</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-gdb/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<packaging>pom</packaging>

2
plugins/plugin-git/che-plugin-git-ext-git/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-git-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-git-ext-git</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-git/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-git-parent</artifactId>

2
plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-factory-resolver</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-github/che-plugin-github-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-ide</artifactId>
<packaging>jar</packaging>

2
plugins/plugin-github/che-plugin-github-oauth2/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.14.0-SNAPSHOT</version>
<version>5.15.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-oauth2</artifactId>
<packaging>jar</packaging>

Some files were not shown because too many files have changed in this diff Show More