diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineLogMessage.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineLogMessage.java index 653be5deaf..abd814114b 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineLogMessage.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineLogMessage.java @@ -22,7 +22,7 @@ public interface MachineLogMessage { String getContent(); /** - * Machine name + * OldMachine name */ String getMachineName(); } diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineProcess.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineProcess.java index 0a49d4453e..87cfeab5dc 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineProcess.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineProcess.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.che.api.core.model.machine; +import org.eclipse.che.api.core.model.workspace.config.Command; + /** * Describe process running in a machine * diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Machine.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldMachine.java similarity index 89% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Machine.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldMachine.java index ad7f98ca2d..4e3f1f637d 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Machine.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldMachine.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.che.api.core.model.machine; +import org.eclipse.che.api.core.model.workspace.runtime.Machine; import org.eclipse.che.commons.annotation.Nullable; /** @@ -17,12 +18,14 @@ import org.eclipse.che.commons.annotation.Nullable; * * @author gazarenkov * @author Alexander Garagatyi + * + * @deprecated */ -public interface Machine { +public interface OldMachine { /** * Returns configuration used to create this machine */ - MachineConfig getConfig(); + OldMachineConfig getConfig(); /** * Returns machine identifier. It is unique and mandatory. @@ -55,5 +58,5 @@ public interface Machine { * Is available only when {@link #getStatus()} returns {@link MachineStatus#RUNNING} */ @Nullable - MachineRuntimeInfo getRuntime(); + Machine getRuntime(); } diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineConfig.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldMachineConfig.java similarity index 83% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineConfig.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldMachineConfig.java index 3880eb9ad2..73fd598edd 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineConfig.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldMachineConfig.java @@ -17,8 +17,9 @@ import java.util.Map; /** * @author gazarenkov + * @deprecated */ -public interface MachineConfig { +public interface OldMachineConfig { /** * Display name. @@ -26,7 +27,7 @@ public interface MachineConfig { String getName(); /** - * From where to create this Machine (Recipe/Snapshot). + * From where to create this OldMachine (OldRecipe/Snapshot). */ MachineSource getSource(); @@ -36,12 +37,12 @@ public interface MachineConfig { boolean isDev(); /** - * Machine type (i.e. "docker"). + * OldMachine type (i.e. "docker"). */ String getType(); /** - * Machine limits such as RAM size. + * OldMachine limits such as RAM size. */ @Nullable MachineLimits getLimits(); @@ -51,7 +52,7 @@ public interface MachineConfig { * *

Key is port/transport protocol, e.g. 8080/tcp or 100100/udp */ - List getServers(); + List getServers(); /** * Get predefined environment variables of machine. diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Recipe.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldRecipe.java similarity index 90% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Recipe.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldRecipe.java index 5b11f20028..e11b5da5b8 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Recipe.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldRecipe.java @@ -11,11 +11,13 @@ package org.eclipse.che.api.core.model.machine; /** - * Recipe to create new machine. + * OldRecipe to create new machine. * * @author Eugene Voevodin + * + * @deprecated */ -public interface Recipe { +public interface OldRecipe { /** * Returns recipe type (i.e. 'Dockerfile') diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Server.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldServer.java similarity index 98% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Server.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldServer.java index d9babad0aa..871861cb4d 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Server.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldServer.java @@ -18,7 +18,7 @@ import org.eclipse.che.commons.annotation.Nullable; * @author gazarenkov * @author Alexander Garagatyi */ -public interface Server { +public interface OldServer { /** * Reference to this Che server */ diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/ServerConf.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldServerConf.java similarity index 96% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/ServerConf.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldServerConf.java index 594bea9b33..8b42e7a6f8 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/ServerConf.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/OldServerConf.java @@ -16,8 +16,10 @@ import org.eclipse.che.commons.annotation.Nullable; * Configuration of server that can be started inside of machine * * @author Alexander Garagatyi + * + * @deprecated */ -public interface ServerConf { +public interface OldServerConf { /** * Reference to this server. */ diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/ServerProperties.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/ServerProperties.java index 336fe2d5b8..b6869055d0 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/ServerProperties.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/ServerProperties.java @@ -13,7 +13,7 @@ package org.eclipse.che.api.core.model.machine; import org.eclipse.che.commons.annotation.Nullable; /** - * Not mandatory properties of a {@link Server} + * Not mandatory properties of a {@link OldServer} * * @author Mario Loriedo */ diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/NewProjectConfig.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/NewProjectConfig.java index 5a293a1029..02132cdc26 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/NewProjectConfig.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/NewProjectConfig.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.che.api.core.model.project; +import org.eclipse.che.api.core.model.workspace.config.ProjectConfig; + import java.util.List; import java.util.Map; @@ -17,6 +19,9 @@ import java.util.Map; * Defines configuration for creating new project * * @author Roman Nikitenko + * + * + * @deprecated */ public interface NewProjectConfig extends ProjectConfig { /** Sets project name */ diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/Project.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/Project.java index 82efc282d4..f66605886a 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/Project.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/Project.java @@ -11,6 +11,7 @@ package org.eclipse.che.api.core.model.project; import org.eclipse.che.api.core.model.project.fs.Folder; +import org.eclipse.che.api.core.model.workspace.config.ProjectConfig; /** * @author gazarenkov diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceRuntime.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Runtime.java similarity index 58% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceRuntime.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Runtime.java index 7ca64f8eeb..41b879de68 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceRuntime.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Runtime.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.che.api.core.model.workspace; -import org.eclipse.che.api.core.model.machine.Machine; +import org.eclipse.che.api.core.model.workspace.runtime.Machine; import org.eclipse.che.api.core.model.machine.MachineStatus; -import org.eclipse.che.commons.annotation.Nullable; -import java.util.List; +import java.util.Map; /** * Defines a contract for workspace runtime. @@ -31,7 +30,7 @@ import java.util.List; * * @author Yevhenii Voevodin */ -public interface WorkspaceRuntime { +public interface Runtime { /** * Returns an active environment name. @@ -40,28 +39,6 @@ public interface WorkspaceRuntime { */ String getActiveEnv(); - /** - * Returns a workspace root folder. - * The base folder for the workspace projects. - */ - @Nullable - String getRootFolder(); - - /** - * Returns development machine only if its status is either {@link MachineStatus#RUNNING running} - * or {@link MachineStatus#DESTROYING destroying}, otherwise returns null - * which means that machine is starting or hasn't been started yet. - * - *

Returned machine used for extensions management. - * It is guaranteed that configuration of that machine exists - * in the active environment. - * - *

There is a contract between this method and {@link #getMachines()} method, - * if this method returns null then {@code getMachines()} method returns an empty list, - * if this method returns dev-machine then {@code getMachines()} method result includes dev-machine. - */ - @Nullable - Machine getDevMachine(); /** * Returns all the machines which statuses are either {@link MachineStatus#RUNNING running} @@ -69,5 +46,12 @@ public interface WorkspaceRuntime { * *

Returned list always contains dev-machine. */ - List getMachines(); + Map getMachines(); + + + String getOwner(); + +// String getUserToken(); + + } diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Workspace.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Workspace.java index ebba9b6b92..1d9c30cf37 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Workspace.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Workspace.java @@ -72,5 +72,5 @@ public interface Workspace { * returned value is not null, otherwise it is. */ @Nullable - WorkspaceRuntime getRuntime(); + Runtime getRuntime(); } diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceConfig.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceConfig.java index d533cc23e8..f130e27e20 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceConfig.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceConfig.java @@ -10,8 +10,9 @@ *******************************************************************************/ package org.eclipse.che.api.core.model.workspace; -import org.eclipse.che.api.core.model.machine.Command; -import org.eclipse.che.api.core.model.project.ProjectConfig; +import org.eclipse.che.api.core.model.workspace.config.Command; +import org.eclipse.che.api.core.model.workspace.config.ProjectConfig; +import org.eclipse.che.api.core.model.workspace.config.Environment; import org.eclipse.che.commons.annotation.Nullable; import java.util.List; diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceStatus.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceStatus.java index 4f65d8806c..62fbff7cfd 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceStatus.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/WorkspaceStatus.java @@ -13,7 +13,7 @@ package org.eclipse.che.api.core.model.workspace; /** * Defines the contract between workspace and its active environment. * - *

Workspace is rather part of the {@link Workspace} than {@link WorkspaceRuntime} or {@link WorkspaceConfig}, + *

Workspace is rather part of the {@link Workspace} than {@link Runtime} or {@link WorkspaceConfig}, * as it shows the state of certain user's workspace and exists earlier than runtime workspace instance * e.g. UsersWorkspace may be considered as 'STARTING' before it becomes runtime('RUNNING'). * diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Command.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Command.java similarity index 95% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Command.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Command.java index 1e6a93479d..390e23a97a 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/Command.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Command.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.machine; +package org.eclipse.che.api.core.model.workspace.config; import java.util.Map; @@ -22,7 +22,6 @@ public interface Command { /** * Returns command name (i.e. 'start tomcat') - *

* The name should be unique per user in one workspace, * which means that user may create only one command with the same name in the same workspace */ diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Environment.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Environment.java similarity index 87% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Environment.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Environment.java index f92ee5a0b2..896e873b1e 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/Environment.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Environment.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.workspace; +package org.eclipse.che.api.core.model.workspace.config; import java.util.Map; @@ -23,10 +23,10 @@ public interface Environment { * Returns the recipe (the main script) to define this environment (compose, kubernetes pod). * Type of this recipe defines engine for composing machines network runtime. */ - EnvironmentRecipe getRecipe(); + Recipe getRecipe(); /** * Returns mapping of machine name to additional configuration of machine. */ - Map getMachines(); + Map getMachines(); } diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/ExtendedMachine.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/MachineConfig.java similarity index 75% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/ExtendedMachine.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/MachineConfig.java index d6c3efdb5c..20c9415ece 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/ExtendedMachine.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/MachineConfig.java @@ -8,26 +8,26 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.workspace; +package org.eclipse.che.api.core.model.workspace.config; import java.util.List; import java.util.Map; /** - * Additional information about machine which is needed for purposes of CHE. + * Machine configuration * * @author Alexander Garagatyi */ -public interface ExtendedMachine { +public interface MachineConfig { /** - * Returns list of agents that should be deployed into machine. + * Returns list of configured agents. */ List getAgents(); /** * Returns mapping of references to configurations of servers deployed into machine. */ - Map getServers(); + Map getServers(); /** * Returns attributes of resources of machine. diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/ProjectConfig.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/ProjectConfig.java similarity index 93% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/ProjectConfig.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/ProjectConfig.java index b275cc03e9..90b3d7ffb0 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/ProjectConfig.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/ProjectConfig.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.project; +package org.eclipse.che.api.core.model.workspace.config; import java.util.List; import java.util.Map; diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/EnvironmentRecipe.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Recipe.java similarity index 92% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/EnvironmentRecipe.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Recipe.java index 2b3beaed74..af993ebda8 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/EnvironmentRecipe.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/Recipe.java @@ -8,14 +8,14 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.workspace; +package org.eclipse.che.api.core.model.workspace.config; /** * Describes recipe of workspace environment. * * @author Alexander Garagatyi */ -public interface EnvironmentRecipe { +public interface Recipe { /** * Type of the environment, e.g. docker compose. */ diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/ServerConf2.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/ServerConfig.java similarity index 67% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/ServerConf2.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/ServerConfig.java index 57559a1e90..18bda02c38 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/ServerConf2.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/ServerConfig.java @@ -8,27 +8,16 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.workspace; - -import java.util.Map; +package org.eclipse.che.api.core.model.workspace.config; /** * Configuration of server that can be started inside of machine. * * @author Alexander Garagatyi */ -public interface ServerConf2 { +public interface ServerConfig { /** * Port used by server. - *

- * If udp transport protocol is used then port should include /udp.
- * If tcp is used /tcp is not required.
- * Example: - *

*/ String getPort(); @@ -48,7 +37,7 @@ public interface ServerConf2 { String getProtocol(); /** - * Additional configuration that can be used to improve usage of machine servers. + * Path used by server. */ - Map getProperties(); + String getPath(); } diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/SourceStorage.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/SourceStorage.java similarity index 92% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/SourceStorage.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/SourceStorage.java index 06012c301b..7b8c0a83cf 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/project/SourceStorage.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/config/SourceStorage.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.project; +package org.eclipse.che.api.core.model.workspace.config; import java.util.Map; diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineRuntimeInfo.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/Machine.java similarity index 74% rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineRuntimeInfo.java rename to core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/Machine.java index 00b16b6506..b6c03106c0 100644 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineRuntimeInfo.java +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/Machine.java @@ -8,7 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.core.model.machine; +package org.eclipse.che.api.core.model.workspace.runtime; + +import org.eclipse.che.api.core.model.machine.OldServer; import java.util.Map; @@ -17,24 +19,16 @@ import java.util.Map; * * @author Alexander Garagatyi */ -public interface MachineRuntimeInfo { - /** - * Returns environment variables of machine. - */ - Map getEnvVariables(); +public interface Machine { /** * Returns machine specific properties. */ Map getProperties(); - /** - * It is supposed that this methods returns the same as {@code getEnvVariables().get("CHE_PROJECTS_ROOT")}. - */ - String projectsRoot(); /** - * Returns mapping of exposed ports to {@link Server}. + * Returns mapping of exposed ports to {@link OldServer}. * *

Key consist of port number and transport protocol - tcp or udp with slash between these parts. *
Example: @@ -49,4 +43,6 @@ public interface MachineRuntimeInfo { * */ Map getServers(); + + } diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/Server.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/Server.java new file mode 100644 index 0000000000..e556278873 --- /dev/null +++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/Server.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * 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.api.core.model.workspace.runtime; + +/** + * @author gazarenkov + */ +public interface Server { + + String getUrl(); + +}