> ports = containerInfo.getNetworkSettings().getPorts();
+
+ return ports.keySet().stream()
+ .collect(Collectors.toMap(portKey -> portKey,
+ portKey -> renderingEvaluation.render(cheDockerCustomExternalTemplate, portKey)));
+ }
+
+
+ /**
+ * Constructs a map of {@link ServerImpl} from provided parameters, using selected strategy
+ * for evaluating addresses and ports.
+ *
+ * Keys consist of port number and transport protocol (tcp or udp) separated by
+ * a forward slash (e.g. 8080/tcp)
+ *
+ * @param containerInfo
+ * the {@link ContainerInfo} describing the container.
+ * @param internalHost
+ * alternative hostname to use, if address cannot be obtained from containerInfo
+ * @param serverConfMap
+ * additional Map of {@link ServerConfImpl}. Configurations here override those found
+ * in containerInfo.
+ * @return a Map of the servers exposed by the container.
+ */
+ public Map getServers(ContainerInfo containerInfo,
+ String internalHost,
+ Map serverConfMap) {
+ Map servers = super.getServers(containerInfo, internalHost, serverConfMap);
+ return servers.entrySet().stream().collect(Collectors.toMap(map -> map.getKey(), map -> updateServer(map.getValue())));
+ }
+
+
+ /**
+ * Updates the protocol for the given server by using given protocol (like https) for http URLs.
+ * @param server the server to update
+ * @return updated server object
+ */
+ protected ServerImpl updateServer(ServerImpl server) {
+ if (!Strings.isNullOrEmpty(cheDockerCustomExternalProtocol)) {
+ if ("http".equals(server.getProtocol())) {
+ server.setProtocol(cheDockerCustomExternalProtocol);
+ String url = server.getUrl();
+ int length = "http".length();
+ server.setUrl(cheDockerCustomExternalProtocol.concat(url.substring(length)));
+ }
+ }
+ return server;
+ }
+
+
+ /**
+ * Allow to get the rendering outside of the evaluation strategies.
+ * It is called online as in this case we have access to container info
+ */
+ public RenderingEvaluation getOnlineRenderingEvaluation(ContainerInfo containerInfo, String internalHost) {
+ return new OnlineRenderingEvaluation(containerInfo).withInternalHost(internalHost);
+ }
+
+ /**
+ * Allow to get the rendering outside of the evaluation strategies.
+ * It is called offline as without container info, user need to provide merge of container and images data
+ */
+ public RenderingEvaluation getOfflineRenderingEvaluation(Map labels, Set exposedPorts, String[] env) {
+ return new OfflineRenderingEvaluation(labels, exposedPorts, env);
+ }
+
+ /**
+ * Simple interface for performing the rendering for a given portby using the given template
+ *
+ * @author Florent Benoit
+ */
+ public interface RenderingEvaluation {
+ /**
+ * Gets the template rendering for the given port and using the given template
+ *
+ * @param template
+ * which can include
+ * @param port
+ * the port for the mapping
+ * @return the rendering of the template
+ */
+ String render(String template, String port);
+ }
+
+ /**
+ * Online implementation (using the container info)
+ */
+ protected class OnlineRenderingEvaluation extends OfflineRenderingEvaluation implements RenderingEvaluation {
+
+ private String gatewayAddressContainer;
+ private String internalHost;
+
+ protected OnlineRenderingEvaluation(ContainerInfo containerInfo) {
+ super(containerInfo.getConfig().getLabels(), containerInfo.getConfig().getExposedPorts().keySet(),
+ containerInfo.getConfig().getEnv());
+ this.gatewayAddressContainer = containerInfo.getNetworkSettings().getGateway();
+ }
+
+ protected OnlineRenderingEvaluation withInternalHost(String internalHost) {
+ this.internalHost = internalHost;
+ return this;
+ }
+
+ @Override
+ protected String getExternalAddress() {
+ return externalAddressProperty != null ?
+ externalAddressProperty :
+ !isNullOrEmpty(gatewayAddressContainer) ?
+ gatewayAddressContainer :
+ this.internalHost;
+ }
+ }
+
+ /**
+ * Offline implementation (container not yet created)
+ */
+ protected class OfflineRenderingEvaluation extends DefaultRenderingEvaluation implements RenderingEvaluation {
+
+ public OfflineRenderingEvaluation(Map labels, Set exposedPorts, String[] env) {
+ super(labels, exposedPorts, env);
+ }
+ }
+
+ /**
+ * Inner class used to perform the rendering
+ */
+ protected abstract class DefaultRenderingEvaluation implements RenderingEvaluation {
+
+ /**
+ * Labels
+ */
+ private Map labels;
+
+ /**
+ * Ports
+ */
+ private Set exposedPorts;
+
+ /**
+ * Environment variables
+ */
+ private final String[] env;
+
+ /**
+ * Map with properties for all ports
+ */
+ private Map globalPropertiesMap = new HashMap<>();
+
+ /**
+ * Mapping between a port and the server ref name
+ */
+ private Map portsToRefName;
+
+ /**
+ * Data initialized ?
+ */
+ private boolean initialized;
+
+ /**
+ * Default constructor.
+ */
+ protected DefaultRenderingEvaluation(Map labels, Set exposedPorts, String[] env) {
+ this.labels = labels;
+ this.exposedPorts = exposedPorts;
+ this.env = env;
+ }
+
+ /**
+ * Initialize data
+ */
+ protected void init() {
+ this.initPortMapping();
+ this.populateGlobalProperties();
+ }
+
+ /**
+ * Compute port mapping with server ref name
+ */
+ protected void initPortMapping() {
+ // ok, so now we have a map of labels and a map of exposed ports
+ // need to extract the name of the ref (if defined in a label) or then pickup default name "Server--"
+ Pattern pattern = Pattern.compile(LABEL_CHE_SERVER_REF_KEY);
+ Map portsToKnownRefName = labels.entrySet().stream()
+ .filter(map -> pattern.matcher(map.getKey()).matches())
+ .collect(Collectors.toMap(p -> {
+ Matcher matcher = pattern.matcher(p.getKey());
+ matcher.matches();
+ String val = matcher.group(1);
+ return val.contains("/") ? val : val.concat("/tcp");
+ }, p -> p.getValue()));
+
+ // add to this map only port without a known ref name
+ Map portsToUnkownRefName =
+ exposedPorts.stream().filter((port) -> !portsToKnownRefName.containsKey(port))
+ .collect(Collectors.toMap(p -> p, p -> "Server-" + p.replace('/', '-')));
+
+ // list of all ports with refName (known/unknown)
+ this.portsToRefName = new HashMap(portsToKnownRefName);
+ portsToRefName.putAll(portsToUnkownRefName);
+ }
+
+ /**
+ * Gets default external address.
+ */
+ protected String getExternalAddress() {
+ return externalAddressProperty != null ?
+ externalAddressProperty : internalAddressProperty;
+ }
+
+ /**
+ * Populate the template properties
+ */
+ protected void populateGlobalProperties() {
+ String externalAddress = getExternalAddress();
+ String externalIP = getExternalIp(externalAddress);
+ globalPropertiesMap.put("internalIp", internalAddressProperty);
+ globalPropertiesMap.put("externalAddress", externalAddress);
+ globalPropertiesMap.put("externalIP", externalIP);
+ globalPropertiesMap.put("workspaceId", getWorkspaceId());
+ globalPropertiesMap.put("machineName", getMachineName());
+ globalPropertiesMap.put("wildcardNipDomain", getWildcardNipDomain(externalAddress));
+ globalPropertiesMap.put("wildcardXipDomain", getWildcardXipDomain(externalAddress));
+ globalPropertiesMap.put("chePort", chePort);
+ }
+
+ /**
+ * Rendering
+ */
+ @Override
+ public String render(String template, String port) {
+ if (!this.initialized) {
+ init();
+ this.initialized = true;
+ }
+ ST stringTemplate = new ST(template);
+ globalPropertiesMap.forEach((key, value) -> stringTemplate.add(key, value));
+ stringTemplate.add("serverName", portsToRefName.get(port));
+ return stringTemplate.render();
+ }
+
+ /**
+ * Gets the workspace ID from the config of the given container
+ *
+ * @return workspace ID
+ */
+ protected String getWorkspaceId() {
+ return Arrays.stream(env).filter(env -> env.startsWith(CHE_WORKSPACE_ID_PROPERTY))
+ .map(s -> s.substring(CHE_WORKSPACE_ID_PROPERTY.length()))
+ .findFirst().get();
+ }
+
+ /**
+ * Gets the workspace Machine Name from the config of the given container
+ *
+ * @return machine name of the workspace
+ */
+ protected String getMachineName() {
+ return Arrays.stream(env).filter(env -> env.startsWith(CHE_MACHINE_NAME_PROPERTY))
+ .map(s -> s.substring(CHE_MACHINE_NAME_PROPERTY.length()))
+ .findFirst().get();
+ }
+
+ /**
+ * Gets the IP address of the external address
+ *
+ * @return IP Address
+ */
+ protected String getExternalIp(String externalAddress) {
+ try {
+ return InetAddress.getByName(externalAddress).getHostAddress();
+ } catch (UnknownHostException e) {
+ throw new UnsupportedOperationException("Unable to find the IP for the address '" + externalAddress + "'", e);
+ }
+ }
+
+ /**
+ * Gets a Wildcard domain based on the ip using an external provider nip.io
+ *
+ * @return wildcard domain
+ */
+ protected String getWildcardNipDomain(String externalAddress) {
+ return String.format("%s.%s", getExternalIp(externalAddress), "nip.io");
+ }
+
+ /**
+ * Gets a Wildcard domain based on the ip using an external provider xip.io
+ *
+ * @return wildcard domain
+ */
+ protected String getWildcardXipDomain(String externalAddress) {
+ return String.format("%s.%s", getExternalIp(externalAddress), "xip.io");
+ }
+
+ }
+
+}
diff --git a/plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/proxy/DockerBuildArgsProvider.java b/plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/proxy/DockerBuildArgsProvider.java
new file mode 100644
index 0000000000..e6cee531c4
--- /dev/null
+++ b/plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/proxy/DockerBuildArgsProvider.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Codenvy, S.A.
+ * 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:
+ * Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.plugin.docker.machine.proxy;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Provides docker build arguments with proxy settings.
+ *
+ * @author Alexander Garagatyi
+ */
+@Singleton
+public class DockerBuildArgsProvider implements Provider> {
+ private final Map buildArgs;
+
+ @Inject
+ public DockerBuildArgsProvider(HttpProxyEnvVariableProvider httpProxy,
+ HttpsProxyEnvVariableProvider httpsProxy,
+ NoProxyEnvVariableProvider noProxy) {
+ Map buildArgs = new HashMap<>();
+ splitVarAndAdd(httpProxy.get(), buildArgs);
+ splitVarAndAdd(httpsProxy.get(), buildArgs);
+ splitVarAndAdd(noProxy.get(), buildArgs);
+ this.buildArgs = Collections.unmodifiableMap(buildArgs);
+ }
+
+ private void splitVarAndAdd(String envVariable, Map splitVariables) {
+ if (!envVariable.isEmpty()) {
+ String[] keyValue = envVariable.split("=", 2);
+ splitVariables.put(keyValue[0], keyValue[1]);
+ }
+ }
+
+ @Override
+ public Map get() {
+ return buildArgs;
+ }
+}
diff --git a/plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/CustomServerEvaluationStrategyTest.java b/plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/CustomServerEvaluationStrategyTest.java
new file mode 100644
index 0000000000..1e8fc9aef0
--- /dev/null
+++ b/plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/CustomServerEvaluationStrategyTest.java
@@ -0,0 +1,267 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Codenvy, S.A.
+ * 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:
+ * Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.plugin.docker.machine;
+
+import org.eclipse.che.api.machine.server.model.impl.ServerConfImpl;
+import org.eclipse.che.api.machine.server.model.impl.ServerImpl;
+import org.eclipse.che.plugin.docker.client.json.ContainerConfig;
+import org.eclipse.che.plugin.docker.client.json.ContainerInfo;
+import org.eclipse.che.plugin.docker.client.json.NetworkSettings;
+import org.eclipse.che.plugin.docker.client.json.PortBinding;
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.mockito.Mockito.when;
+
+/**
+ * Test for {@Link CustomServerEvaluationStrategy}
+ *
+ * @author Florent Benoit
+ */
+@Listeners(MockitoTestNGListener.class)
+public class CustomServerEvaluationStrategyTest {
+
+ private static final String ALL_IP_ADDRESS = "0.0.0.0";
+
+ private static final String WORKSPACE_ID_VALUE = "work123";
+ private static final String WORKSPACE_ID_PROPERTY = "CHE_WORKSPACE_ID=" + WORKSPACE_ID_VALUE;
+
+ private static final String MACHINE_NAME_VALUE = "myMachine";
+ private static final String MACHINE_NAME_PROPERTY = "CHE_MACHINE_NAME=" + MACHINE_NAME_VALUE;
+
+ @Mock
+ private ContainerConfig containerConfig;
+
+ @Mock
+ private ContainerInfo containerInfo;
+
+ @Mock
+ private NetworkSettings networkSettings;
+
+
+ private CustomServerEvaluationStrategy customServerEvaluationStrategy;
+
+ private Map> containerExposedPorts;
+ private Map containerLabels;
+ private String[] envContainerConfig;
+ private Map> networkExposedPorts;
+
+
+ @BeforeMethod
+ protected void setup() throws Exception {
+ containerLabels = new HashMap<>();
+ containerExposedPorts = new HashMap<>();
+ networkExposedPorts = new HashMap<>();
+ when(containerInfo.getConfig()).thenReturn(containerConfig);
+ when(containerConfig.getLabels()).thenReturn(containerLabels);
+ when(containerConfig.getExposedPorts()).thenReturn(containerExposedPorts);
+
+ envContainerConfig = new String[]{WORKSPACE_ID_PROPERTY, MACHINE_NAME_PROPERTY};
+ when(containerConfig.getEnv()).thenReturn(envContainerConfig);
+
+ when(containerInfo.getNetworkSettings()).thenReturn(networkSettings);
+ when(networkSettings.getGateway()).thenReturn("127.0.0.1");
+ when(networkSettings.getPorts()).thenReturn(networkExposedPorts);
+
+ containerLabels.put("foo1", "bar");
+ containerLabels.put("foo1/dummy", "bar");
+ containerLabels.put("che:server:4401/tcp:protocol", "http");
+ containerLabels.put("che:server:4401/tcp:ref", "wsagent");
+ containerLabels.put("che:server:22/tcp:protocol", "ssh");
+ containerLabels.put("che:server:22/tcp:ref", "ssh");
+ containerLabels.put("che:server:22/tcp:path", "/api");
+ containerLabels.put("che:server:4411/tcp:ref", "terminal");
+ containerLabels.put("che:server:4411/tcp:protocol", "http");
+ containerLabels.put("che:server:8080:protocol", "http");
+ containerLabels.put("che:server:8080:ref", "tomcat8");
+ containerLabels.put("anotherfoo1", "bar2");
+ containerLabels.put("anotherfoo1/dummy", "bar2");
+
+ containerExposedPorts.put("22/tcp", Collections.emptyMap());
+ networkExposedPorts.put("22/tcp", Collections.singletonList(new PortBinding().withHostIp(ALL_IP_ADDRESS)
+ .withHostPort("3222")));
+ containerExposedPorts.put("4401/tcp", Collections.emptyMap());
+ networkExposedPorts.put("4401/tcp", Collections.singletonList(new PortBinding().withHostIp(ALL_IP_ADDRESS)
+ .withHostPort("324401")));
+ containerExposedPorts.put("4411/tcp", Collections.emptyMap());
+ networkExposedPorts.put("4411/tcp", Collections.singletonList(new PortBinding().withHostIp(ALL_IP_ADDRESS)
+ .withHostPort("324411")));
+ containerExposedPorts.put("8080/tcp", Collections.emptyMap());
+ networkExposedPorts.put("8080/tcp", Collections.singletonList(new PortBinding().withHostIp(ALL_IP_ADDRESS)
+ .withHostPort("328080")));
+ }
+
+
+ /**
+ * Check workspace Id template
+ */
+ @Test
+ public void testWorkspaceIdRule() throws Throwable {
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("10.0.0.1", "192.168.1.1", "", "http", "8080");
+
+ Map portMapping = this.customServerEvaluationStrategy.getExternalAddressesAndPorts(containerInfo, "localhost");
+
+ Assert.assertTrue(portMapping.containsKey("4401/tcp"));
+ Assert.assertEquals(portMapping.get("4401/tcp"), WORKSPACE_ID_VALUE);
+ }
+
+
+ /**
+ * Check workspace Id template
+ */
+ @Test
+ public void testMachineNameRule() throws Throwable {
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("10.0.0.1", "192.168.1.1", "", "http", "8080");
+
+ Map portMapping = this.customServerEvaluationStrategy.getExternalAddressesAndPorts(containerInfo, "localhost");
+
+ Assert.assertTrue(portMapping.containsKey("4401/tcp"));
+ Assert.assertEquals(portMapping.get("4401/tcp"), MACHINE_NAME_VALUE);
+ }
+
+ /**
+ * Check updates of protocols
+ */
+ @Test
+ public void testProtocolUpdate() throws Throwable {
+ HashMap serverConfs = new HashMap<>();
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("10.0.0.1", "192.168.1.1", "", "https", "8080");
+ Map portMapping = this.customServerEvaluationStrategy.getServers(containerInfo, "localhost", serverConfs);
+
+ Assert.assertTrue(portMapping.containsKey("4401/tcp"));
+ ServerImpl server = portMapping.get("4401/tcp");
+ Assert.assertNotNull(server);
+ Assert.assertEquals(server.getUrl(), "https://" + WORKSPACE_ID_VALUE);
+ Assert.assertEquals(server.getProtocol(), "https");
+ Assert.assertEquals(server.getAddress(), WORKSPACE_ID_VALUE);
+ Assert.assertEquals(server.getRef(), "wsagent");
+ }
+
+ /**
+ * Check defaults values
+ */
+ @Test
+ public void testDefaults() throws Throwable {
+ HashMap serverConfs = new HashMap<>();
+
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("127.0.0.1", null, "-", "https", "8080");
+
+ Map portMapping = this.customServerEvaluationStrategy.getServers(containerInfo, "localhost", serverConfs);
+
+ Assert.assertTrue(portMapping.containsKey("4401/tcp"));
+ ServerImpl server = portMapping.get("4401/tcp");
+ Assert.assertNotNull(server);
+ Assert.assertEquals(server.getUrl(), "https://127.0.0.1-" + WORKSPACE_ID_VALUE);
+ Assert.assertEquals(server.getProtocol(), "https");
+ Assert.assertEquals(server.getAddress(), "127.0.0.1-" + WORKSPACE_ID_VALUE);
+ Assert.assertEquals(server.getRef(), "wsagent");
+ Assert.assertEquals(server.getRef(), "wsagent");
+ }
+
+ /**
+ * Check defaults values
+ */
+ @Test
+ public void testDefaultsNoGateway() throws Throwable {
+ when(networkSettings.getGateway()).thenReturn(null);
+ HashMap serverConfs = new HashMap<>();
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("127.0.0.1", null, "-", "https", "8080");
+ Map portMapping = this.customServerEvaluationStrategy.getServers(containerInfo, "127.0.0.1", serverConfs);
+ Assert.assertTrue(portMapping.containsKey("4401/tcp"));
+ ServerImpl server = portMapping.get("4401/tcp");
+ Assert.assertNotNull(server);
+ Assert.assertEquals(server.getUrl(), "https://127.0.0.1-" + WORKSPACE_ID_VALUE);
+ Assert.assertEquals(server.getProtocol(), "https");
+ Assert.assertEquals(server.getAddress(), "127.0.0.1-" + WORKSPACE_ID_VALUE);
+ Assert.assertEquals(server.getRef(), "wsagent");
+ Assert.assertEquals(server.getRef(), "wsagent");
+ }
+
+
+ /**
+ * Check offline mode
+ */
+ @Test
+ public void testOffline() throws Throwable {
+ Set exposedPorts = new HashSet<>();
+ exposedPorts.add("22/tcp");
+ exposedPorts.add("4401/tcp");
+ exposedPorts.add("4411/tcp");
+ exposedPorts.add("8080/tcp");
+ List env = Arrays.asList(WORKSPACE_ID_PROPERTY, MACHINE_NAME_PROPERTY);
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("127.0.0.1", null, "-", "https", "8080");
+ CustomServerEvaluationStrategy.RenderingEvaluation renderingEvaluation = this.customServerEvaluationStrategy
+ .getOfflineRenderingEvaluation(containerLabels, exposedPorts, env.stream().toArray(String[]::new));
+ String eval = renderingEvaluation.render("", "4401/tcp");
+ Assert.assertEquals(eval, WORKSPACE_ID_VALUE);
+ }
+
+
+ /**
+ * Check offline mode with external ip
+ */
+ @Test
+ public void testOfflineExternal() throws Throwable {
+ Set exposedPorts = new HashSet<>();
+ exposedPorts.add("22/tcp");
+ exposedPorts.add("4401/tcp");
+ exposedPorts.add("4411/tcp");
+ exposedPorts.add("8080/tcp");
+ List env = Arrays.asList(WORKSPACE_ID_PROPERTY, MACHINE_NAME_PROPERTY);
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("127.0.0.1", "127.0.0.1", "-", "https", "8080");
+ CustomServerEvaluationStrategy.RenderingEvaluation renderingEvaluation = this.customServerEvaluationStrategy
+ .getOfflineRenderingEvaluation(containerLabels, exposedPorts, env.stream().toArray(String[]::new));
+ String eval = renderingEvaluation.render("", "4401/tcp");
+ Assert.assertEquals(eval, WORKSPACE_ID_VALUE);
+ }
+
+
+ /**
+ * Check offline mode with external ip
+ */
+ //@Test(expectedExceptions = UnsupportedOperationException.class, expectedExceptionsMessageRegExp = "Unable to find the IP for the address .*")
+ public void testOfflineInvalidExternal() throws Throwable {
+ Set exposedPorts = new HashSet<>();
+ exposedPorts.add("22/tcp");
+ exposedPorts.add("4401/tcp");
+ exposedPorts.add("4411/tcp");
+ exposedPorts.add("8080/tcp");
+ List env = Arrays.asList(WORKSPACE_ID_PROPERTY, MACHINE_NAME_PROPERTY);
+ this.customServerEvaluationStrategy =
+ new CustomServerEvaluationStrategy("127.0.0.1", "300.300.300.300", "-", "https", "8080");
+ CustomServerEvaluationStrategy.RenderingEvaluation renderingEvaluation = this.customServerEvaluationStrategy
+ .getOfflineRenderingEvaluation(containerLabels, exposedPorts, env.stream().toArray(String[]::new));
+ String eval = renderingEvaluation.render("", "4401/tcp");
+ Assert.assertEquals(eval, WORKSPACE_ID_VALUE);
+ }
+
+
+}
+
diff --git a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml
index 07c56ca643..de766c5df3 100644
--- a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml
+++ b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml
@@ -16,7 +16,7 @@
che-plugin-docker-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-openshift-client
jar
diff --git a/plugins/plugin-docker/pom.xml b/plugins/plugin-docker/pom.xml
index 3d8c11ca83..634dfd225a 100644
--- a/plugins/plugin-docker/pom.xml
+++ b/plugins/plugin-docker/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-docker-parent
diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml
index 08596b2f99..c94a0fa5d7 100644
--- a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml
+++ b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-gdb-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-gdb-ide
jar
diff --git a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml
index b9ceac03c8..26034dec3b 100644
--- a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml
+++ b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-gdb-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-gdb-server
jar
diff --git a/plugins/plugin-gdb/pom.xml b/plugins/plugin-gdb/pom.xml
index 3e7a6a3042..c2a31546c1 100644
--- a/plugins/plugin-gdb/pom.xml
+++ b/plugins/plugin-gdb/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-gdb-parent
pom
diff --git a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
index 962cd1c6b1..1d14ab61d8 100644
--- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
+++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
@@ -16,7 +16,7 @@
che-plugin-git-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-git-ext-git
jar
diff --git a/plugins/plugin-git/pom.xml b/plugins/plugin-git/pom.xml
index c20b2d00e4..467215283f 100644
--- a/plugins/plugin-git/pom.xml
+++ b/plugins/plugin-git/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-git-parent
diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml
index 9b410b57a7..a103c4bc70 100644
--- a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml
@@ -16,7 +16,7 @@
che-plugin-github-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-github-factory-resolver
jar
diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml
index de956406ff..040411a7b6 100644
--- a/plugins/plugin-github/che-plugin-github-ide/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-github-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-github-ide
jar
diff --git a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml
index 4c62cf043e..e02a07fc23 100644
--- a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml
@@ -16,7 +16,7 @@
che-plugin-github-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-github-oauth2
jar
diff --git a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml
index 8adfe6704c..306a3743a7 100644
--- a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml
@@ -16,7 +16,7 @@
che-plugin-github-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-github-provider-github
Che Plugin :: Github :: Credential provider
diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml
index 6a6fb0c17d..bca260e1dc 100644
--- a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml
@@ -16,7 +16,7 @@
che-plugin-github-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-github-pullrequest
Che Plugin :: Github :: Pull request
diff --git a/plugins/plugin-github/che-plugin-github-server/pom.xml b/plugins/plugin-github/che-plugin-github-server/pom.xml
index 4d2cb85610..66855f7632 100644
--- a/plugins/plugin-github/che-plugin-github-server/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-github-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-github-server
jar
diff --git a/plugins/plugin-github/che-plugin-github-shared/pom.xml b/plugins/plugin-github/che-plugin-github-shared/pom.xml
index 49e72f7fa0..82fb93efc6 100644
--- a/plugins/plugin-github/che-plugin-github-shared/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-shared/pom.xml
@@ -16,7 +16,7 @@
che-plugin-github-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-github-shared
Che Plugin :: Github :: Shared
diff --git a/plugins/plugin-github/pom.xml b/plugins/plugin-github/pom.xml
index f11a93aad8..8a4dfd0bc2 100644
--- a/plugins/plugin-github/pom.xml
+++ b/plugins/plugin-github/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-github-parent
diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml
index 4f73b1b6ec..908f732f56 100644
--- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml
+++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml
@@ -16,7 +16,7 @@
che-plugin-gwt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-gwt-ext-gwt
jar
diff --git a/plugins/plugin-gwt/pom.xml b/plugins/plugin-gwt/pom.xml
index 29d1df5c83..c370663617 100644
--- a/plugins/plugin-gwt/pom.xml
+++ b/plugins/plugin-gwt/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-gwt-parent
diff --git a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml
index 56c11f2566..9dfa94c1a7 100644
--- a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml
+++ b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml
@@ -16,7 +16,7 @@
che-plugin-help-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-help-ext-client
jar
diff --git a/plugins/plugin-help/pom.xml b/plugins/plugin-help/pom.xml
index dbc5c41a05..4ed06b1340 100644
--- a/plugins/plugin-help/pom.xml
+++ b/plugins/plugin-help/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-help-parent
diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml
index eec710bc13..d5e62389c9 100644
--- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml
+++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-debugger-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-debugger-ide
jar
diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml
index 2067eb3fec..42a885a92e 100644
--- a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml
+++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-debugger-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-debugger-server
jar
diff --git a/plugins/plugin-java-debugger/pom.xml b/plugins/plugin-java-debugger/pom.xml
index bd120bf563..e07a0c8490 100644
--- a/plugins/plugin-java-debugger/pom.xml
+++ b/plugins/plugin-java-debugger/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-debugger-parent
pom
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml
index 743c8f2f74..5db21c8689 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.core.filebuffers
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml
index 640bb1450d..c5c506c582 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.core.filesystem
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml
index 28d7c22ad4..6d2759fe3f 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.core.resources
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml
index dc5132f0be..9ef132dccc 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.jdt.ui
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml
index 1bc18f0c1f..00999216ec 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.jface.text
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml
index 7185750dba..daf244131f 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.jface
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml
index 8cf2428883..6427a874ae 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.ltk.core.refactoring
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml
index 097da782e2..1ea18b33ce 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.search
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml
index e9a315c139..a9e3b80b18 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-ext-jdt-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
org.eclipse.ui.ide
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml
index 982bbfb7f3..233fdaa626 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-ext-jdt-parent
pom
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml
index 5f7992f7fd..0b3b7a713f 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-ext-lang-client
jar
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml
index 1ecbe26ad9..8d2de28e2a 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-ext-lang-server
Che Plugin :: Java :: Extension Java Server
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml
index 276b55ab19..0a12ad335a 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-ext-lang-shared
Che Plugin :: Java :: Extension Java Shared
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-shared/src/main/java/org/eclipse/che/ide/ext/java/shared/Constants.java b/plugins/plugin-java/che-plugin-java-ext-lang-shared/src/main/java/org/eclipse/che/ide/ext/java/shared/Constants.java
index 82cb1c4fef..ad424bd8c9 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-shared/src/main/java/org/eclipse/che/ide/ext/java/shared/Constants.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-shared/src/main/java/org/eclipse/che/ide/ext/java/shared/Constants.java
@@ -16,17 +16,17 @@ package org.eclipse.che.ide.ext.java.shared;
*/
public final class Constants {
// project categories
- public static String JAVA_CATEGORY = "Java";
- public static String JAVA_ID = "java";
+ public static final String JAVA_CATEGORY = "Java";
+ public static final String JAVA_ID = "java";
// project attribute names
- public static String LANGUAGE = "language";
- public static String LANGUAGE_VERSION = "languageVersion";
- public static String FRAMEWORK = "framework";
- public static String CONTAINS_JAVA_FILES = "containsJavaFiles";
- public static String SOURCE_FOLDER = "java.source.folder";
- public static String OUTPUT_FOLDER = "java.output.folder";
+ public static final String LANGUAGE = "language";
+ public static final String LANGUAGE_VERSION = "languageVersion";
+ public static final String FRAMEWORK = "framework";
+ public static final String CONTAINS_JAVA_FILES = "containsJavaFiles";
+ public static final String SOURCE_FOLDER = "java.source.folder";
+ public static final String OUTPUT_FOLDER = "java.output.folder";
- public static String JAVAC = "javac";
+ public static final String JAVAC = "javac";
private Constants() {
throw new UnsupportedOperationException("Unused constructor.");
diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml
index c8ffec9d9f..7edbbcb8a3 100644
--- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-plain
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-plain-ide
jar
diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml
index 6183013409..62edcebca1 100644
--- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-plain
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-plain-server
Che Plugin :: Java :: Plain :: Server
diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml
index ae7e5d96ca..4217c5054c 100644
--- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-plain
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-plain-shared
Che Plugin :: Java :: Plain :: Shared
diff --git a/plugins/plugin-java/che-plugin-java-plain/pom.xml b/plugins/plugin-java/che-plugin-java-plain/pom.xml
index deba2b7996..d193e8e20c 100644
--- a/plugins/plugin-java/che-plugin-java-plain/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-plain/pom.xml
@@ -16,7 +16,7 @@
che-plugin-java-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-java-plain
diff --git a/plugins/plugin-java/pom.xml b/plugins/plugin-java/pom.xml
index 30f18bfe0f..e501cc5a1c 100644
--- a/plugins/plugin-java/pom.xml
+++ b/plugins/plugin-java/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-java-parent
diff --git a/plugins/plugin-json/che-plugin-json-server/pom.xml b/plugins/plugin-json/che-plugin-json-server/pom.xml
index 3c926c7ab4..687b893d7d 100644
--- a/plugins/plugin-json/che-plugin-json-server/pom.xml
+++ b/plugins/plugin-json/che-plugin-json-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-json-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-json-server
Che Plugin :: JSON :: Extension Server
diff --git a/plugins/plugin-json/pom.xml b/plugins/plugin-json/pom.xml
index f0fce1ce09..eec8d5a339 100644
--- a/plugins/plugin-json/pom.xml
+++ b/plugins/plugin-json/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-json-parent
diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml
index f697e59301..88603f9ad2 100644
--- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml
+++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-keybinding-eclipse-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-keybinding-eclipse-ide
diff --git a/plugins/plugin-keybinding-eclipse/pom.xml b/plugins/plugin-keybinding-eclipse/pom.xml
index 2dd2bfeaa0..b6ac98ad99 100644
--- a/plugins/plugin-keybinding-eclipse/pom.xml
+++ b/plugins/plugin-keybinding-eclipse/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-keybinding-eclipse-parent
diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml
index e0fa0e5e11..82441f2126 100644
--- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml
+++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-languageserver-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
..
che-plugin-languageserver-ide
diff --git a/plugins/plugin-languageserver/pom.xml b/plugins/plugin-languageserver/pom.xml
index df6d9fd322..8919eee1e7 100644
--- a/plugins/plugin-languageserver/pom.xml
+++ b/plugins/plugin-languageserver/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-languageserver-parent
diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml
index fe592b6122..4c95328fab 100644
--- a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml
+++ b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-machine-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-machine-ext-server
diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml
index d0fcd2c010..0438627c6c 100644
--- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml
+++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml
@@ -16,7 +16,7 @@
che-plugin-machine-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-machine-ssh-client
jar
diff --git a/plugins/plugin-machine/pom.xml b/plugins/plugin-machine/pom.xml
index d02f15b3be..56ad0ffba7 100644
--- a/plugins/plugin-machine/pom.xml
+++ b/plugins/plugin-machine/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-machine-parent
diff --git a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml
index 81c68efba9..657a4c1e2a 100644
--- a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml
@@ -16,7 +16,7 @@
che-plugin-maven-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-maven-generator-archetype
jar
diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml
index 268cb528c9..9b8501670e 100644
--- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-maven-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-maven-ide
Che Plugin :: Maven :: Extension Maven Client
diff --git a/plugins/plugin-maven/che-plugin-maven-server/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/pom.xml
index 139fc271ec..67beb6054f 100644
--- a/plugins/plugin-maven/che-plugin-maven-server/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-maven-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-maven-server
jar
diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenProjectManager.java b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenProjectManager.java
index 196f759088..8aa76e4e7d 100644
--- a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenProjectManager.java
+++ b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenProjectManager.java
@@ -360,6 +360,22 @@ public class MavenProjectManager {
}
}
+
+ public MavenProject getMavenProject(IProject iProject) {
+ readLock.lock();
+ try {
+ return projectToMavenProjectMap.get(iProject);
+ } finally {
+ readLock.unlock();
+ }
+ }
+
+
+ public MavenProject getMavenProject(String projectPath) {
+ final IProject project = workspaceProvider.get().getRoot().getProject(projectPath);
+ return getMavenProject(project);
+ }
+
private void fillMavenKeyMap(MavenProject mavenProject) {
MavenKey mavenKey = mavenProject.getMavenKey();
mavenWorkspaceCache.put(mavenKey, mavenProject.getPomFile());
diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/project/MavenModelReader.java b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/project/MavenModelReader.java
index 02e487a979..c240f75394 100644
--- a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/project/MavenModelReader.java
+++ b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/project/MavenModelReader.java
@@ -11,6 +11,7 @@
package org.eclipse.che.plugin.maven.server.core.project;
import org.eclipse.che.commons.lang.Pair;
+import org.eclipse.che.commons.xml.XMLTreeException;
import org.eclipse.che.ide.maven.tools.Build;
import org.eclipse.che.ide.maven.tools.Model;
import org.eclipse.che.ide.maven.tools.Parent;
@@ -116,6 +117,8 @@ public class MavenModelReader {
model = Model.readFrom(pom);
} catch (IOException e) {
problems.add(MavenProjectProblem.newProblem(pom.getPath(), e.getMessage(), MavenProblemType.SYNTAX));
+ } catch (XMLTreeException xmlExc) {
+ problems.add(MavenProjectProblem.newProblem(pom.getPath(), xmlExc.getMessage(), MavenProblemType.STRUCTURE));
}
if (model == null) {
diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java
new file mode 100644
index 0000000000..4673d23ca1
--- /dev/null
+++ b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Codenvy, S.A.
+ * 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:
+ * Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.plugin.maven.server.projecttype;
+
+import org.eclipse.che.api.core.ForbiddenException;
+import org.eclipse.che.api.core.ServerException;
+import org.eclipse.che.api.project.server.FileEntry;
+import org.eclipse.che.api.project.server.FolderEntry;
+import org.eclipse.che.api.project.server.type.ReadonlyValueProvider;
+import org.eclipse.che.api.project.server.type.ValueStorageException;
+import org.eclipse.che.commons.xml.XMLTreeException;
+import org.eclipse.che.ide.maven.tools.Model;
+import org.eclipse.che.ide.maven.tools.Resource;
+import org.eclipse.che.maven.data.MavenResource;
+import org.eclipse.che.plugin.maven.server.core.MavenProjectManager;
+import org.eclipse.che.plugin.maven.server.core.project.MavenProject;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.util.Collections.singletonList;
+import static org.eclipse.che.ide.ext.java.shared.Constants.SOURCE_FOLDER;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.ARTIFACT_ID;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_PACKAGING;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_RESOURCES_FOLDER;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_SOURCE_FOLDER;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_TEST_RESOURCES_FOLDER;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_TEST_SOURCE_FOLDER;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.GROUP_ID;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PACKAGING;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PARENT_ARTIFACT_ID;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PARENT_GROUP_ID;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PARENT_VERSION;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.RESOURCE_FOLDER;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.TEST_SOURCE_FOLDER;
+import static org.eclipse.che.plugin.maven.shared.MavenAttributes.VERSION;
+
+/**
+ * @author Vitalii Parfonov
+ */
+public class MavenValueProvider extends ReadonlyValueProvider {
+
+
+ private MavenProjectManager mavenProjectManager;
+ private FolderEntry projectFolder;
+
+ protected MavenValueProvider(MavenProjectManager mavenProjectManager, FolderEntry projectFolder) {
+ this.mavenProjectManager = mavenProjectManager;
+ this.projectFolder = projectFolder;
+ }
+
+ @Override
+ public List getValues(String attributeName) throws ValueStorageException {
+ try {
+ if (mavenProjectManager == null) {
+ return readFromPom(attributeName);
+ }
+
+ final MavenProject mavenProject = mavenProjectManager.getMavenProject(projectFolder.getPath().toString());
+ if (mavenProject != null) {
+ return getFromMavenProject(mavenProject, attributeName);
+ } else {
+ return readFromPom(attributeName);
+ }
+ } catch (ServerException | ForbiddenException | IOException e) {
+ throwReadException(e);
+ } catch (XMLTreeException e) {
+ throw new ValueStorageException("Error parsing pom.xml : " + e.getMessage());
+ }
+ return null;
+ }
+
+ private List getFromMavenProject(MavenProject mavenProject, String attributeName) throws ValueStorageException {
+ switch (attributeName) {
+ case ARTIFACT_ID:
+ return singletonList(mavenProject.getMavenKey().getArtifactId());
+ case GROUP_ID:
+ return singletonList(mavenProject.getMavenKey().getGroupId());
+ case PACKAGING:
+ String packaging = mavenProject.getPackaging();
+ return singletonList(packaging != null ? packaging : DEFAULT_PACKAGING);
+ case VERSION:
+ return singletonList(mavenProject.getMavenKey().getVersion());
+ case PARENT_ARTIFACT_ID:
+ return singletonList(mavenProject.getParentKey() == null ? "" : mavenProject.getParentKey().getArtifactId());
+ case PARENT_GROUP_ID:
+ return singletonList(mavenProject.getParentKey() == null ? "" : mavenProject.getParentKey().getGroupId());
+ case PARENT_VERSION:
+ return singletonList(mavenProject.getParentKey() == null ? "" : mavenProject.getParentKey().getVersion());
+ case SOURCE_FOLDER:
+ return (mavenProject.getSources() != null && !mavenProject.getSources().isEmpty()) ? mavenProject.getSources()
+ : singletonList(DEFAULT_SOURCE_FOLDER);
+ case TEST_SOURCE_FOLDER:
+ return (mavenProject.getTestSources() != null && !mavenProject.getTestSources().isEmpty()) ? mavenProject.getTestSources()
+ : singletonList(
+ DEFAULT_TEST_SOURCE_FOLDER);
+ case RESOURCE_FOLDER:
+ if (mavenProject.getResources() != null && !mavenProject.getResources().isEmpty()) {
+ return mavenProject.getResources().stream().map(MavenResource::getDirectory).collect(Collectors.toList());
+ } else {
+ return Arrays.asList(DEFAULT_RESOURCES_FOLDER, DEFAULT_TEST_RESOURCES_FOLDER);
+ }
+ default:
+ throw new ValueStorageException(String.format("Unknown attribute %s", attributeName));
+ }
+ }
+
+
+ private List readFromPom(String attributeName)
+ throws ServerException, ForbiddenException, IOException, XMLTreeException, ValueStorageException {
+ final Model model = readModel(projectFolder);
+ switch (attributeName) {
+ case ARTIFACT_ID:
+ return singletonList(model.getArtifactId());
+ case GROUP_ID:
+ return singletonList(model.getGroupId());
+ case PACKAGING:
+ String packaging = model.getPackaging();
+ return singletonList(packaging != null ? packaging : DEFAULT_PACKAGING);
+ case VERSION:
+ return singletonList(model.getVersion());
+ case PARENT_ARTIFACT_ID:
+ return singletonList(model.getParent() == null ? "" : model.getParent().getArtifactId());
+ case PARENT_GROUP_ID:
+ return singletonList(model.getParent() == null ? "" : model.getParent().getGroupId());
+ case PARENT_VERSION:
+ return singletonList(model.getParent() == null ? "" : model.getParent().getVersion());
+ case SOURCE_FOLDER:
+ if (model.getBuild() != null && model.getBuild().getSourceDirectory() != null) {
+ return singletonList(model.getBuild().getSourceDirectory());
+ } else {
+ return singletonList(DEFAULT_SOURCE_FOLDER);
+ }
+ case TEST_SOURCE_FOLDER:
+ if (model.getBuild() != null && model.getBuild().getTestSourceDirectory() != null) {
+ return singletonList(model.getBuild().getTestSourceDirectory());
+ } else {
+ return singletonList(DEFAULT_TEST_SOURCE_FOLDER);
+ }
+ case RESOURCE_FOLDER:
+ if (model.getBuild() != null && model.getBuild().getResources() != null) {
+ return model.getBuild().getResources().stream().map(Resource::getDirectory).collect(Collectors.toList());
+ } else {
+ return Arrays.asList(DEFAULT_RESOURCES_FOLDER, DEFAULT_TEST_RESOURCES_FOLDER);
+ }
+ default:
+ throw new ValueStorageException(String.format("Unknown attribute %s", attributeName));
+ }
+ }
+
+ protected Model readModel(FolderEntry projectFolder) throws ValueStorageException, ServerException, ForbiddenException, IOException {
+ FileEntry pomFile = (FileEntry)projectFolder.getChild("pom.xml");
+ if (pomFile == null) {
+ throw new ValueStorageException("pom.xml does not exist.");
+ }
+ return Model.readFrom(pomFile.getInputStream());
+ }
+
+ protected void throwReadException(Exception e) throws ValueStorageException {
+ throw new ValueStorageException("Can't read pom.xml : " + e.getMessage());
+ }
+
+}
diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderFactory.java b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderFactory.java
index 790fdb0997..78fdfe7415 100644
--- a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderFactory.java
+++ b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderFactory.java
@@ -10,120 +10,25 @@
*******************************************************************************/
package org.eclipse.che.plugin.maven.server.projecttype;
-import org.eclipse.che.api.core.ForbiddenException;
-import org.eclipse.che.api.core.ServerException;
-import org.eclipse.che.api.project.server.FileEntry;
import org.eclipse.che.api.project.server.FolderEntry;
-import org.eclipse.che.api.project.server.type.ReadonlyValueProvider;
import org.eclipse.che.api.project.server.type.ValueProvider;
import org.eclipse.che.api.project.server.type.ValueProviderFactory;
-import org.eclipse.che.api.project.server.type.ValueStorageException;
-import org.eclipse.che.commons.xml.XMLTreeException;
-import org.eclipse.che.ide.maven.tools.Build;
-import org.eclipse.che.ide.maven.tools.Model;
-import org.eclipse.che.ide.maven.tools.Resource;
+import org.eclipse.che.plugin.maven.server.core.MavenProjectManager;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.eclipse.che.ide.ext.java.shared.Constants.SOURCE_FOLDER;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.ARTIFACT_ID;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_RESOURCES_FOLDER;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_SOURCE_FOLDER;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_TEST_RESOURCES_FOLDER;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_TEST_SOURCE_FOLDER;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.GROUP_ID;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PACKAGING;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PARENT_ARTIFACT_ID;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PARENT_GROUP_ID;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.PARENT_VERSION;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.RESOURCE_FOLDER;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.TEST_SOURCE_FOLDER;
-import static org.eclipse.che.plugin.maven.shared.MavenAttributes.VERSION;
+import javax.inject.Inject;
/**
* @author Evgen Vidolob
*/
public class MavenValueProviderFactory implements ValueProviderFactory {
- protected Model readModel(FolderEntry projectFolder) throws ValueStorageException, ServerException, ForbiddenException, IOException {
- FileEntry pomFile = (FileEntry)projectFolder.getChild("pom.xml");
- if (pomFile == null) {
- throw new ValueStorageException("pom.xml does not exist.");
- }
- return Model.readFrom(pomFile.getInputStream());
- }
+ @Inject
+ MavenProjectManager mavenProjectManager;
- protected void throwReadException(Exception e) throws ValueStorageException {
- throw new ValueStorageException("Can't read pom.xml : " + e.getMessage());
- }
@Override
public ValueProvider newInstance(FolderEntry projectFolder) {
- return new MavenValueProvider(projectFolder);
+ return new MavenValueProvider(mavenProjectManager, projectFolder);
}
- protected class MavenValueProvider extends ReadonlyValueProvider {
-
- protected FolderEntry projectFolder;
-
- protected MavenValueProvider(FolderEntry projectFolder) {
- this.projectFolder = projectFolder;
- }
-
- @Override
- public List getValues(String attributeName) throws ValueStorageException {
- try {
- String value = "";
- final Model model = readModel(projectFolder);
- if (attributeName.equals(ARTIFACT_ID)) {
- value = model.getArtifactId();
- } else if (attributeName.equals(GROUP_ID)) {
- value = model.getGroupId();
- } else if (attributeName.equals(PACKAGING)) {
- final String packaging = model.getPackaging();
- value = packaging == null ? "" : packaging;
- } else if (attributeName.equals(VERSION)) {
- value = model.getVersion();
- } else if (attributeName.equals(PARENT_ARTIFACT_ID) && model.getParent() != null) {
- value = model.getParent().getArtifactId();
- } else if (attributeName.equals(PARENT_GROUP_ID) && model.getParent() != null) {
- value = model.getParent().getGroupId();
- } else if (attributeName.equals(PARENT_VERSION) && model.getParent() != null) {
- value = model.getParent().getVersion();
- } else if (attributeName.equals(SOURCE_FOLDER)) {
- Build build = model.getBuild();
- if (build != null && build.getSourceDirectory() != null) {
- value = build.getSourceDirectory();
- } else {
- value = DEFAULT_SOURCE_FOLDER;
- }
- } else if (attributeName.equals(TEST_SOURCE_FOLDER)) {
- Build build = model.getBuild();
- if (build != null && build.getTestSourceDirectory() != null) {
- value = build.getTestSourceDirectory();
- } else {
- value = DEFAULT_TEST_SOURCE_FOLDER;
- }
- } else if (attributeName.equals(RESOURCE_FOLDER)) {
- Build build = model.getBuild();
- if (build != null && build.getResources() != null) {
- return build.getResources().stream().map(Resource::getDirectory).collect(Collectors.toList());
- } else {
- return Arrays.asList(DEFAULT_RESOURCES_FOLDER, DEFAULT_TEST_RESOURCES_FOLDER);
- }
- }
-
- return Collections.singletonList(value);
- } catch (ServerException | ForbiddenException | IOException e) {
- throwReadException(e);
- } catch (XMLTreeException e) {
- throw new ValueStorageException("Error parsing pom.xml : " + e.getMessage());
- }
- return null;
- }
- }
}
diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/PomReconcilerTest.java b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/PomReconcilerTest.java
index 289214d495..c7ba68fdec 100644
--- a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/PomReconcilerTest.java
+++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/PomReconcilerTest.java
@@ -17,6 +17,7 @@ import org.eclipse.che.api.project.server.FolderEntry;
import org.eclipse.che.api.project.server.ProjectRegistry;
import org.eclipse.che.api.project.server.VirtualFileEntry;
import org.eclipse.che.ide.ext.java.shared.dto.Problem;
+import org.eclipse.che.maven.server.MavenTerminal;
import org.eclipse.che.plugin.maven.server.core.EclipseWorkspaceProvider;
import org.eclipse.che.plugin.maven.server.core.MavenCommunication;
import org.eclipse.che.plugin.maven.server.core.MavenExecutorService;
@@ -24,9 +25,9 @@ import org.eclipse.che.plugin.maven.server.core.MavenProjectManager;
import org.eclipse.che.plugin.maven.server.core.MavenWorkspace;
import org.eclipse.che.plugin.maven.server.core.classpath.ClasspathManager;
import org.eclipse.che.plugin.maven.server.core.project.MavenProject;
+import org.eclipse.che.plugin.maven.server.projecttype.MavenValueProvider;
import org.eclipse.che.plugin.maven.server.rest.MavenServerService;
import org.eclipse.che.plugin.maven.server.rmi.MavenServerManagerTest;
-import org.eclipse.che.maven.server.MavenTerminal;
import org.eclipse.che.plugin.maven.shared.MessageType;
import org.eclipse.che.plugin.maven.shared.dto.NotificationMessage;
import org.eclipse.core.resources.IProject;
@@ -52,6 +53,7 @@ public class PomReconcilerTest extends BaseTest {
private MavenProjectManager projectManager;
private MavenWorkspace mavenWorkspace;
+ private MavenValueProvider mavenValueProvider;
@BeforeMethod
public void setUp() throws Exception {
@@ -77,6 +79,7 @@ public class PomReconcilerTest extends BaseTest {
new MavenProjectManager(wrapperManager, mavenServerManager, terminal, mavenNotifier, new EclipseWorkspaceProvider());
+
ClasspathManager classpathManager =
new ClasspathManager(root.getAbsolutePath(), wrapperManager, projectManager, terminal, mavenNotifier);
diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java
new file mode 100644
index 0000000000..4432a9a1f5
--- /dev/null
+++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java
@@ -0,0 +1,399 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Codenvy, S.A.
+ * 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:
+ * Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.plugin.maven.server.projecttype;
+
+import org.eclipse.che.api.project.server.FileEntry;
+import org.eclipse.che.api.project.server.FolderEntry;
+import org.eclipse.che.api.vfs.Path;
+import org.eclipse.che.commons.lang.NameGenerator;
+import org.eclipse.che.ide.ext.java.shared.Constants;
+import org.eclipse.che.maven.data.MavenKey;
+import org.eclipse.che.plugin.maven.server.core.MavenProjectManager;
+import org.eclipse.che.plugin.maven.server.core.project.MavenProject;
+import org.eclipse.che.plugin.maven.shared.MavenAttributes;
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import static java.util.Collections.singletonList;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Vitalii Parfonov
+ */
+
+@Listeners(value = {MockitoTestNGListener.class})
+public class MavenValueProviderTest {
+
+ String pomContent = "\n" +
+ "\n" +
+ " \n" +
+ " che-plugin-parent\n" +
+ " org.eclipse.che.plugin\n" +
+ " 5.0.0-SNAPSHOT\n" +
+ " " +
+ " 4.0.0\n" +
+ " my_group\n" +
+ " my_artifact\n" +
+ " 1.0-SNAPSHOT\n" +
+ " jar\n" +
+ " \n" +
+ " src" +
+ " test" +
+ " \n" +
+ "";
+
+ @Mock
+ private MavenProjectManager mavenProjectManager;
+ @Mock
+ private FolderEntry folderEntry;
+ @Mock
+ private MavenProject mavenProject;
+ @Mock
+ private MavenKey mavenKey;
+ @Mock
+ private MavenKey parentKey;
+
+ private MavenValueProvider mavenValueProvider;
+
+
+ @BeforeMethod
+ public void setUp() {
+ when(folderEntry.getPath()).thenReturn(Path.of(""));
+ when(mavenProject.getMavenKey()).thenReturn(mavenKey);
+ when(mavenProject.getParentKey()).thenReturn(parentKey);
+ mavenValueProvider = new MavenValueProvider(mavenProjectManager, folderEntry);
+ }
+
+
+ @Test
+ public void getArtifactIdFromMavenProject() throws Exception {
+ String artifactId = NameGenerator.generate("artifactId-", 6);
+ when(mavenKey.getArtifactId()).thenReturn(artifactId);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List artifactIds = mavenValueProvider.getValues(MavenAttributes.ARTIFACT_ID);
+ Assert.assertNotNull(artifactIds);
+ Assert.assertFalse(artifactIds.isEmpty());
+ Assert.assertEquals(artifactIds.size(), 1);
+ Assert.assertNotNull(artifactIds.get(0));
+ Assert.assertEquals(artifactIds.get(0), artifactId);
+ }
+
+
+ @Test
+ public void getGroupIdFromMavenProject() throws Exception {
+ String groupId = NameGenerator.generate("groupId-", 6);
+ when(mavenKey.getGroupId()).thenReturn(groupId);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List groupIds = mavenValueProvider.getValues(MavenAttributes.GROUP_ID);
+ Assert.assertNotNull(groupIds);
+ Assert.assertFalse(groupIds.isEmpty());
+ Assert.assertEquals(groupIds.size(), 1);
+ Assert.assertNotNull(groupIds.get(0));
+ Assert.assertEquals(groupIds.get(0), groupId);
+ }
+
+
+ @Test
+ public void getVersionFromMavenProject() throws Exception {
+ String versionId = NameGenerator.generate("version-", 6);
+ when(mavenKey.getVersion()).thenReturn(versionId);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List versions = mavenValueProvider.getValues(MavenAttributes.VERSION);
+ Assert.assertNotNull(versions);
+ Assert.assertFalse(versions.isEmpty());
+ Assert.assertEquals(versions.size(), 1);
+ Assert.assertNotNull(versions.get(0));
+ Assert.assertEquals(versions.get(0), versionId);
+ }
+
+
+ @Test
+ public void getPackagingFromMavenProject() throws Exception {
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ when(mavenProject.getPackaging()).thenReturn("war");
+ List pkgs = mavenValueProvider.getValues(MavenAttributes.PACKAGING);
+ Assert.assertNotNull(pkgs);
+ Assert.assertFalse(pkgs.isEmpty());
+ Assert.assertEquals(pkgs.size(), 1);
+ Assert.assertNotNull(pkgs.get(0));
+ Assert.assertEquals(pkgs.get(0), "war");
+ }
+
+ @Test
+ public void getPackagingFromMavenProjectIfNotSet() throws Exception {
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List pkgs = mavenValueProvider.getValues(MavenAttributes.PACKAGING);
+ Assert.assertNotNull(pkgs);
+ Assert.assertFalse(pkgs.isEmpty());
+ Assert.assertEquals(pkgs.size(), 1);
+ Assert.assertNotNull(pkgs.get(0));
+ Assert.assertEquals(pkgs.get(0), "jar");
+ }
+
+
+ @Test
+ public void getParentArtifactFromMavenProject() throws Exception {
+ String parentArtifact = NameGenerator.generate("parentArtifact", 6);
+ when(parentKey.getArtifactId()).thenReturn(parentArtifact);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List values = mavenValueProvider.getValues(MavenAttributes.PARENT_ARTIFACT_ID);
+ Assert.assertNotNull(values);
+ Assert.assertFalse(values.isEmpty());
+ Assert.assertEquals(values.size(), 1);
+ Assert.assertNotNull(values.get(0));
+ Assert.assertEquals(values.get(0), parentArtifact);
+ }
+
+
+ @Test
+ public void getParentVersionFromMavenProject() throws Exception {
+ String parentVersionId = NameGenerator.generate("parent-version-", 6);
+ when(parentKey.getVersion()).thenReturn(parentVersionId);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List versions = mavenValueProvider.getValues(MavenAttributes.PARENT_VERSION);
+ Assert.assertNotNull(versions);
+ Assert.assertFalse(versions.isEmpty());
+ Assert.assertEquals(versions.size(), 1);
+ Assert.assertNotNull(versions.get(0));
+ Assert.assertEquals(versions.get(0), parentVersionId);
+ }
+
+ @Test
+ public void getParentGroupFromMavenProject() throws Exception {
+ String groupId = NameGenerator.generate("parent-group-", 6);
+ when(parentKey.getGroupId()).thenReturn(groupId);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List values = mavenValueProvider.getValues(MavenAttributes.PARENT_GROUP_ID);
+ Assert.assertNotNull(values);
+ Assert.assertFalse(values.isEmpty());
+ Assert.assertEquals(values.size(), 1);
+ Assert.assertNotNull(values.get(0));
+ Assert.assertEquals(values.get(0), groupId);
+ }
+
+ @Test
+ public void getSourceFromMavenProject() throws Exception {
+ final List strings = singletonList("src");
+ when(mavenProject.getSources()).thenReturn(strings);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List sources = mavenValueProvider.getValues(Constants.SOURCE_FOLDER);
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, strings);
+ }
+
+ @Test
+ public void getSourceFromMavenProjectIfNotSet() throws Exception {
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List sources = mavenValueProvider.getValues(Constants.SOURCE_FOLDER);
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, singletonList(MavenAttributes.DEFAULT_SOURCE_FOLDER));
+ }
+
+ @Test
+ public void getTestSourceFromMavenProject() throws Exception {
+ List strings = singletonList("src/test");
+ when(mavenProject.getTestSources()).thenReturn(strings);
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List sources = mavenValueProvider.getValues(MavenAttributes.TEST_SOURCE_FOLDER);
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, strings);
+ }
+
+ @Test
+ public void getTestSourceFromMavenProjectIfNotSet() throws Exception {
+ when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject);
+ List sources = mavenValueProvider.getValues(MavenAttributes.TEST_SOURCE_FOLDER);
+ verify(mavenProjectManager).getMavenProject(anyString());
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, singletonList(MavenAttributes.DEFAULT_TEST_SOURCE_FOLDER));
+ }
+
+
+ @Test
+ public void getArtifactIdFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List artifactIds = mavenValueProvider.getValues(MavenAttributes.ARTIFACT_ID);
+ Assert.assertNotNull(artifactIds);
+ Assert.assertFalse(artifactIds.isEmpty());
+ Assert.assertEquals(artifactIds.size(), 1);
+ Assert.assertNotNull(artifactIds.get(0));
+ Assert.assertEquals(artifactIds.get(0), "my_artifact");
+ }
+
+
+ @Test
+ public void getGroupIdFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List groupIds = mavenValueProvider.getValues(MavenAttributes.GROUP_ID);
+ Assert.assertNotNull(groupIds);
+ Assert.assertFalse(groupIds.isEmpty());
+ Assert.assertEquals(groupIds.size(), 1);
+ Assert.assertNotNull(groupIds.get(0));
+ Assert.assertEquals(groupIds.get(0), "my_group");
+ }
+
+
+ @Test
+ public void getVersionFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List versions = mavenValueProvider.getValues(MavenAttributes.VERSION);
+ Assert.assertNotNull(versions);
+ Assert.assertFalse(versions.isEmpty());
+ Assert.assertEquals(versions.size(), 1);
+ Assert.assertNotNull(versions.get(0));
+ Assert.assertEquals(versions.get(0), "1.0-SNAPSHOT");
+ }
+
+
+ @Test
+ public void getPackagingFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List pkgs = mavenValueProvider.getValues(MavenAttributes.PACKAGING);
+ Assert.assertNotNull(pkgs);
+ Assert.assertFalse(pkgs.isEmpty());
+ Assert.assertEquals(pkgs.size(), 1);
+ Assert.assertNotNull(pkgs.get(0));
+ Assert.assertEquals(pkgs.get(0), "jar");
+ }
+
+ @Test
+ public void getPackagingFromPomIfNotSet() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ String pom = "";
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pom.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List pkgs = mavenValueProvider.getValues(MavenAttributes.PACKAGING);
+ Assert.assertNotNull(pkgs);
+ Assert.assertFalse(pkgs.isEmpty());
+ Assert.assertEquals(pkgs.size(), 1);
+ Assert.assertNotNull(pkgs.get(0));
+ Assert.assertEquals(pkgs.get(0), "jar");
+ }
+
+
+ @Test
+ public void getParentArtifactFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List values = mavenValueProvider.getValues(MavenAttributes.PARENT_ARTIFACT_ID);
+ Assert.assertNotNull(values);
+ Assert.assertFalse(values.isEmpty());
+ Assert.assertEquals(values.size(), 1);
+ Assert.assertNotNull(values.get(0));
+ Assert.assertEquals(values.get(0), "che-plugin-parent");
+ }
+
+
+ @Test
+ public void getParentVersionFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List versions = mavenValueProvider.getValues(MavenAttributes.PARENT_VERSION);
+ Assert.assertNotNull(versions);
+ Assert.assertFalse(versions.isEmpty());
+ Assert.assertEquals(versions.size(), 1);
+ Assert.assertNotNull(versions.get(0));
+ Assert.assertEquals(versions.get(0), "5.0.0-SNAPSHOT");
+ }
+
+ @Test
+ public void getParentGroupFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List values = mavenValueProvider.getValues(MavenAttributes.PARENT_GROUP_ID);
+ Assert.assertNotNull(values);
+ Assert.assertFalse(values.isEmpty());
+ Assert.assertEquals(values.size(), 1);
+ Assert.assertNotNull(values.get(0));
+ Assert.assertEquals(values.get(0), "org.eclipse.che.plugin");
+ }
+
+ @Test
+ public void getSourceFromPom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List sources = mavenValueProvider.getValues(Constants.SOURCE_FOLDER);
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, singletonList("src"));
+ }
+
+ @Test
+ public void getSourceFromPomIfNotSet() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ String pom = "";
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pom.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List sources = mavenValueProvider.getValues(Constants.SOURCE_FOLDER);
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, singletonList(MavenAttributes.DEFAULT_SOURCE_FOLDER));
+ }
+
+ @Test
+ public void getTestSourcePom() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pomContent.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List sources = mavenValueProvider.getValues(MavenAttributes.TEST_SOURCE_FOLDER);
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, singletonList("test"));
+ }
+
+ @Test
+ public void getTestSourceFromPomIfNotSet() throws Exception {
+ FileEntry fileEntry = mock(FileEntry.class);
+ String pom = "";
+ when(fileEntry.getInputStream()).thenReturn(new ByteArrayInputStream(pom.getBytes(StandardCharsets.UTF_8)));
+ when(folderEntry.getChild(anyString())).thenReturn(fileEntry);
+ List sources = mavenValueProvider.getValues(MavenAttributes.TEST_SOURCE_FOLDER);
+ Assert.assertNotNull(sources);
+ Assert.assertFalse(sources.isEmpty());
+ Assert.assertEquals(sources.size(), 1);
+ Assert.assertEquals(sources, singletonList(MavenAttributes.DEFAULT_TEST_SOURCE_FOLDER));
+ }
+
+}
diff --git a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml
index 5be9ef2502..5493844857 100644
--- a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml
@@ -16,7 +16,7 @@
che-plugin-maven-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-maven-shared
Che Plugin :: Maven :: Extension Maven Shared
diff --git a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml
index 08cd97ec3f..b9ba5b64da 100644
--- a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml
@@ -16,7 +16,7 @@
che-plugin-maven-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-java-maven-tools
jar
diff --git a/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml b/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml
index 0758a7a047..e2e95982a5 100644
--- a/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml
@@ -16,7 +16,7 @@
che-plugin-maven-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-maven-wsmaster
jar
diff --git a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml
index 1a82375b7e..7d4b26c972 100644
--- a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml
+++ b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml
@@ -16,7 +16,7 @@
che-maven-server
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
maven-server-api
jar
diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml
index a0369b1741..a9c7398042 100644
--- a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml
+++ b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml
@@ -16,7 +16,7 @@
che-maven-server
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
maven-server-impl
jar
diff --git a/plugins/plugin-maven/maven-server/pom.xml b/plugins/plugin-maven/maven-server/pom.xml
index 35ce7d84f0..c9c7d144c1 100644
--- a/plugins/plugin-maven/maven-server/pom.xml
+++ b/plugins/plugin-maven/maven-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-maven-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-maven-server
pom
diff --git a/plugins/plugin-maven/pom.xml b/plugins/plugin-maven/pom.xml
index 9df12b4f6d..69c6b183be 100644
--- a/plugins/plugin-maven/pom.xml
+++ b/plugins/plugin-maven/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
../pom.xml
che-plugin-maven-parent
diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml
index aeed457589..de317f923e 100644
--- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml
+++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-nodejs-debugger-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-nodejs-debugger-ide
jar
diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml
index c8d5055418..487941a168 100644
--- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml
+++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml
@@ -16,7 +16,7 @@
che-plugin-nodejs-debugger-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-nodejs-debugger-server
jar
diff --git a/plugins/plugin-nodejs-debugger/pom.xml b/plugins/plugin-nodejs-debugger/pom.xml
index 670660d426..a711bc145f 100644
--- a/plugins/plugin-nodejs-debugger/pom.xml
+++ b/plugins/plugin-nodejs-debugger/pom.xml
@@ -16,7 +16,7 @@
che-plugin-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-nodejs-debugger-parent
pom
diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml
index 032cad4148..9e316a31b2 100644
--- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml
+++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml
@@ -16,7 +16,7 @@
che-plugin-nodejs-parent
org.eclipse.che.plugin
- 5.10.0-SNAPSHOT
+ 5.11.0-SNAPSHOT
che-plugin-nodejs-lang-ide
jar
@@ -34,10 +34,6 @@
org.eclipse.che.core
che-core-ide-api