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

Move MachineSource into docker infrastructure

6.19.x
Korneta Anton 2017-07-13 17:50:15 +03:00
parent ddb6e0ad8b
commit 80c788d42b
10 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
View File

@ -34,7 +34,7 @@
<class>org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl</class>
<class>org.eclipse.che.api.workspace.server.model.impl.CommandImpl</class>
<class>org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl</class>
<class>org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl</class>
<class>org.eclipse.che.workspace.infrastructure.docker.snapshot.SnapshotImpl</class>
<class>org.eclipse.che.api.recipe.OldRecipeImpl</class>

4
infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntime.java
View File

@ -13,7 +13,7 @@ package org.eclipse.che.workspace.infrastructure.docker;
import com.google.inject.assistedinject.Assisted;
import org.eclipse.che.api.core.NotFoundException;
import org.eclipse.che.api.core.model.machine.MachineSource;
import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
import org.eclipse.che.api.core.model.workspace.runtime.Machine;
import org.eclipse.che.api.core.model.workspace.runtime.MachineStatus;
import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
@ -22,7 +22,7 @@ import org.eclipse.che.api.core.notification.EventService;
import org.eclipse.che.api.workspace.server.DtoConverter;
import org.eclipse.che.api.workspace.server.URLRewriter;
import org.eclipse.che.api.workspace.server.model.impl.MachineImpl;
import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl;
import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
import org.eclipse.che.api.workspace.server.spi.InternalMachineConfig;

4
infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineSource.java
View File

@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.che.workspace.infrastructure.docker;
import org.eclipse.che.api.core.model.machine.MachineSource;
import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl;
import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
import org.eclipse.che.plugin.docker.client.DockerFileException;
import org.eclipse.che.plugin.docker.client.DockerRegistryAuthResolver;

3
infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineStarter.java
View File

@ -20,7 +20,7 @@ import org.eclipse.che.api.core.model.workspace.config.ServerConfig;
import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
import org.eclipse.che.api.core.util.FileCleaner;
import org.eclipse.che.api.core.util.SystemInfo;
import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl;
import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
import org.eclipse.che.commons.annotation.Nullable;
@ -55,7 +55,6 @@ import org.eclipse.che.plugin.docker.client.params.StartContainerParams;
import org.eclipse.che.plugin.docker.client.params.TagParams;
import org.eclipse.che.plugin.docker.client.params.network.ConnectContainerToNetworkParams;
import org.eclipse.che.workspace.infrastructure.docker.exception.SourceNotFoundException;
import org.eclipse.che.plugin.docker.client.params.network.RemoveNetworkParams;
import org.eclipse.che.workspace.infrastructure.docker.model.DockerContainerConfig;
import org.eclipse.che.workspace.infrastructure.docker.monit.AbnormalMachineStopHandler;
import org.eclipse.che.workspace.infrastructure.docker.monit.DockerMachineStopDetector;

2
infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerRegistryClient.java
View File

@ -12,7 +12,7 @@ package org.eclipse.che.workspace.infrastructure.docker;
import com.google.inject.Inject;
import org.eclipse.che.api.core.model.machine.MachineSource;
import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
import org.eclipse.che.commons.lang.IoUtil;
import org.eclipse.che.plugin.docker.client.DockerConnector;
import org.eclipse.che.plugin.docker.client.DockerConnectorProvider;

2
core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineSource.java → infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSource.java
View File

@ -8,7 +8,7 @@
* Contributors:
* Codenvy, S.A. - initial API and implementation
*******************************************************************************/
package org.eclipse.che.api.core.model.machine;
package org.eclipse.che.workspace.infrastructure.docker.snapshot;
/**
* @author gazarenkov

4
wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineSourceImpl.java → infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSourceImpl.java
View File

@ -8,9 +8,7 @@
* Contributors:
* Codenvy, S.A. - initial API and implementation
*******************************************************************************/
package org.eclipse.che.api.workspace.server.model.impl;
import org.eclipse.che.api.core.model.machine.MachineSource;
package org.eclipse.che.workspace.infrastructure.docker.snapshot;
import javax.persistence.Column;
import javax.persistence.Embeddable;

2
infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/SnapshotImpl.java
View File

@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.che.workspace.infrastructure.docker.snapshot;
import org.eclipse.che.api.core.model.machine.MachineSource;
import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
import org.eclipse.che.commons.lang.NameGenerator;
import javax.persistence.Column;

2
infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/old/DockerMachineSourceTest.java
View File

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.workspace.infrastructure.docker.old;
import org.eclipse.che.api.core.model.machine.MachineSource;
import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
import org.eclipse.che.workspace.infrastructure.docker.DockerMachineSource;
import org.mockito.Mock;

7
wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/RecipeRetrieverTest.java
View File

@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.che.api.workspace.server;
import org.eclipse.che.api.core.model.machine.MachineSource;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.testng.MockitoTestNGListener;
@ -40,12 +39,6 @@ public class RecipeRetrieverTest {
// @Mock
// private OldMachineConfig machineConfig;
/**
* OldMachine source embedded in machine config.
*/
@Mock
private MachineSource machineSource;
/**
* Instance used in tests.
*/