diff --git a/core/ide/che-core-ide-api/pom.xml b/core/ide/che-core-ide-api/pom.xml index a585cf01b2..057556e3f8 100644 --- a/core/ide/che-core-ide-api/pom.xml +++ b/core/ide/che-core-ide-api/pom.xml @@ -52,7 +52,7 @@ org.eclipse.che.core - che-core-api-factory + che-core-api-factory-shared org.eclipse.che.core @@ -60,11 +60,11 @@ org.eclipse.che.core - che-core-api-user + che-core-api-user-shared org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/core/ide/che-core-ide-app/pom.xml b/core/ide/che-core-ide-app/pom.xml index 7db60db5e3..860072e960 100644 --- a/core/ide/che-core-ide-app/pom.xml +++ b/core/ide/che-core-ide-app/pom.xml @@ -65,7 +65,7 @@ org.eclipse.che.core - che-core-api-factory + che-core-api-factory-shared org.eclipse.che.core @@ -73,7 +73,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core @@ -85,11 +85,11 @@ org.eclipse.che.core - che-core-api-user + che-core-api-user-shared org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/core/ide/che-core-ide-jseditor/pom.xml b/core/ide/che-core-ide-jseditor/pom.xml index c646c8338f..a3f3741341 100644 --- a/core/ide/che-core-ide-jseditor/pom.xml +++ b/core/ide/che-core-ide-jseditor/pom.xml @@ -45,7 +45,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml index d1ce3e9dd2..f45dc31c46 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml +++ b/core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml @@ -48,11 +48,11 @@ org.eclipse.che.core - che-core-api-factory + che-core-api-factory-shared org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml index a6fd5b78fd..78d3add425 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml +++ b/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml @@ -48,7 +48,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml index d04896d922..9a6f89550a 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml +++ b/core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml @@ -48,7 +48,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml index 15d9e3289a..859bea220c 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml +++ b/core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml @@ -48,7 +48,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core @@ -60,7 +60,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml index e593202760..2dc494cfc1 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml +++ b/core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml @@ -44,7 +44,7 @@ org.eclipse.che.core - che-core-api-user + che-core-api-user-shared org.eclipse.che.core diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml index 4a96c665fd..71915e59da 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml +++ b/core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml @@ -44,7 +44,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core @@ -52,7 +52,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core @@ -75,6 +75,11 @@ gwt-user provided + + org.eclipse.che.core + che-core-api-workspace + provided + diff --git a/core/platform-api/che-core-api-account/pom.xml b/core/platform-api/che-core-api-account/pom.xml index a7ffeb706f..0cd674a1f2 100644 --- a/core/platform-api/che-core-api-account/pom.xml +++ b/core/platform-api/che-core-api-account/pom.xml @@ -69,6 +69,10 @@ org.eclipse.che.core che-core-api-workspace + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-commons-annotations diff --git a/core/platform-api/che-core-api-infrastructure-local/pom.xml b/core/platform-api/che-core-api-infrastructure-local/pom.xml index 30eb50d10a..a573b7f513 100644 --- a/core/platform-api/che-core-api-infrastructure-local/pom.xml +++ b/core/platform-api/che-core-api-infrastructure-local/pom.xml @@ -68,6 +68,10 @@ org.eclipse.che.core che-core-api-machine + + org.eclipse.che.core + che-core-api-machine-shared + org.eclipse.che.core che-core-api-model @@ -89,6 +93,10 @@ org.eclipse.che.core che-core-api-workspace + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-commons-annotations diff --git a/core/platform-api/che-core-api-infrastructure-local/src/main/java/org/eclipse/che/api/local/LocalStackDaoImpl.java b/core/platform-api/che-core-api-infrastructure-local/src/main/java/org/eclipse/che/api/local/LocalStackDaoImpl.java index 7992117b4a..d3aeef9362 100644 --- a/core/platform-api/che-core-api-infrastructure-local/src/main/java/org/eclipse/che/api/local/LocalStackDaoImpl.java +++ b/core/platform-api/che-core-api-infrastructure-local/src/main/java/org/eclipse/che/api/local/LocalStackDaoImpl.java @@ -17,8 +17,8 @@ import org.eclipse.che.api.core.NotFoundException; import org.eclipse.che.api.core.ServerException; import org.eclipse.che.api.local.storage.stack.StackLocalStorage; import org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl; -import org.eclipse.che.api.workspace.server.model.stack.Stack; import org.eclipse.che.api.workspace.server.spi.StackDao; +import org.eclipse.che.api.workspace.shared.stack.Stack; import org.eclipse.che.commons.annotation.Nullable; diff --git a/core/platform-api/che-core-api-infrastructure-local/src/test/java/org/eclipse/che/api/local/LocalStackDaoTest.java b/core/platform-api/che-core-api-infrastructure-local/src/test/java/org/eclipse/che/api/local/LocalStackDaoTest.java index 9657fdecb2..392b4395ef 100644 --- a/core/platform-api/che-core-api-infrastructure-local/src/test/java/org/eclipse/che/api/local/LocalStackDaoTest.java +++ b/core/platform-api/che-core-api-infrastructure-local/src/test/java/org/eclipse/che/api/local/LocalStackDaoTest.java @@ -22,10 +22,10 @@ import org.eclipse.che.api.machine.shared.Permissions; import org.eclipse.che.api.workspace.server.model.impl.stack.StackComponentImpl; import org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl; import org.eclipse.che.api.workspace.server.model.impl.stack.StackSourceImpl; -import org.eclipse.che.api.workspace.server.model.stack.Stack; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; import org.eclipse.che.api.workspace.server.stack.StackTypeAdaptersProvider; import org.eclipse.che.api.workspace.server.stack.image.StackIcon; +import org.eclipse.che.api.workspace.shared.stack.Stack; +import org.eclipse.che.api.workspace.shared.stack.StackSource; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml index 546f72d07f..4288d1991b 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml @@ -40,7 +40,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-docker/che-plugin-docker-machine/pom.xml b/plugins/plugin-docker/che-plugin-docker-machine/pom.xml index 66407c3667..eb91895999 100644 --- a/plugins/plugin-docker/che-plugin-docker-machine/pom.xml +++ b/plugins/plugin-docker/che-plugin-docker-machine/pom.xml @@ -65,6 +65,10 @@ org.eclipse.che.core che-core-api-machine + + org.eclipse.che.core + che-core-api-machine-shared + org.eclipse.che.core che-core-api-model 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 6bee15dcde..7c10065847 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml @@ -63,7 +63,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml b/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml index 164f264815..ec0f82fd70 100644 --- a/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml @@ -46,7 +46,7 @@ org.eclipse.che.core - che-core-api-user + che-core-api-user-shared org.eclipse.che.core diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml index a0bf59cc2a..6e1c785435 100644 --- a/plugins/plugin-github/che-plugin-github-ide/pom.xml +++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml @@ -55,11 +55,11 @@ org.eclipse.che.core - che-core-api-user + che-core-api-user-shared org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core 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 bd96665926..0b1dec40a5 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml @@ -36,7 +36,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core 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 c38d1301a8..c71d3204ca 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 @@ -60,7 +60,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-java/che-plugin-java-ext-maven/pom.xml b/plugins/plugin-java/che-plugin-java-ext-maven/pom.xml index 263ddc8c8b..88cdfcc270 100644 --- a/plugins/plugin-java/che-plugin-java-ext-maven/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-maven/pom.xml @@ -71,7 +71,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core @@ -79,7 +79,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml index c9de52f395..20fd0ef283 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml @@ -59,7 +59,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core @@ -67,11 +67,11 @@ org.eclipse.che.core - che-core-api-user + che-core-api-user-shared org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core 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 4552699c3f..278db59fa0 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml @@ -40,6 +40,10 @@ org.eclipse.che.core che-core-api-machine + + org.eclipse.che.core + che-core-api-machine-shared + org.eclipse.che.core che-core-api-model 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 35594be0bf..cd3f79b2af 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml @@ -36,7 +36,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml index 9daf98ac79..f64ddbe447 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml @@ -40,7 +40,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml index 66057ed972..21c4028e2d 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml @@ -43,7 +43,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml index 898e45c1c6..0aaf73d67c 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml @@ -36,7 +36,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml index fef607861f..efdb8a4385 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml @@ -52,7 +52,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml index c0a3e87321..c8a575b0ee 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml @@ -76,7 +76,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/pom.xml b/pom.xml index 0e218dfabc..a1919e04ed 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,11 @@ che-core-api-factory ${project.version} + + org.eclipse.che.core + che-core-api-factory-shared + ${project.version} + org.eclipse.che.core che-core-api-git @@ -125,6 +130,11 @@ che-core-api-machine ${project.version} + + org.eclipse.che.core + che-core-api-machine-shared + ${project.version} + org.eclipse.che.core che-core-api-model @@ -150,11 +160,21 @@ che-core-api-user ${project.version} + + org.eclipse.che.core + che-core-api-user-shared + ${project.version} + org.eclipse.che.core che-core-api-workspace ${project.version} + + org.eclipse.che.core + che-core-api-workspace-shared + ${project.version} + org.eclipse.che.core che-core-client-gwt-account diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml index 983ab02523..cc98a43cb0 100644 --- a/wsagent/che-core-api-git/pom.xml +++ b/wsagent/che-core-api-git/pom.xml @@ -72,7 +72,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/wsagent/che-core-api-project/pom.xml b/wsagent/che-core-api-project/pom.xml index f70faa5b59..06df7b0130 100644 --- a/wsagent/che-core-api-project/pom.xml +++ b/wsagent/che-core-api-project/pom.xml @@ -100,7 +100,7 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-machine-shared org.eclipse.che.core @@ -110,6 +110,10 @@ org.eclipse.che.core che-core-api-workspace + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-commons-annotations diff --git a/wsagent/che-core-git-impl-native/pom.xml b/wsagent/che-core-git-impl-native/pom.xml index e1db7ce03d..f89d717cf9 100644 --- a/wsagent/che-core-git-impl-native/pom.xml +++ b/wsagent/che-core-git-impl-native/pom.xml @@ -96,7 +96,7 @@ org.eclipse.che.core - che-core-api-workspace + che-core-api-workspace-shared org.eclipse.che.core diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml new file mode 100644 index 0000000000..473a5e9460 --- /dev/null +++ b/wsmaster/che-core-api-factory-shared/pom.xml @@ -0,0 +1,145 @@ + + + + 4.0.0 + + che-master-parent + org.eclipse.che.core + 4.3.0-RC1-SNAPSHOT + + che-core-api-factory-shared + jar + Che Core :: API :: Factory :: Shared + + ${project.build.directory}/generated-sources/dto/ + false + + + + com.google.code.gson + gson + + + org.eclipse.che.core + che-core-api-core + + + org.eclipse.che.core + che-core-api-dto + + + org.eclipse.che.core + che-core-api-workspace-shared + + + org.eclipse.che.core + che-core-api-model + provided + + + + + + src/main/java + + + src/main/resources + + + ${dto-generator-out-directory} + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-resource + process-sources + + add-resource + + + + + ${dto-generator-out-directory}/META-INF + META-INF + + + + + + add-source + process-sources + + add-source + + + + ${dto-generator-out-directory} + + + + + + + maven-compiler-plugin + + + pre-compile + generate-sources + + compile + + + + + + org.eclipse.che.core + che-core-api-dto-maven-plugin + ${project.version} + + + server + process-sources + + generate + + + + org.eclipse.che.api.factory.shared.dto + + ${dto-generator-out-directory} + org.eclipse.che.api.factory.shared.dto.server.DtoServerImpls + server + + + + + + org.eclipse.che.core + che-core-api-factory-shared + ${project.version} + + + org.eclipse.che.core + che-core-api-model + ${project.version} + + + + + + diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Action.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Action.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Action.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Action.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Author.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Author.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Author.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Author.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Button.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Button.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Button.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Button.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/ButtonAttributes.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/ButtonAttributes.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/ButtonAttributes.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/ButtonAttributes.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Factory.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Factory.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Factory.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Factory.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/FactoryV4_0.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/FactoryV4_0.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/FactoryV4_0.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/FactoryV4_0.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Ide.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Ide.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Ide.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Ide.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppClosed.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppClosed.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppClosed.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppClosed.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppLoaded.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppLoaded.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppLoaded.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/OnAppLoaded.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/OnProjectsLoaded.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/OnProjectsLoaded.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/OnProjectsLoaded.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/OnProjectsLoaded.java diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Policies.java b/wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Policies.java similarity index 100% rename from wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/shared/dto/Policies.java rename to wsmaster/che-core-api-factory-shared/src/main/java/org/eclipse/che/api/factory/shared/dto/Policies.java diff --git a/wsmaster/che-core-api-factory/pom.xml b/wsmaster/che-core-api-factory/pom.xml index 00d935b3ff..9c978a2c1b 100644 --- a/wsmaster/che-core-api-factory/pom.xml +++ b/wsmaster/che-core-api-factory/pom.xml @@ -22,7 +22,6 @@ jar Che Core :: API :: Factory - ${project.build.directory}/generated-sources/dto/ false @@ -68,7 +67,11 @@ org.eclipse.che.core - che-core-api-machine + che-core-api-factory-shared + + + org.eclipse.che.core + che-core-api-machine-shared org.eclipse.che.core @@ -82,6 +85,10 @@ org.eclipse.che.core che-core-api-workspace + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-commons-env @@ -163,96 +170,4 @@ test - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-resource - process-sources - - add-resource - - - - - ${dto-generator-out-directory}/META-INF - META-INF - - - - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - server - process-sources - - generate - - - - org.eclipse.che.api.factory.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.factory.shared.dto.server.DtoServerImpls - server - - - - - - org.eclipse.che.core - che-core-api-factory - ${project.version} - - - - - - diff --git a/wsmaster/che-core-api-machine-shared/pom.xml b/wsmaster/che-core-api-machine-shared/pom.xml new file mode 100644 index 0000000000..458c8461b1 --- /dev/null +++ b/wsmaster/che-core-api-machine-shared/pom.xml @@ -0,0 +1,143 @@ + + + + 4.0.0 + + che-master-parent + org.eclipse.che.core + 4.3.0-RC1-SNAPSHOT + + che-core-api-machine-shared + jar + Che Core :: API :: Machine :: Shared + + ${project.build.directory}/generated-sources/dto/ + false + + + + com.google.code.gson + gson + + + org.eclipse.che.core + che-core-api-core + + + org.eclipse.che.core + che-core-api-dto + + + org.eclipse.che.core + che-core-api-model + + + org.eclipse.che.core + che-core-commons-annotations + + + + + + src/main/java + + + src/main/resources + + + ${dto-generator-out-directory} + + + + + org.eclipse.che.core + che-core-api-dto-maven-plugin + ${project.version} + + + process-sources + + generate + + + + + + org.eclipse.che.core + che-core-api-core + ${project.version} + + + org.eclipse.che.core + che-core-api-machine-shared + ${project.version} + + + + + org.eclipse.che.api.machine.shared.dto + + ${dto-generator-out-directory} + org.eclipse.che.api.machine.shared.dto.DtoServerImpls + server + + + + maven-compiler-plugin + + + pre-compile + generate-sources + + compile + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-resource + process-sources + + add-resource + + + + + ${dto-generator-out-directory}/META-INF + META-INF + + + + + + add-source + process-sources + + add-source + + + + ${dto-generator-out-directory} + + + + + + + + diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Constants.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Constants.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Constants.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Constants.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Group.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Group.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Group.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Group.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/ManagedRecipe.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/ManagedRecipe.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/ManagedRecipe.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/ManagedRecipe.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Permissible.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Permissible.java similarity index 86% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Permissible.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Permissible.java index a2b16178e7..62f0476f5e 100644 --- a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Permissible.java +++ b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Permissible.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.che.api.machine.shared; -import org.eclipse.che.api.machine.server.recipe.PermissionsChecker; + /** * Permissible interface should be implemented by data objects which require access. - * It is commonly used with the {@link PermissionsChecker}. + * It is commonly used with the {@link org.eclipse.che.api.machine.server.recipe.PermissionsChecker}. * * @author Alexander Andrienko */ diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Permissions.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Permissions.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/Permissions.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/Permissions.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/CommandDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/CommandDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/CommandDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/CommandDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/LimitsDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/LimitsDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/LimitsDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/LimitsDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineConfigDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineConfigDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineConfigDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineConfigDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineProcessDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineProcessDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineProcessDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineProcessDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineRuntimeInfoDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineRuntimeInfoDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineRuntimeInfoDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineRuntimeInfoDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineSourceDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineSourceDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineSourceDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineSourceDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/NewSnapshotDescriptor.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/NewSnapshotDescriptor.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/NewSnapshotDescriptor.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/NewSnapshotDescriptor.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerConfDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerConfDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerConfDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerConfDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/ServerDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/SnapshotDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/SnapshotDto.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/SnapshotDto.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/SnapshotDto.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineProcessEvent.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineProcessEvent.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineProcessEvent.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineProcessEvent.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineStatusEvent.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineStatusEvent.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineStatusEvent.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/event/MachineStatusEvent.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/GroupDescriptor.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/GroupDescriptor.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/GroupDescriptor.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/GroupDescriptor.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/MachineRecipe.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/MachineRecipe.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/MachineRecipe.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/MachineRecipe.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/NewRecipe.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/NewRecipe.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/NewRecipe.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/NewRecipe.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/PermissionsDescriptor.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/PermissionsDescriptor.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/PermissionsDescriptor.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/PermissionsDescriptor.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeDescriptor.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeDescriptor.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeDescriptor.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeDescriptor.java diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeUpdate.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeUpdate.java similarity index 100% rename from wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeUpdate.java rename to wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/recipe/RecipeUpdate.java diff --git a/wsmaster/che-core-api-machine/pom.xml b/wsmaster/che-core-api-machine/pom.xml index f40ffab1e7..0133cf90f4 100644 --- a/wsmaster/che-core-api-machine/pom.xml +++ b/wsmaster/che-core-api-machine/pom.xml @@ -22,10 +22,7 @@ jar Che Core :: API :: Machine - ${project.build.directory}/generated-sources/dto/ false - - @@ -64,6 +61,10 @@ org.eclipse.che.core che-core-api-dto + + org.eclipse.che.core + che-core-api-machine-shared + org.eclipse.che.core che-core-api-model @@ -159,97 +160,4 @@ test - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-core - ${project.version} - - - org.eclipse.che.core - che-core-api-machine - ${project.version} - - - - - org.eclipse.che.api.machine.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.machine.shared.dto.DtoServerImpls - server - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-resource - process-sources - - add-resource - - - - - ${dto-generator-out-directory}/META-INF - META-INF - - - - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - diff --git a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/recipe/adapters/GroupAdapter.java b/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/recipe/adapters/GroupAdapter.java index 486368ccb2..52c8a9363c 100644 --- a/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/recipe/adapters/GroupAdapter.java +++ b/wsmaster/che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/recipe/adapters/GroupAdapter.java @@ -44,4 +44,4 @@ public class GroupAdapter implements JsonDeserializer, JsonSerializer, JsonSe public JsonElement serialize(Permissions src, Type typeOfSrc, JsonSerializationContext context) { return context.serialize(src, PermissionsImpl.class); } -} \ No newline at end of file +} diff --git a/wsmaster/che-core-api-machine/src/test/java/org/eclipse/che/api/machine/server/recipe/PermissionsCheckerTest.java b/wsmaster/che-core-api-machine/src/test/java/org/eclipse/che/api/machine/server/recipe/PermissionsCheckerTest.java index 9ee950db6a..1400836264 100644 --- a/wsmaster/che-core-api-machine/src/test/java/org/eclipse/che/api/machine/server/recipe/PermissionsCheckerTest.java +++ b/wsmaster/che-core-api-machine/src/test/java/org/eclipse/che/api/machine/server/recipe/PermissionsCheckerTest.java @@ -16,7 +16,6 @@ import org.eclipse.che.api.machine.shared.ManagedRecipe; //import org.eclipse.che.api.workspace.server.dao.Member; //import org.eclipse.che.api.workspace.server.dao.MemberDao; import org.mockito.InjectMocks; -import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; import org.testng.annotations.Listeners; import org.testng.annotations.Test; @@ -26,7 +25,6 @@ import java.util.Map; import static java.util.Arrays.asList; import static java.util.Collections.singletonMap; -import static org.mockito.Mockito.when; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml new file mode 100644 index 0000000000..c441bf05d3 --- /dev/null +++ b/wsmaster/che-core-api-user-shared/pom.xml @@ -0,0 +1,137 @@ + + + + 4.0.0 + + che-master-parent + org.eclipse.che.core + 4.3.0-RC1-SNAPSHOT + + che-core-api-user-shared + Che Core :: API :: User :: Shared + + ${project.build.directory}/generated-sources/dto/ + false + + + + com.google.code.gson + gson + + + com.google.guava + guava + + + io.swagger + swagger-annotations + + + org.eclipse.che.core + che-core-api-core + + + org.eclipse.che.core + che-core-api-dto + + + + + + src/main/java + + + src/main/resources + + + ${dto-generator-out-directory} + + + + + org.eclipse.che.core + che-core-api-dto-maven-plugin + ${project.version} + + + process-sources + + generate + + + + + + org.eclipse.che.core + che-core-api-user-shared + ${project.version} + + + + + org.eclipse.che.api.user.shared.dto + + ${dto-generator-out-directory} + org.eclipse.che.api.user.server.dto.DtoServerImpls + server + + + + maven-compiler-plugin + + + pre-compile + generate-sources + + compile + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-resource + process-sources + + add-resource + + + + + ${dto-generator-out-directory}/META-INF + META-INF + + + + + + add-source + process-sources + + add-source + + + + ${dto-generator-out-directory} + + + + + + + + diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/MembershipDto.java b/wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/MembershipDto.java similarity index 100% rename from wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/MembershipDto.java rename to wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/MembershipDto.java diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/ProfileDescriptor.java b/wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/ProfileDescriptor.java similarity index 100% rename from wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/ProfileDescriptor.java rename to wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/ProfileDescriptor.java diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/UserDescriptor.java b/wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/UserDescriptor.java similarity index 100% rename from wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/UserDescriptor.java rename to wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/UserDescriptor.java diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/UserInRoleDescriptor.java b/wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/UserInRoleDescriptor.java similarity index 100% rename from wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/dto/UserInRoleDescriptor.java rename to wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/dto/UserInRoleDescriptor.java diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/model/Membership.java b/wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/model/Membership.java similarity index 100% rename from wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/shared/model/Membership.java rename to wsmaster/che-core-api-user-shared/src/main/java/org/eclipse/che/api/user/shared/model/Membership.java diff --git a/wsmaster/che-core-api-user/pom.xml b/wsmaster/che-core-api-user/pom.xml index c22610e64d..496405e1cc 100644 --- a/wsmaster/che-core-api-user/pom.xml +++ b/wsmaster/che-core-api-user/pom.xml @@ -21,14 +21,9 @@ che-core-api-user Che Core :: API :: User - ${project.build.directory}/generated-sources/dto/ false - - com.google.code.gson - gson - com.google.guava guava @@ -57,6 +52,10 @@ org.eclipse.che.core che-core-api-dto + + org.eclipse.che.core + che-core-api-user-shared + org.eclipse.che.core che-core-commons-env @@ -108,92 +107,4 @@ test - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-user - ${project.version} - - - - - org.eclipse.che.api.user.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.user.server.dto.DtoServerImpls - server - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-resource - process-sources - - add-resource - - - - - ${dto-generator-out-directory}/META-INF - META-INF - - - - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml new file mode 100644 index 0000000000..f4a5cd1506 --- /dev/null +++ b/wsmaster/che-core-api-workspace-shared/pom.xml @@ -0,0 +1,151 @@ + + + + 4.0.0 + + che-master-parent + org.eclipse.che.core + 4.3.0-RC1-SNAPSHOT + + che-core-api-workspace-shared + jar + Che Core :: API :: Workspace :: Shared + + ${project.build.directory}/generated-sources/dto/ + false + + + + com.google.code.gson + gson + + + io.swagger + swagger-annotations + + + org.eclipse.che.core + che-core-api-core + + + org.eclipse.che.core + che-core-api-dto + + + org.eclipse.che.core + che-core-api-machine-shared + + + org.eclipse.che.core + che-core-api-model + + + org.eclipse.che.core + che-core-commons-annotations + + + + + + src/main/java + + + src/main/resources + + + ${dto-generator-out-directory} + + + + + org.eclipse.che.core + che-core-api-dto-maven-plugin + ${project.version} + + + process-sources + + generate + + + + + + org.eclipse.che.core + che-core-api-machine-shared + ${project.version} + + + org.eclipse.che.core + che-core-api-workspace-shared + ${project.version} + + + + + org.eclipse.che.api.workspace.shared.dto + + ${dto-generator-out-directory} + org.eclipse.che.api.workspace.server.dto.DtoServerImpls + server + + + + maven-compiler-plugin + + + pre-compile + generate-sources + + compile + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-resource + process-sources + + add-resource + + + + + ${dto-generator-out-directory}/META-INF + META-INF + + + + + + add-source + process-sources + + add-source + + + + ${dto-generator-out-directory} + + + + + + + + diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/EnvironmentDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/EnvironmentDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/EnvironmentDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/EnvironmentDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectConfigDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectConfigDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectConfigDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectConfigDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectProblemDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectProblemDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectProblemDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/ProjectProblemDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/RecipeDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/RecipeDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/RecipeDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/RecipeDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/SourceStorageDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/SourceStorageDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/SourceStorageDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/SourceStorageDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceConfigDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceConfigDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceConfigDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceConfigDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceRuntimeDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceRuntimeDto.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceRuntimeDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/WorkspaceRuntimeDto.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/event/WorkspaceStatusEvent.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/event/WorkspaceStatusEvent.java similarity index 100% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/event/WorkspaceStatusEvent.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/event/WorkspaceStatusEvent.java diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackComponentDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackComponentDto.java similarity index 92% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackComponentDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackComponentDto.java index 1946bcb3a1..459fa92123 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackComponentDto.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackComponentDto.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.che.api.workspace.shared.dto.stack; -import org.eclipse.che.api.workspace.server.model.stack.StackComponent; + +import org.eclipse.che.api.workspace.shared.stack.StackComponent; import org.eclipse.che.dto.shared.DTO; /** diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackDto.java similarity index 97% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackDto.java index f491d5f983..77697c590d 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackDto.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackDto.java @@ -13,8 +13,8 @@ package org.eclipse.che.api.workspace.shared.dto.stack; import org.eclipse.che.api.core.rest.shared.dto.Hyperlinks; import org.eclipse.che.api.core.rest.shared.dto.Link; import org.eclipse.che.api.machine.shared.dto.recipe.PermissionsDescriptor; -import org.eclipse.che.api.workspace.server.model.stack.Stack; import org.eclipse.che.api.workspace.shared.dto.WorkspaceConfigDto; +import org.eclipse.che.api.workspace.shared.stack.Stack; import org.eclipse.che.dto.shared.DTO; import java.util.List; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackSourceDto.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackSourceDto.java similarity index 92% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackSourceDto.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackSourceDto.java index 779718c5a2..d3952dc316 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackSourceDto.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/stack/StackSourceDto.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.api.workspace.shared.dto.stack; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; +import org.eclipse.che.api.workspace.shared.stack.StackSource; import org.eclipse.che.dto.shared.DTO; /** diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/Stack.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/Stack.java similarity index 97% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/Stack.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/Stack.java index e7828fa2c1..8a07623084 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/Stack.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/Stack.java @@ -8,12 +8,12 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.model.stack; +package org.eclipse.che.api.workspace.shared.stack; import com.sun.istack.internal.Nullable; -import org.eclipse.che.api.core.model.workspace.WorkspaceConfig; import org.eclipse.che.api.machine.shared.Permissible; +import org.eclipse.che.api.core.model.workspace.WorkspaceConfig; import java.util.List; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/StackComponent.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/StackComponent.java similarity index 94% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/StackComponent.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/StackComponent.java index 3de87c3aa4..b9f9a084c3 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/StackComponent.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/StackComponent.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.model.stack; +package org.eclipse.che.api.workspace.shared.stack; /** * Defines the interface that describes the stack component. It is a part of the {@link Stack}. diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/StackSource.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/StackSource.java similarity index 96% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/StackSource.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/StackSource.java index 51a954f287..654bc2f013 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/stack/StackSource.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/stack/StackSource.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.model.stack; +package org.eclipse.che.api.workspace.shared.stack; /** * Defines the interface that describes the stack source. It is a part of the {@link Stack} diff --git a/wsmaster/che-core-api-workspace/pom.xml b/wsmaster/che-core-api-workspace/pom.xml index 507dab045f..ad72f69f5e 100644 --- a/wsmaster/che-core-api-workspace/pom.xml +++ b/wsmaster/che-core-api-workspace/pom.xml @@ -22,7 +22,6 @@ jar Che Core :: API :: Workspace - ${project.build.directory}/generated-sources/dto/ false @@ -66,6 +65,10 @@ org.eclipse.che.core che-core-api-machine + + org.eclipse.che.core + che-core-api-machine-shared + org.eclipse.che.core che-core-api-model @@ -74,6 +77,10 @@ org.eclipse.che.core che-core-api-user + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-commons-annotations @@ -148,97 +155,4 @@ test - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-machine - ${project.version} - - - org.eclipse.che.core - che-core-api-workspace - ${project.version} - - - - - org.eclipse.che.api.workspace.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.workspace.server.dto.DtoServerImpls - server - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-resource - process-sources - - add-resource - - - - - ${dto-generator-out-directory}/META-INF - META-INF - - - - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java index f001b0dcf9..8db69e2915 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java @@ -24,8 +24,6 @@ import org.eclipse.che.api.machine.shared.dto.SnapshotDto; import org.eclipse.che.api.machine.shared.dto.recipe.GroupDescriptor; import org.eclipse.che.api.machine.shared.dto.recipe.PermissionsDescriptor; import org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl; -import org.eclipse.che.api.workspace.server.model.stack.Stack; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; import org.eclipse.che.api.workspace.shared.dto.EnvironmentDto; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.RecipeDto; @@ -36,6 +34,8 @@ import org.eclipse.che.api.workspace.shared.dto.WorkspaceRuntimeDto; import org.eclipse.che.api.workspace.shared.dto.stack.StackComponentDto; import org.eclipse.che.api.workspace.shared.dto.stack.StackDto; import org.eclipse.che.api.workspace.shared.dto.stack.StackSourceDto; +import org.eclipse.che.api.workspace.shared.stack.Stack; +import org.eclipse.che.api.workspace.shared.stack.StackSource; import java.util.List; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackComponentImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackComponentImpl.java index 56e3b6fbcc..7bddfe1e6d 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackComponentImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackComponentImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.api.workspace.server.model.impl.stack; -import org.eclipse.che.api.workspace.server.model.stack.StackComponent; +import org.eclipse.che.api.workspace.shared.stack.StackComponent; import java.util.Objects; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackImpl.java index 606cdbef72..cabcd80718 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackImpl.java @@ -16,10 +16,10 @@ import org.eclipse.che.api.machine.server.recipe.PermissionsImpl; import org.eclipse.che.api.machine.shared.Group; import org.eclipse.che.api.machine.shared.Permissions; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceConfigImpl; -import org.eclipse.che.api.workspace.server.model.stack.Stack; -import org.eclipse.che.api.workspace.server.model.stack.StackComponent; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; import org.eclipse.che.api.workspace.server.stack.image.StackIcon; +import org.eclipse.che.api.workspace.shared.stack.Stack; +import org.eclipse.che.api.workspace.shared.stack.StackComponent; +import org.eclipse.che.api.workspace.shared.stack.StackSource; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.commons.lang.NameGenerator; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackSourceImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackSourceImpl.java index ecffeb92cf..3bd7651c66 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackSourceImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/stack/StackSourceImpl.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.che.api.workspace.server.model.impl.stack; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; + +import org.eclipse.che.api.workspace.shared.stack.StackSource; import java.util.Objects; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java index 382edd5cae..e532fd8c2d 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackLoader.java @@ -19,10 +19,10 @@ import com.google.inject.name.Named; import org.eclipse.che.api.core.NotFoundException; import org.eclipse.che.api.core.ServerException; -import org.eclipse.che.api.workspace.server.model.stack.Stack; import org.eclipse.che.api.workspace.server.spi.StackDao; import org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl; import org.eclipse.che.api.workspace.server.stack.image.StackIcon; +import org.eclipse.che.api.workspace.shared.stack.Stack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java index 0e410426a8..ae3d420765 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java @@ -28,9 +28,6 @@ import org.eclipse.che.api.machine.server.recipe.adapters.PermissionsAdapter; import org.eclipse.che.api.machine.server.recipe.adapters.RecipeTypeAdapter; import org.eclipse.che.api.machine.shared.Group; import org.eclipse.che.api.machine.shared.Permissions; -import org.eclipse.che.api.workspace.server.model.stack.Stack; -import org.eclipse.che.api.workspace.server.model.stack.StackComponent; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; import org.eclipse.che.api.workspace.server.stack.adapters.CommandAdapter; import org.eclipse.che.api.workspace.server.stack.adapters.EnvironmentAdapter; import org.eclipse.che.api.workspace.server.stack.adapters.LimitsAdapter; @@ -42,6 +39,8 @@ import org.eclipse.che.api.workspace.server.stack.adapters.StackIconAdapter; import org.eclipse.che.api.workspace.server.stack.adapters.StackSourceAdapter; import org.eclipse.che.api.workspace.server.stack.adapters.WorkspaceConfigAdapter; import org.eclipse.che.api.workspace.server.stack.image.StackIcon; +import org.eclipse.che.api.workspace.shared.stack.StackComponent; +import org.eclipse.che.api.workspace.shared.stack.StackSource; import java.util.HashMap; import java.util.Map; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackComponentAdapter.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackComponentAdapter.java index 6777ce94d1..e852eb8540 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackComponentAdapter.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackComponentAdapter.java @@ -17,8 +17,9 @@ import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; + import org.eclipse.che.api.workspace.server.model.impl.stack.StackComponentImpl; -import org.eclipse.che.api.workspace.server.model.stack.StackComponent; +import org.eclipse.che.api.workspace.shared.stack.StackComponent; import java.lang.reflect.Type; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackSourceAdapter.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackSourceAdapter.java index 4a44f6774b..de65e9e697 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackSourceAdapter.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/adapters/StackSourceAdapter.java @@ -18,7 +18,7 @@ import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import org.eclipse.che.api.workspace.server.model.impl.stack.StackSourceImpl; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; +import org.eclipse.che.api.workspace.shared.stack.StackSource; import java.lang.reflect.Type; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java index de9fc6ae84..a4b373f7d6 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java @@ -33,8 +33,6 @@ import org.eclipse.che.api.machine.shared.dto.LimitsDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineSourceDto; import org.eclipse.che.api.machine.shared.dto.ServerConfDto; -import org.eclipse.che.api.workspace.server.model.stack.StackComponent; -import org.eclipse.che.api.workspace.server.model.stack.StackSource; import org.eclipse.che.api.workspace.server.spi.StackDao; import org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl; import org.eclipse.che.api.workspace.server.stack.adapters.CommandAdapter; @@ -54,6 +52,8 @@ import org.eclipse.che.api.workspace.shared.dto.SourceStorageDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceConfigDto; import org.eclipse.che.api.workspace.shared.dto.stack.StackComponentDto; import org.eclipse.che.api.workspace.shared.dto.stack.StackDto; +import org.eclipse.che.api.workspace.shared.stack.StackComponent; +import org.eclipse.che.api.workspace.shared.stack.StackSource; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; import org.testng.annotations.Listeners; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java index f7ed21a68f..1a26473f9c 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java @@ -27,7 +27,6 @@ import org.eclipse.che.api.machine.server.recipe.PermissionsChecker; import org.eclipse.che.api.machine.shared.Permissible; import org.eclipse.che.api.machine.shared.dto.recipe.GroupDescriptor; import org.eclipse.che.api.machine.shared.dto.recipe.PermissionsDescriptor; -import org.eclipse.che.api.workspace.server.model.stack.StackComponent; import org.eclipse.che.api.workspace.server.spi.StackDao; import org.eclipse.che.api.workspace.server.model.impl.EnvironmentImpl; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceConfigImpl; @@ -38,6 +37,7 @@ import org.eclipse.che.api.workspace.server.stack.image.StackIcon; import org.eclipse.che.api.workspace.shared.dto.stack.StackDto; import org.eclipse.che.api.workspace.shared.dto.stack.StackComponentDto; import org.eclipse.che.api.workspace.shared.dto.stack.StackSourceDto; +import org.eclipse.che.api.workspace.shared.stack.StackComponent; import org.eclipse.che.commons.env.EnvironmentContext; import org.eclipse.che.commons.user.UserImpl; import org.eclipse.che.dto.server.DtoFactory; diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml index 41837d8f25..8a29c3ef9a 100644 --- a/wsmaster/pom.xml +++ b/wsmaster/pom.xml @@ -25,9 +25,13 @@ pom Che Master Parent + che-core-api-machine-shared che-core-api-machine + che-core-api-workspace-shared che-core-api-workspace + che-core-api-user-shared che-core-api-user + che-core-api-factory-shared che-core-api-factory che-core-api-ssh che-core-api-ssh-shared