fixup! Introduce a custom server evaluation strategy This custom serv…

…er evaluation strategy allows to configure the links by providing a set of macro/templates. It avoids to create one strategy class file for each needs, as template/macros can be used independently. Change-Id: I2c8447255babb36749928bebe73a1f9e8cca4b52 Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
eclipse-che · May 11, 2017 · b4e633f · b4e633f
1 parent 2d0ed83
commit b4e633f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties
@@ -228,7 +228,7 @@ che.docker.server_evaluation_strategy=default
 # chePort : Che listening port number of workspace master
 # wildcardNipDomain : get external address transformed into a nip.io DNS sub-domain
 # wildcardXipDomain : get external address transformed into a xip.io DNS sub-domain
-che.docker.server_evaluation_strategy.custom.external.template=<serverName>.<machineName>.<workspaceId>.<wildcardNipDomain>:<chePort>
+che.docker.server_evaluation_strategy.custom.template=<serverName>.<machineName>.<workspaceId>.<wildcardNipDomain>:<chePort>
 
 # Protocol to use for http access (for example it can be set to https)
 che.docker.server_evaluation_strategy.custom.external.protocol=http

diff --git a/...e/src/main/java/org/eclipse/che/plugin/docker/machine/CustomServerEvaluationStrategy.java b/...e/src/main/java/org/eclipse/che/plugin/docker/machine/CustomServerEvaluationStrategy.java
@@ -79,7 +79,7 @@ public class CustomServerEvaluationStrategy extends DefaultServerEvaluationStrat
     @Inject
     public CustomServerEvaluationStrategy(@Nullable @Named("che.docker.ip") String cheDockerIp,
                                           @Nullable @Named("che.docker.ip.external") String cheDockerIpExternal,
-                                          @Nullable @Named("che.docker.server_evaluation_strategy.custom.external.template") String cheDockerCustomExternalTemplate,
+                                          @Nullable @Named("che.docker.server_evaluation_strategy.custom.template") String cheDockerCustomExternalTemplate,
                                           @Nullable @Named("che.docker.server_evaluation_strategy.custom.external.protocol") String cheDockerCustomExternalProtocol,
                                           @Named("che.port") String chePort) {
         super(cheDockerIp, cheDockerIpExternal);