From 5bb2b1d7aafe0cdf98743ece08124294212091c1 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Mon, 30 Oct 2017 15:20:39 +0200 Subject: [PATCH 1/3] Adapt modules to gwt-lib/gwt-app lifecycle; enabled launching Super DevMode as reactor goal gwt:codeserver; enabled launching Super DevMode inside a dev-machine (for Che in Che development); separate IDE GWT app from IDE WEB app. Signed-off-by: Artem Zatsarynnyi --- assembly-multiuser/assembly-ide-war/pom.xml | 9 +- assembly/assembly-ide-war/pom.xml | 394 +-------------- core/che-core-api-core/pom.xml | 11 - core/che-core-api-model/pom.xml | 13 - ide/che-core-ide-api/pom.xml | 102 +++- .../che/ide/Api.gwt.xml => module.gwt.xml} | 21 +- .../org/eclipse/che/api/core/Core.gwt.xml | 12 +- .../org/eclipse/che/api/git/Git.gwt.xml | 1 - ide/che-core-ide-app/pom.xml | 155 +++--- .../che/ide/Core.gwt.xml => module.gwt.xml} | 12 +- ide/che-core-ide-generators/pom.xml | 11 - ide/che-core-ide-ui/pom.xml | 25 +- .../ui/CodenvyUI.gwt.xml => module.gwt.xml} | 5 +- .../css/font-awesome.min.css | 0 .../font-awesome-4.5.0/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin ide/che-core-orion-editor/pom.xml | 35 +- .../OrionEditor.gwt.xml => module.gwt.xml} | 5 +- ide/che-ide-core/pom.xml | 24 +- ide/che-ide-gwt-app/pom.xml | 364 ++++++++++++++ ide/che-ide-gwt-app/src/main/module.gwt.xml | 17 + .../org/eclipse/che/ide/public/IDE.css | 0 ide/gwt-logger/pom.xml | 65 +-- .../slf4j/Logging.gwt.xml => module.gwt.xml} | 2 +- .../org/slf4j/LoggerFactory.java | 0 .../org/slf4j/helpers/NamedLoggerBase.java | 0 infrastructures/docker/docker-client/pom.xml | 11 - .../che-multiuser-api-organization/pom.xml | 11 - .../api/che-multiuser-api-permission/pom.xml | 11 - .../api/che-multiuser-api-resource/pom.xml | 11 - .../che-multiuser-keycloak-ide/pom.xml | 41 +- .../src/main/module.gwt.xml} | 1 - .../che-multiuser-keycloak-shared/pom.xml | 10 - .../pom.xml | 47 +- .../src/main/module.gwt.xml} | 1 - .../pom.xml | 7 - .../pom.xml | 11 - .../che-plugin-activity-ide/pom.xml | 20 +- .../ActivityModule.gwt.xml => module.gwt.xml} | 2 - .../che-plugin-activity-wsmaster/pom.xml | 8 - .../che-plugin-composer-ide/pom.xml | 59 ++- .../Composer.gwt.xml => module.gwt.xml} | 3 - .../che-plugin-composer-server/pom.xml | 12 - .../che-plugin-composer-shared/pom.xml | 11 - .../che-plugin-cpp-lang-ide/pom.xml | 41 +- .../src/main/module.gwt.xml} | 4 +- .../org/eclipse/che/plugin/cpp/Cpp.gwt.xml | 28 -- .../che-plugin-cpp-lang-shared/pom.xml | 10 - .../che-plugin-csharp-lang-ide/pom.xml | 41 +- .../src/main/module.gwt.xml | 25 + .../eclipse/che/plugin/csharp/CSharp.gwt.xml | 28 -- .../che-plugin-csharp-lang-shared/pom.xml | 10 - .../che-plugin-ext-dashboard/pom.xml | 30 +- .../che-plugin-debugger-ide/pom.xml | 52 +- .../src/main/module.gwt.xml | 19 + .../che/plugin/debugger/Debugger.gwt.xml | 27 -- plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml | 39 +- .../src/main/module.gwt.xml | 24 + .../org/eclipse/che/plugin/gdb/Gdb.gwt.xml | 27 -- .../plugin-gdb/che-plugin-gdb-server/pom.xml | 8 - .../plugin-git/che-plugin-git-ext-git/pom.xml | 63 ++- .../org/eclipse/che/ide/ext/git/Git.gwt.xml | 29 -- .../che-plugin-github-ide/pom.xml | 48 +- .../src/main/module.gwt.xml | 23 + .../eclipse/che/plugin/github/GitHub.gwt.xml | 33 -- .../che-plugin-github-oauth2/pom.xml | 12 - .../che-plugin-github-pullrequest/pom.xml | 46 +- ...thubPullRequest.gwt.xml => module.gwt.xml} | 9 - .../che-plugin-github-server/pom.xml | 19 - .../che-plugin-github-shared/pom.xml | 7 - .../plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml | 28 +- .../che-plugin-help-ext-client/pom.xml | 30 +- .../ide/ext/help/HelpAboutExtension.gwt.xml | 25 - .../che-plugin-java-debugger-ide/pom.xml | 50 +- .../src/main/module.gwt.xml} | 3 +- .../che/plugin/jdb/JavaDebugger.gwt.xml | 27 -- .../che-plugin-java-debugger-server/pom.xml | 8 - .../che-plugin-java-ext-lang-client/pom.xml | 59 ++- .../src/main/module.gwt.xml | 19 + .../org/eclipse/che/ide/ext/java/Java.gwt.xml | 32 -- .../che-plugin-java-ext-lang-shared/pom.xml | 11 - .../che-plugin-java-plain-ide/pom.xml | 47 +- .../che/plugin/java/plain/PlainJava.gwt.xml | 29 -- .../che-plugin-java-plain-server/pom.xml | 18 - .../che-plugin-java-plain-shared/pom.xml | 7 - .../plugin-keybinding-eclipse-ide/pom.xml | 18 +- .../{eclipse => }/EclipseKeyBinding.java | 2 +- .../src/main/module.gwt.xml} | 2 +- .../eclipse/EclipseKeyBinding.gwt.xml | 27 -- .../che-plugin-languageserver-ide/pom.xml | 40 +- .../src/main/module.gwt.xml | 21 + .../languageserver/LanguageServer.gwt.xml | 30 -- .../che-plugin-machine-ssh-client/pom.xml | 44 +- .../src/main/module.gwt.xml} | 4 +- .../che/ide/ext/ssh/MachineSsh.gwt.xml | 27 -- .../pom.xml | 11 - .../plugin-maven/che-plugin-maven-ide/pom.xml | 61 ++- .../eclipse/che/plugin/maven/Maven.gwt.xml | 27 -- .../che-plugin-maven-server/pom.xml | 21 - .../che-plugin-maven-shared/pom.xml | 11 - .../che-plugin-nodejs-debugger-ide/pom.xml | 18 +- .../src/main/module.gwt.xml | 24 + .../plugin/nodejsdbg/NodeJsDebugger.gwt.xml | 27 -- .../che-plugin-nodejs-lang-ide/pom.xml | 41 +- .../src/main/module.gwt.xml | 20 + .../eclipse/che/plugin/nodejs/NodeJs.gwt.xml | 28 -- .../che-plugin-nodejs-lang-shared/pom.xml | 7 - .../che-plugin-orion-compare/pom.xml | 20 +- .../OrionCompare.gwt.xml => module.gwt.xml} | 4 +- .../che-plugin-php-lang-ide/pom.xml | 41 +- .../src/main/module.gwt.xml | 20 + .../org/eclipse/che/plugin/php/Php.gwt.xml | 28 -- .../che-plugin-php-lang-shared/pom.xml | 10 - plugins/plugin-product-info/pom.xml | 21 +- .../src/main/module.gwt.xml} | 4 +- .../che-plugin-pullrequest-ide/pom.xml | 76 ++- .../che-plugin-pullrequest-server/pom.xml | 8 - .../che-plugin-pullrequest-shared/pom.xml | 83 ---- .../che-plugin-python-lang-ide/pom.xml | 41 +- .../src/main/module.gwt.xml | 20 + .../eclipse/che/plugin/python/Python.gwt.xml | 28 -- .../che-plugin-python-lang-shared/pom.xml | 7 - .../che-plugin-sdk-ext-plugins/pom.xml | 56 +-- .../{command => }/GwtCheCommandType.java | 32 +- .../ext/plugins/client/PluginsGinModule.java | 1 - .../client/PluginsLocalizationConstant.java | 35 -- .../ext/plugins/client/PluginsResources.java | 4 - .../client/command/GwtCheCommandModel.java | 94 ---- .../command/GwtCheCommandPagePresenter.java | 114 ----- .../client/command/GwtCheCommandPageView.java | 54 --- .../command/GwtCheCommandPageViewImpl.java | 130 ----- .../command/GwtCheCommandPageViewImpl.ui.xml | 74 --- .../PluginsLocalizationConstant.properties | 16 - .../ide/ext/plugins/client/cheClassPath.txt | 304 ------------ .../command/GwtChePagePresenterTest.java | 114 ----- .../che-plugin-testing-junit-ide/pom.xml | 43 +- .../junit/JUnit.gwt.xml => module.gwt.xml} | 3 - .../che-plugin-testing-testng-ide/pom.xml | 22 +- .../testng/TestNG.gwt.xml => module.gwt.xml} | 3 - .../che-plugin-testing-phpunit-ide/pom.xml | 22 +- .../src/main/module.gwt.xml | 16 + .../plugin/testing/phpunit/PHPUnit.gwt.xml | 21 - .../che-plugin-testing-ide/pom.xml | 15 +- .../src/main/module.gwt.xml} | 8 +- .../plugin/testing/TestingExtension.gwt.xml | 27 -- .../plugin-traefik-docker/pom.xml | 10 - .../che-plugin-web-ext-shared/pom.xml | 17 - .../plugin-web/che-plugin-web-ext-web/pom.xml | 49 +- .../web/client}/WebExtension.java | 16 +- .../web/client}/WebExtensionResource.java | 2 +- .../web/client}/WebLocalizationConstant.java | 2 +- .../web/client}/css/NewCssFileAction.java | 4 +- .../web/client}/css/NewLessFileAction.java | 4 +- .../web/client}/html/NewHtmlFileAction.java | 4 +- .../web/client}/html/PreviewHTMLAction.java | 4 +- .../html/editor/AutoEditStrategyFactory.java | 2 +- .../editor/DefaultCodeAssistProcessor.java | 2 +- .../html/editor/HTMLCodeAssistProcessor.java | 2 +- .../HTMLEditorConfigurationProvider.java | 2 +- .../html/editor/HtmlEditorConfiguration.java | 2 +- .../html/editor/HtmlEditorProvider.java | 2 +- .../web/client}/inject/WebModule.java | 6 +- .../client}/js/NewJavaScriptFileAction.java | 4 +- .../js/editor/DefaultCodeAssistProcessor.java | 2 +- .../js/editor/JsCodeAssistProcessor.java | 2 +- .../js/editor/JsEditorConfiguration.java | 4 +- .../editor/JsEditorConfigurationProvider.java | 4 +- .../client}/js/editor/JsEditorProvider.java | 2 +- .../typescript/TSProjectWizardRegistrar.java | 2 +- .../org/eclipse/che/ide/ext/web/Web.gwt.xml | 22 - .../WebLocalizationConstant.properties | 0 .../web => plugin/web/client}/category/js.svg | 0 .../ext/web => plugin/web/client}/css.svg | 0 .../ext/web => plugin/web/client}/html.svg | 0 .../{ide/ext/web => plugin/web/client}/js.svg | 0 .../ext/web => plugin/web/client}/less.svg | 0 .../ext/web => plugin/web/client}/php.svg | 0 .../plugin-yaml/che-plugin-yaml-ide/pom.xml | 46 +- .../src/main/module.gwt.xml | 20 + .../org/eclipse/che/plugin/yaml/Yaml.gwt.xml | 27 -- .../che-plugin-yaml-server/pom.xml | 10 - .../che-plugin-yaml-shared/pom.xml | 11 - .../che-plugin-zend-debugger-ide/pom.xml | 27 +- .../src/main/module.gwt.xml | 15 + .../che/plugin/zdb/ZendDebugger.gwt.xml | 23 - pom.xml | 457 +++++++++++++++++- wsagent/che-core-api-debug-shared/pom.xml | 7 - wsagent/che-core-api-debug/pom.xml | 11 - wsagent/che-core-api-git-shared/pom.xml | 7 - wsagent/che-core-api-git/pom.xml | 22 - .../pom.xml | 24 - wsagent/che-core-api-languageserver/pom.xml | 19 - wsagent/che-core-api-project-shared/pom.xml | 11 - wsagent/che-core-api-project/pom.xml | 11 - wsagent/che-core-api-testing-shared/pom.xml | 5 - wsagent/che-core-api-testing/pom.xml | 11 - wsagent/che-core-ssh-key-ide/pom.xml | 24 +- .../src/main/module.gwt.xml | 22 + .../eclipse/che/plugin/ssh/key/SshKey.gwt.xml | 26 - wsagent/che-core-ssh-key-server/pom.xml | 13 - wsmaster/che-core-api-auth-shared/pom.xml | 11 - wsmaster/che-core-api-factory-shared/pom.xml | 11 - wsmaster/che-core-api-installer/pom.xml | 14 - .../pom.xml | 11 - wsmaster/che-core-api-ssh-shared/pom.xml | 8 - wsmaster/che-core-api-ssh/pom.xml | 11 - wsmaster/che-core-api-system-shared/pom.xml | 11 - wsmaster/che-core-api-system/pom.xml | 11 - wsmaster/che-core-api-user-shared/pom.xml | 11 - .../che-core-api-workspace-shared/pom.xml | 11 - 214 files changed, 2475 insertions(+), 3441 deletions(-) rename ide/che-core-ide-api/src/main/{resources/org/eclipse/che/ide/Api.gwt.xml => module.gwt.xml} (71%) rename ide/che-core-ide-app/src/main/{resources/org/eclipse/che/ide/Core.gwt.xml => module.gwt.xml} (79%) rename ide/che-core-ide-ui/src/main/{resources/org/eclipse/che/ide/ui/CodenvyUI.gwt.xml => module.gwt.xml} (87%) rename ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/{ui => }/public/font-awesome-4.5.0/css/font-awesome.min.css (100%) rename ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/{ui => }/public/font-awesome-4.5.0/fonts/FontAwesome.otf (100%) rename ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/{ui => }/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot (100%) rename ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/{ui => }/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg (100%) rename ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/{ui => }/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf (100%) rename ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/{ui => }/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff (100%) rename ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/{ui => }/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 (100%) rename ide/che-core-orion-editor/src/main/{resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml => module.gwt.xml} (79%) create mode 100644 ide/che-ide-gwt-app/pom.xml create mode 100644 ide/che-ide-gwt-app/src/main/module.gwt.xml rename {assembly/assembly-ide-war => ide/che-ide-gwt-app}/src/main/resources/org/eclipse/che/ide/public/IDE.css (100%) rename ide/gwt-logger/src/main/{resources/org/eclipse/che/ide/logger/slf4j/Logging.gwt.xml => module.gwt.xml} (96%) rename ide/gwt-logger/src/main/{emulation => super}/org/slf4j/LoggerFactory.java (100%) rename ide/gwt-logger/src/main/{emulation => super}/org/slf4j/helpers/NamedLoggerBase.java (100%) rename multiuser/{machine-auth/che-multiuser-machine-authentication-ide/src/main/resources/org/eclipse/che/multiuser/machine/authentication/Authentication.gwt.xml => keycloak/che-multiuser-keycloak-ide/src/main/module.gwt.xml} (94%) rename multiuser/{keycloak/che-multiuser-keycloak-ide/src/main/resources/org/eclipse/che/multiuser/keycloak/Keycloak.gwt.xml => machine-auth/che-multiuser-machine-authentication-ide/src/main/module.gwt.xml} (94%) rename plugins/plugin-activity/che-plugin-activity-ide/src/main/{resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml => module.gwt.xml} (94%) rename plugins/plugin-composer/che-plugin-composer-ide/src/main/{resources/org/eclipse/che/plugin/composer/Composer.gwt.xml => module.gwt.xml} (86%) rename plugins/{plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources/org/eclipse/che/ide/ext/gwt/GWT.gwt.xml => plugin-cpp/che-plugin-cpp-lang-ide/src/main/module.gwt.xml} (90%) delete mode 100644 plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml create mode 100644 plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/resources/org/eclipse/che/plugin/csharp/CSharp.gwt.xml create mode 100644 plugins/plugin-debugger/che-plugin-debugger-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-debugger/che-plugin-debugger-ide/src/main/resources/org/eclipse/che/plugin/debugger/Debugger.gwt.xml create mode 100644 plugins/plugin-gdb/che-plugin-gdb-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-gdb/che-plugin-gdb-ide/src/main/resources/org/eclipse/che/plugin/gdb/Gdb.gwt.xml delete mode 100644 plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml create mode 100644 plugins/plugin-github/che-plugin-github-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml rename plugins/plugin-github/che-plugin-github-pullrequest/src/main/{resources/org/eclipse/che/plugin/pullrequest/GithubPullRequest.gwt.xml => module.gwt.xml} (61%) delete mode 100644 plugins/plugin-help/che-plugin-help-ext-client/src/main/resources/org/eclipse/che/ide/ext/help/HelpAboutExtension.gwt.xml rename plugins/{plugin-product-info/src/main/resources/org/eclipse/che/plugin/product/info/ProductInfo.gwt.xml => plugin-java-debugger/che-plugin-java-debugger-ide/src/main/module.gwt.xml} (91%) delete mode 100644 plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/resources/org/eclipse/che/plugin/jdb/JavaDebugger.gwt.xml create mode 100644 plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/module.gwt.xml delete mode 100644 plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml delete mode 100644 plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml rename plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/{eclipse => }/EclipseKeyBinding.java (99%) rename plugins/{plugin-web/che-plugin-web-ext-shared/src/main/resources/org/eclipse/che/plugin/web/WebShared.gwt.xml => plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/module.gwt.xml} (95%) delete mode 100644 plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/resources/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.gwt.xml create mode 100644 plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/resources/org/eclipse/che/plugin/languageserver/LanguageServer.gwt.xml rename plugins/{plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/PluginsDevelopment.gwt.xml => plugin-machine/che-plugin-machine-ssh-client/src/main/module.gwt.xml} (91%) delete mode 100644 plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources/org/eclipse/che/ide/ext/ssh/MachineSsh.gwt.xml delete mode 100644 plugins/plugin-maven/che-plugin-maven-ide/src/main/resources/org/eclipse/che/plugin/maven/Maven.gwt.xml create mode 100644 plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/resources/org/eclipse/che/plugin/nodejsdbg/NodeJsDebugger.gwt.xml create mode 100644 plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml rename plugins/plugin-orion/che-plugin-orion-compare/src/main/{resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml => module.gwt.xml} (86%) create mode 100644 plugins/plugin-php/che-plugin-php-lang-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-php/che-plugin-php-lang-ide/src/main/resources/org/eclipse/che/plugin/php/Php.gwt.xml rename plugins/{plugin-dashboard/che-plugin-ext-dashboard/src/main/resources/org/eclipse/che/ide/ext/dashboard/Dashboard.gwt.xml => plugin-product-info/src/main/module.gwt.xml} (90%) create mode 100644 plugins/plugin-python/che-plugin-python-lang-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml rename plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/{command => }/GwtCheCommandType.java (58%) delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.java delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandModel.java delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPagePresenter.java delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageView.java delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.java delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.ui.xml delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.properties delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/cheClassPath.txt delete mode 100644 plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java rename plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/{resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml => module.gwt.xml} (74%) rename plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/{resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml => module.gwt.xml} (74%) create mode 100644 plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/resources/org/eclipse/che/plugin/testing/phpunit/PHPUnit.gwt.xml rename plugins/{plugin-pullrequest-parent/che-plugin-pullrequest-ide/src/main/resources/org/eclipse/che/plugin/pullrequest/PullRequest.gwt.xml => plugin-testing/che-plugin-testing-ide/src/main/module.gwt.xml} (76%) delete mode 100644 plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/TestingExtension.gwt.xml rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/WebExtension.java (91%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/WebExtensionResource.java (95%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/WebLocalizationConstant.java (96%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/css/NewCssFileAction.java (94%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/css/NewLessFileAction.java (94%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/NewHtmlFileAction.java (94%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/PreviewHTMLAction.java (95%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/editor/AutoEditStrategyFactory.java (93%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/editor/DefaultCodeAssistProcessor.java (94%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/editor/HTMLCodeAssistProcessor.java (91%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/editor/HTMLEditorConfigurationProvider.java (95%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/editor/HtmlEditorConfiguration.java (98%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/html/editor/HtmlEditorProvider.java (95%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/inject/WebModule.java (92%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/js/NewJavaScriptFileAction.java (94%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/js/editor/DefaultCodeAssistProcessor.java (95%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/js/editor/JsCodeAssistProcessor.java (91%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/js/editor/JsEditorConfiguration.java (95%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/js/editor/JsEditorConfigurationProvider.java (88%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/js/editor/JsEditorProvider.java (96%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/{ide/ext/web => plugin/web/client}/typescript/TSProjectWizardRegistrar.java (96%) delete mode 100644 plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/Web.gwt.xml rename plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/{ide/ext/web => plugin/web/client}/WebLocalizationConstant.properties (100%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/{ide/ext/web => plugin/web/client}/category/js.svg (100%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/{ide/ext/web => plugin/web/client}/css.svg (100%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/{ide/ext/web => plugin/web/client}/html.svg (100%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/{ide/ext/web => plugin/web/client}/js.svg (100%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/{ide/ext/web => plugin/web/client}/less.svg (100%) rename plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/{ide/ext/web => plugin/web/client}/php.svg (100%) create mode 100644 plugins/plugin-yaml/che-plugin-yaml-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml create mode 100644 plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/module.gwt.xml delete mode 100644 plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/resources/org/eclipse/che/plugin/zdb/ZendDebugger.gwt.xml create mode 100644 wsagent/che-core-ssh-key-ide/src/main/module.gwt.xml delete mode 100644 wsagent/che-core-ssh-key-ide/src/main/resources/org/eclipse/che/plugin/ssh/key/SshKey.gwt.xml diff --git a/assembly-multiuser/assembly-ide-war/pom.xml b/assembly-multiuser/assembly-ide-war/pom.xml index ad9d374f4d4..bccbc5eff15 100644 --- a/assembly-multiuser/assembly-ide-war/pom.xml +++ b/assembly-multiuser/assembly-ide-war/pom.xml @@ -23,18 +23,20 @@ Che IDE Assembly Multiuser :: Compiling GWT Application ${project.build.directory}/generated-sources/gen + false UTF-8 org.eclipse.che assembly-ide-war - classes + war + org.eclipse.che - assembly-ide-war - war + che-ide-gwt-app + pom org.eclipse.che.multiuser @@ -152,6 +154,7 @@ net.ltgt.gwt.maven gwt-maven-plugin + true diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index dd48f55a674..59bb78ace39 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -20,210 +20,34 @@ assembly-ide-war war - Che IDE :: Compiling GWT Application + Che IDE :: War Packaging + Packages Che IDE GWT application as a Java web app ${project.build.directory}/generated-sources/gen - true UTF-8 - org.eclipse.che.core - che-ide-core - - - org.eclipse.che.infrastructure.docker - docker-client - - - org.eclipse.che.plugin - che-plugin-activity-ide - - - org.eclipse.che.plugin - che-plugin-composer-ide - - - org.eclipse.che.plugin - che-plugin-cpp-lang-ide - - - org.eclipse.che.plugin - che-plugin-csharp-lang-ide - - - org.eclipse.che.plugin - che-plugin-debugger-ide - - - org.eclipse.che.plugin - che-plugin-ext-dashboard-client - - - org.eclipse.che.plugin - che-plugin-gdb-ide - - - org.eclipse.che.plugin - che-plugin-git-ext-git - - - org.eclipse.che.plugin - che-plugin-github-ide - - - org.eclipse.che.plugin - che-plugin-github-oauth2 - - - org.eclipse.che.plugin - che-plugin-github-pullrequest - - - org.eclipse.che.plugin - che-plugin-github-shared - - - org.eclipse.che.plugin - che-plugin-gwt-ext-gwt - - - org.eclipse.che.plugin - che-plugin-help-ext-client - - - org.eclipse.che.plugin - che-plugin-java-debugger-ide - - - org.eclipse.che.plugin - che-plugin-java-ext-lang-client - - - org.eclipse.che.plugin - che-plugin-java-ext-lang-shared - - - org.eclipse.che.plugin - che-plugin-java-plain-ide - - - org.eclipse.che.plugin - che-plugin-java-plain-shared + org.eclipse.che + che-ide-gwt-app + + war - org.eclipse.che.plugin - che-plugin-keybinding-eclipse-ide - - - org.eclipse.che.plugin - che-plugin-languageserver-ide - - - org.eclipse.che.plugin - che-plugin-machine-ssh-client - - - org.eclipse.che.plugin - che-plugin-maven-ide - - - org.eclipse.che.plugin - che-plugin-maven-shared - - - org.eclipse.che.plugin - che-plugin-nodejs-debugger-ide - - - org.eclipse.che.plugin - che-plugin-nodejs-lang-ide - - - org.eclipse.che.plugin - che-plugin-nodejs-lang-shared - - - org.eclipse.che.plugin - che-plugin-orion-compare - - - org.eclipse.che.plugin - che-plugin-php-lang-ide - - - org.eclipse.che.plugin - che-plugin-php-lang-shared - - - org.eclipse.che.plugin - che-plugin-product-info - - - org.eclipse.che.plugin - che-plugin-pullrequest-ide - - - org.eclipse.che.plugin - che-plugin-pullrequest-shared - - - org.eclipse.che.plugin - che-plugin-python-lang-ide - - - org.eclipse.che.plugin - che-plugin-python-lang-shared - - - org.eclipse.che.plugin - che-plugin-sdk-ext-plugins - - - org.eclipse.che.plugin - che-plugin-ssh-key-ide - - - org.eclipse.che.plugin - che-plugin-testing-ide - - - org.eclipse.che.plugin - che-plugin-testing-junit-ide - - - org.eclipse.che.plugin - che-plugin-testing-phpunit-ide - - - org.eclipse.che.plugin - che-plugin-testing-testng-ide - - - org.eclipse.che.plugin - che-plugin-web-ext-web - - - org.eclipse.che.plugin - che-plugin-yaml-ide - - - org.eclipse.che.plugin - che-plugin-yaml-shared - - - org.eclipse.che.plugin - che-plugin-zend-debugger-ide + javax.servlet + javax.servlet-api + provided - com.google.gwt - gwt-dev - provided + org.eclipse.che.core + che-core-commons-j2ee + runtime - javax.servlet - javax.servlet-api - provided + org.eclipse.che.core + che-core-api-core + test org.hamcrest @@ -247,11 +71,6 @@ - - - src/main/resources - - org.apache.maven.plugins @@ -260,187 +79,14 @@ analyze - true + + + org.eclipse.che:che-ide-gwt-app + - - - org.codehaus.mojo - exec-maven-plugin - - - gwt-xml - generate-sources - - java - - - org.eclipse.che.util.GwtXmlGenerator - - --rootDir=${generated.sources.directory} - --loggingEnabled=${gwt.log.enable} - - - - - extManager-client - generate-sources - - java - - - org.eclipse.che.util.ExtensionManagerGenerator - - --rootDir=${generated.sources.directory} - - - - - IDEInjector-client - generate-sources - - java - - - org.eclipse.che.util.IDEInjectorGenerator - - --rootDir=${generated.sources.directory} - - - - - DtoRegistry-client - generate-sources - - java - - - org.eclipse.che.util.DtoFactoryVisitorRegistryGenerator - - --rootDir=${generated.sources.directory} - - - - - - - org.eclipse.che.core - che-core-dyna-provider-generator-maven-plugin - ${project.version} - - - generate-sources - - generate - - - - - ${generated.sources.directory} - - - - net.ltgt.gwt.maven - gwt-maven-plugin - - - - compile - - - - - org.eclipse.che.ide.IDE - - ${gwt.compiler.jvmArgs.Xss} - ${gwt.compiler.jvmArgs.Xmx} - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - buildnumber - compile - - run - - - - revision = ${revision} - buildTime = ${timestamp} - version = ${project.version} - - - - - - - org.apache.maven.plugins - maven-war-plugin - - %regex[WEB-INF\\lib\\(?!.*j2ee).*.jar] - true - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ${generated.sources.directory} - src/main/java - src/main/webapp - - - - - add-resource - generate-resources - - add-resource - - - - - src/main/webapp - - - - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - - - validate - - create - - - - - {0, date, yyyy-MM-dd HH:mm:ss} - revision - false - false - 16 - - diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml index 5b09cfe9613..5c851edbca2 100644 --- a/core/che-core-api-core/pom.xml +++ b/core/che-core-api-core/pom.xml @@ -169,17 +169,6 @@ - - - src/main/java - - - src/main/resources - - - ${generated.sources.directory} - - org.eclipse.che.core diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml index 8681085f8d9..d2e2100b342 100644 --- a/core/che-core-api-model/pom.xml +++ b/core/che-core-api-model/pom.xml @@ -27,17 +27,4 @@ che-core-commons-annotations - - - - src/main/java - - - src/main/resources - - - ${generated.sources.directory} - - - diff --git a/ide/che-core-ide-api/pom.xml b/ide/che-core-ide-api/pom.xml index 35098a996c0..eaa47e809fe 100644 --- a/ide/che-core-ide-api/pom.xml +++ b/ide/che-core-ide-api/pom.xml @@ -20,7 +20,7 @@ org.eclipse.che.core che-core-ide-api - jar + gwt-lib Che Core :: IDE :: API ${project.build.directory}/generated-sources/gen @@ -55,14 +55,29 @@ org.eclipse.che.core che-core-api-auth-shared + + org.eclipse.che.core + che-core-api-auth-shared + sources + + + org.eclipse.che.core + che-core-api-core + org.eclipse.che.core che-core-api-core + sources org.eclipse.che.core che-core-api-debug-shared + + org.eclipse.che.core + che-core-api-debug-shared + sources + org.eclipse.che.core che-core-api-dto @@ -71,33 +86,73 @@ org.eclipse.che.core che-core-api-factory-shared + + org.eclipse.che.core + che-core-api-factory-shared + sources + org.eclipse.che.core che-core-api-git-shared + + org.eclipse.che.core + che-core-api-git-shared + sources + + + org.eclipse.che.core + che-core-api-model + org.eclipse.che.core che-core-api-model + sources org.eclipse.che.core che-core-api-project-shared + + org.eclipse.che.core + che-core-api-project-shared + sources + + + org.eclipse.che.core + che-core-api-project-templates-shared + org.eclipse.che.core che-core-api-project-templates-shared + sources + + + org.eclipse.che.core + che-core-api-ssh-shared org.eclipse.che.core che-core-api-ssh-shared + sources org.eclipse.che.core che-core-api-user-shared + + org.eclipse.che.core + che-core-api-user-shared + sources + + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-api-workspace-shared + sources org.eclipse.che.core @@ -154,13 +209,7 @@ - src/main/java - src/test/java - target/classes - - src/main/java - src/main/resources @@ -169,6 +218,14 @@ + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.Api + + org.codehaus.mojo build-helper-maven-plugin @@ -243,11 +300,7 @@ license-maven-plugin - **/*.png - **/*.gif - **/*.jpg **/ide/api/editor/text/TypedPosition.java - **/ide/api/text/annotation/AnnotationModelEvent.java **/ide/api/editor/text/rules/**/*.* **/org/eclipse/che/ide/api/editor/reconciler/DirtyRegion.java **/org/eclipse/che/ide/api/editor/reconciler/DirtyRegionQueue.java @@ -255,6 +308,33 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-auth-shared + org.eclipse.che.core:che-core-api-factory-shared + org.eclipse.che.core:che-core-api-core + org.eclipse.che.core:che-core-api-model + org.eclipse.che.core:che-core-api-git-shared + org.eclipse.che.core:che-core-api-workspace-shared + org.eclipse.che.core:che-core-api-project-shared + org.eclipse.che.core:che-core-api-user-shared + org.eclipse.che.core:che-core-api-project-templates-shared + org.eclipse.che.core:che-core-api-debug-shared + org.eclipse.che.core:che-core-api-ssh-shared + org.eclipse.che.core:che-core-gwt-logger + + + + + diff --git a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml b/ide/che-core-ide-api/src/main/module.gwt.xml similarity index 71% rename from ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml rename to ide/che-core-ide-api/src/main/module.gwt.xml index 28e1fa7d126..c6b387ec21b 100644 --- a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml +++ b/ide/che-core-ide-api/src/main/module.gwt.xml @@ -16,19 +16,30 @@ - - + + + + - - - + + + + + + + + + + + + diff --git a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml index d74698850df..40d1baa21ad 100644 --- a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml +++ b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml @@ -13,16 +13,8 @@ --> - - - - - - - - - - + + diff --git a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml index 81af82890ac..40f8e4d4daa 100644 --- a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml +++ b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml @@ -17,6 +17,5 @@ - diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml index 9cba655b7f1..1837e0a31bf 100644 --- a/ide/che-core-ide-app/pom.xml +++ b/ide/che-core-ide-app/pom.xml @@ -19,10 +19,9 @@ 6.0.0-M1-SNAPSHOT che-core-ide-app - jar + gwt-lib Che Core :: IDE :: App - ${project.build.directory}/generated-sources/dto/ false ${project.build.directory}/generated-sources/gen UTF-8 @@ -61,22 +60,47 @@ org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-api-core + sources + + + org.eclipse.che.core + che-core-api-debug-shared + org.eclipse.che.core che-core-api-debug-shared + sources org.eclipse.che.core che-core-api-factory-shared + + org.eclipse.che.core + che-core-api-factory-shared + sources + + + org.eclipse.che.core + che-core-api-git-shared + org.eclipse.che.core che-core-api-git-shared + sources org.eclipse.che.core che-core-api-model + + org.eclipse.che.core + che-core-api-model + sources + org.eclipse.che.core che-core-api-project-shared @@ -85,17 +109,37 @@ org.eclipse.che.core che-core-api-project-templates-shared + + org.eclipse.che.core + che-core-api-project-templates-shared + sources + + + org.eclipse.che.core + che-core-api-ssh-shared + org.eclipse.che.core che-core-api-ssh-shared + sources org.eclipse.che.core che-core-api-user-shared + + org.eclipse.che.core + che-core-api-user-shared + sources + + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-api-workspace-shared + sources org.eclipse.che.core @@ -116,6 +160,7 @@ org.eclipse.che.core che-core-ide-ui + gwt-lib org.eclipse.che.lib @@ -183,54 +228,20 @@ - - ${webappDirectory}/WEB-INF/classes - - src/main/java - true src/main/resources - - ${dto-generator-out-directory} - - org.apache.maven.plugins - maven-dependency-plugin - - - analyze - - - org.eclipse.che.core:che-core-ide-generators - - - - - unpack-terminal - process-resources - - unpack - - - - - org.eclipse.che.lib - che-terminal-client - ${che.lib.version} - jar - false - ${project.build.outputDirectory}/org/eclipse/che/public/term - org/**,META-INF/** - - - - - + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.Core + org.codehaus.mojo @@ -294,18 +305,6 @@ - - add-source-dto - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - @@ -329,9 +328,6 @@ license-maven-plugin - **/*.png - **/*.gif - **/*.jpg **/OutputCustomizer.java **/AbstractOutputCustomizer.java **/BaseOutputCustomizerTest.java @@ -346,6 +342,51 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-terminal + process-resources + + unpack + + + + + org.eclipse.che.lib + che-terminal-client + ${che.lib.version} + jar + false + ${project.build.outputDirectory}/org/eclipse/che/public/term + org/**,META-INF/** + + + + + + analyze + + + org.eclipse.che.core:che-core-ide-generators + + org.eclipse.che.core:che-core-api-factory-shared + org.eclipse.che.core:che-core-api-core + org.eclipse.che.core:che-core-api-model + org.eclipse.che.core:che-core-api-git-shared + org.eclipse.che.core:che-core-api-ssh-shared + org.eclipse.che.core:che-core-api-workspace-shared + org.eclipse.che.core:che-core-api-user-shared + org.eclipse.che.core:che-core-api-project-templates-shared + org.eclipse.che.core:che-core-api-debug-shared + + + + + diff --git a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml b/ide/che-core-ide-app/src/main/module.gwt.xml similarity index 79% rename from ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml rename to ide/che-core-ide-app/src/main/module.gwt.xml index 22c4a230b95..c48811490f8 100644 --- a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml +++ b/ide/che-core-ide-app/src/main/module.gwt.xml @@ -19,23 +19,19 @@ - - - - - - - - + + + + diff --git a/ide/che-core-ide-generators/pom.xml b/ide/che-core-ide-generators/pom.xml index 522a6190d4d..33c9502b719 100644 --- a/ide/che-core-ide-generators/pom.xml +++ b/ide/che-core-ide-generators/pom.xml @@ -102,17 +102,6 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - org.apache.maven.plugins diff --git a/ide/che-core-ide-ui/pom.xml b/ide/che-core-ide-ui/pom.xml index 18658e86be8..12a6a91fed9 100644 --- a/ide/che-core-ide-ui/pom.xml +++ b/ide/che-core-ide-ui/pom.xml @@ -20,6 +20,7 @@ org.eclipse.che.core che-core-ide-ui + gwt-lib Che Core :: IDE :: UI false @@ -99,23 +100,15 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.UI + + com.mycila license-maven-plugin diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/CodenvyUI.gwt.xml b/ide/che-core-ide-ui/src/main/module.gwt.xml similarity index 87% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/CodenvyUI.gwt.xml rename to ide/che-core-ide-ui/src/main/module.gwt.xml index 13fe565cc22..2749d8eb961 100644 --- a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/CodenvyUI.gwt.xml +++ b/ide/che-core-ide-ui/src/main/module.gwt.xml @@ -13,6 +13,5 @@ - - - \ No newline at end of file + + diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/css/font-awesome.min.css b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/css/font-awesome.min.css similarity index 100% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/css/font-awesome.min.css rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/css/font-awesome.min.css diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/FontAwesome.otf b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/FontAwesome.otf similarity index 100% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/FontAwesome.otf rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/FontAwesome.otf diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot similarity index 100% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg similarity index 100% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff similarity index 100% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 diff --git a/ide/che-core-orion-editor/pom.xml b/ide/che-core-orion-editor/pom.xml index f79623f201d..40c309ba6f7 100644 --- a/ide/che-core-orion-editor/pom.xml +++ b/ide/che-core-orion-editor/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-core-orion-editor - jar + gwt-lib Che Plugin :: Orion :: Editor false @@ -88,6 +88,10 @@ org.eclipse.che.core che-core-ide-ui + + org.eclipse.che.lib + che-orion-editor + org.vectomatic lib-gwt-svg @@ -100,9 +104,6 @@ - - src/main/java - src/main/resources @@ -110,5 +111,31 @@ target/requirejs-${requirejs.upstream.version} + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.editor.orion.OrionEditor + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.lib:che-orion-editor + + + + + + diff --git a/ide/che-core-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml b/ide/che-core-orion-editor/src/main/module.gwt.xml similarity index 79% rename from ide/che-core-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml rename to ide/che-core-orion-editor/src/main/module.gwt.xml index c82d13d10eb..202b07ebfb6 100644 --- a/ide/che-core-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml +++ b/ide/che-core-orion-editor/src/main/module.gwt.xml @@ -13,7 +13,6 @@ --> - - - + + diff --git a/ide/che-ide-core/pom.xml b/ide/che-ide-core/pom.xml index f9b90b78355..5b168ceb6a6 100644 --- a/ide/che-ide-core/pom.xml +++ b/ide/che-ide-core/pom.xml @@ -21,7 +21,7 @@ org.eclipse.che.core che-ide-core - jar + gwt-lib Che Core IDE :: Basic IDE @@ -68,37 +68,47 @@ org.eclipse.che.core che-core-commons-gwt + org.eclipse.che.core - che-core-commons-inject + che-core-commons-gwt + sources org.eclipse.che.core - che-core-commons-j2ee + che-core-commons-inject org.eclipse.che.core che-core-gwt-logger + gwt-lib org.eclipse.che.core che-core-ide-api + gwt-lib org.eclipse.che.core che-core-ide-app + gwt-lib org.eclipse.che.core che-core-orion-editor - - - org.eclipse.che.lib - che-orion-editor + gwt-lib + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.Basic + + org.apache.maven.plugins maven-dependency-plugin diff --git a/ide/che-ide-gwt-app/pom.xml b/ide/che-ide-gwt-app/pom.xml new file mode 100644 index 00000000000..d029eabdbb6 --- /dev/null +++ b/ide/che-ide-gwt-app/pom.xml @@ -0,0 +1,364 @@ + + + + 4.0.0 + + che-parent + org.eclipse.che + 6.0.0-M1-SNAPSHOT + ../../pom.xml + + che-ide-gwt-app + gwt-app + Che IDE :: GWT App + Compiles Che IDE GWT application and packages it as a WAR-like archive which contains pure output of the GWT compiler + + ${project.build.directory}/generated-sources/gen + UTF-8 + + + + + com.google.gwt + gwt-dev + + + org.eclipse.che.core + che-ide-core + gwt-lib + + + org.eclipse.che.plugin + che-plugin-activity-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-composer-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-cpp-lang-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-csharp-lang-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-debugger-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-ext-dashboard-client + gwt-lib + + + org.eclipse.che.plugin + che-plugin-gdb-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-git-ext-git + gwt-lib + + + org.eclipse.che.plugin + che-plugin-github-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-github-pullrequest + gwt-lib + + + org.eclipse.che.plugin + che-plugin-gwt-ext-gwt + gwt-lib + + + org.eclipse.che.plugin + che-plugin-help-ext-client + gwt-lib + + + org.eclipse.che.plugin + che-plugin-java-debugger-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-java-ext-lang-client + gwt-lib + + + org.eclipse.che.plugin + che-plugin-java-plain-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-keybinding-eclipse-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-languageserver-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-machine-ssh-client + gwt-lib + + + org.eclipse.che.plugin + che-plugin-maven-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-nodejs-debugger-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-nodejs-lang-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-orion-compare + gwt-lib + + + org.eclipse.che.plugin + che-plugin-php-lang-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-product-info + gwt-lib + + + org.eclipse.che.plugin + che-plugin-pullrequest-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-python-lang-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-sdk-ext-plugins + gwt-lib + + + org.eclipse.che.plugin + che-plugin-ssh-key-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-testing-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-testing-junit-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-testing-phpunit-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-testing-testng-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-web-ext-web + gwt-lib + + + org.eclipse.che.plugin + che-plugin-yaml-ide + gwt-lib + + + org.eclipse.che.plugin + che-plugin-zend-debugger-ide + gwt-lib + + + + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.IDE + _app + + ${gwt.compiler.jvmArgs.Xss} + ${gwt.compiler.jvmArgs.Xmx} + + + + + org.codehaus.mojo + exec-maven-plugin + + + generate-ExtensionManager + generate-sources + + java + + + org.eclipse.che.util.ExtensionManagerGenerator + + --rootDir=${generated.sources.directory} + + + + + generate-IDEInjector + generate-sources + + java + + + org.eclipse.che.util.IDEInjectorGenerator + + --rootDir=${generated.sources.directory} + + + + + generate-DtoRegistry + generate-sources + + java + + + org.eclipse.che.util.DtoFactoryVisitorRegistryGenerator + + --rootDir=${generated.sources.directory} + + + + + + + org.eclipse.che.core + che-core-dyna-provider-generator-maven-plugin + ${project.version} + + + generate-sources + + generate + + + + + ${generated.sources.directory} + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + {0, date, yyyy-MM-dd HH:mm:ss} + revision + false + false + 16 + + + + org.apache.maven.plugins + maven-antrun-plugin + + + buildnumber + compile + + run + + + + revision = ${revision} + buildTime = ${timestamp} + version = ${project.version} + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + + add-source + + + + ${generated.sources.directory} + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + true + + + + + + + diff --git a/ide/che-ide-gwt-app/src/main/module.gwt.xml b/ide/che-ide-gwt-app/src/main/module.gwt.xml new file mode 100644 index 00000000000..0da3262f3f1 --- /dev/null +++ b/ide/che-ide-gwt-app/src/main/module.gwt.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/public/IDE.css b/ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/IDE.css similarity index 100% rename from assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/public/IDE.css rename to ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/IDE.css diff --git a/ide/gwt-logger/pom.xml b/ide/gwt-logger/pom.xml index d5eb0a45bb0..fa346e97339 100644 --- a/ide/gwt-logger/pom.xml +++ b/ide/gwt-logger/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-core-gwt-logger + gwt-lib Che Core :: Commons :: GWT Logger @@ -45,41 +46,13 @@ - maven-resources-plugin - - - copy-sources - process-resources - - copy-resources - - - ${project.build.outputDirectory} - - - src/main/java - false - - - - - - copy-emulation - process-resources - - copy-resources - - - ${project.build.outputDirectory}/org/eclipse/che/ide/logger/slf4j/emulation - - - src/main/emulation - false - - - - - + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.logger.slf4j.Logging + true + com.mycila @@ -87,28 +60,10 @@ - src/main/emulation/** + src/main/super/** - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - src/main/emulation - - - - - org.apache.maven.plugins maven-dependency-plugin @@ -127,7 +82,7 @@ sources jar false - ${project.build.outputDirectory}/org/eclipse/che/ide/logger/slf4j/emulation + ${project.build.outputDirectory}/org/eclipse/che/ide/logger/slf4j/super org/slf4j/helpers/FormattingTuple.java, org/slf4j/helpers/MarkerIgnoringBase.java, org/slf4j/helpers/MessageFormatter.java, diff --git a/ide/gwt-logger/src/main/resources/org/eclipse/che/ide/logger/slf4j/Logging.gwt.xml b/ide/gwt-logger/src/main/module.gwt.xml similarity index 96% rename from ide/gwt-logger/src/main/resources/org/eclipse/che/ide/logger/slf4j/Logging.gwt.xml rename to ide/gwt-logger/src/main/module.gwt.xml index e0b311c3b29..4b42def2dda 100644 --- a/ide/gwt-logger/src/main/resources/org/eclipse/che/ide/logger/slf4j/Logging.gwt.xml +++ b/ide/gwt-logger/src/main/module.gwt.xml @@ -14,7 +14,7 @@ - + diff --git a/ide/gwt-logger/src/main/emulation/org/slf4j/LoggerFactory.java b/ide/gwt-logger/src/main/super/org/slf4j/LoggerFactory.java similarity index 100% rename from ide/gwt-logger/src/main/emulation/org/slf4j/LoggerFactory.java rename to ide/gwt-logger/src/main/super/org/slf4j/LoggerFactory.java diff --git a/ide/gwt-logger/src/main/emulation/org/slf4j/helpers/NamedLoggerBase.java b/ide/gwt-logger/src/main/super/org/slf4j/helpers/NamedLoggerBase.java similarity index 100% rename from ide/gwt-logger/src/main/emulation/org/slf4j/helpers/NamedLoggerBase.java rename to ide/gwt-logger/src/main/super/org/slf4j/helpers/NamedLoggerBase.java diff --git a/infrastructures/docker/docker-client/pom.xml b/infrastructures/docker/docker-client/pom.xml index 5eb0526245c..480b7275fe7 100644 --- a/infrastructures/docker/docker-client/pom.xml +++ b/infrastructures/docker/docker-client/pom.xml @@ -130,17 +130,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/multiuser/api/che-multiuser-api-organization/pom.xml b/multiuser/api/che-multiuser-api-organization/pom.xml index 0cb93d3f7c9..28e8337d3e0 100644 --- a/multiuser/api/che-multiuser-api-organization/pom.xml +++ b/multiuser/api/che-multiuser-api-organization/pom.xml @@ -208,17 +208,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/multiuser/api/che-multiuser-api-permission/pom.xml b/multiuser/api/che-multiuser-api-permission/pom.xml index 415b2379c83..394b5caebd7 100644 --- a/multiuser/api/che-multiuser-api-permission/pom.xml +++ b/multiuser/api/che-multiuser-api-permission/pom.xml @@ -187,17 +187,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/multiuser/api/che-multiuser-api-resource/pom.xml b/multiuser/api/che-multiuser-api-resource/pom.xml index 4d06d91ff0b..d0f76903410 100644 --- a/multiuser/api/che-multiuser-api-resource/pom.xml +++ b/multiuser/api/che-multiuser-api-resource/pom.xml @@ -189,17 +189,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml index ff429dd9fdd..7274d8cd1aa 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml @@ -20,7 +20,7 @@ ../pom.xml che-multiuser-keycloak-ide - jar + gwt-lib Che Multiuser :: Keycloak IDE @@ -47,6 +47,11 @@ org.eclipse.che.multiuser che-multiuser-keycloak-shared + + org.eclipse.che.multiuser + che-multiuser-keycloak-shared + sources + org.eclipse.che.multiuser che-multiuser-machine-authentication-ide @@ -58,13 +63,31 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.multiuser.keycloak.Keycloak + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.multiuser:che-multiuser-keycloak-shared + + + + + + diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/resources/org/eclipse/che/multiuser/machine/authentication/Authentication.gwt.xml b/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/module.gwt.xml similarity index 94% rename from multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/resources/org/eclipse/che/multiuser/machine/authentication/Authentication.gwt.xml rename to multiuser/keycloak/che-multiuser-keycloak-ide/src/main/module.gwt.xml index 906ea2309af..247868b14f4 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/resources/org/eclipse/che/multiuser/machine/authentication/Authentication.gwt.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/module.gwt.xml @@ -17,7 +17,6 @@ - diff --git a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml index 33fb8b3b171..8543ccb0b8d 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml @@ -28,14 +28,4 @@ provided - - - - src/main/java - - - src/main/resources - - - diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml index 83debc86699..0ca29fa6469 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-multiuser-machine-authentication-ide + gwt-lib Che Multiuser :: Machine Authentication IDE ${project.build.directory}/generated-sources/dto/ @@ -49,9 +50,19 @@ org.eclipse.che.core che-core-api-model + + org.eclipse.che.core + che-core-api-model + sources + + + org.eclipse.che.core + che-core-api-user-shared + org.eclipse.che.core che-core-api-user-shared + sources org.eclipse.che.core @@ -65,6 +76,11 @@ org.eclipse.che.multiuser che-multiuser-machine-authentication-shared + + org.eclipse.che.multiuser + che-multiuser-machine-authentication-shared + sources + com.google.gwt gwt-user @@ -72,12 +88,7 @@ - src/main/java - target/classes - - src/main/java - src/main/resources @@ -86,6 +97,14 @@ + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.multiuser.machine.authentication.Authentication + + org.codehaus.mojo build-helper-maven-plugin @@ -160,6 +179,24 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-user-shared + org.eclipse.che.core:che-core-api-model + org.eclipse.che.multiuser:che-multiuser-machine-authentication-shared + + + + + diff --git a/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/resources/org/eclipse/che/multiuser/keycloak/Keycloak.gwt.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/module.gwt.xml similarity index 94% rename from multiuser/keycloak/che-multiuser-keycloak-ide/src/main/resources/org/eclipse/che/multiuser/keycloak/Keycloak.gwt.xml rename to multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/module.gwt.xml index 906ea2309af..247868b14f4 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/resources/org/eclipse/che/multiuser/keycloak/Keycloak.gwt.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/module.gwt.xml @@ -17,7 +17,6 @@ - diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml index 0af725c01ad..cf4eef3fc3b 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml @@ -27,11 +27,4 @@ che-core-api-dto - - - - src/main/java - - - diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml index f334342a574..4ddc52f4155 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml @@ -162,17 +162,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo diff --git a/plugins/plugin-activity/che-plugin-activity-ide/pom.xml b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml index 406ed3c01bc..476609ef77f 100644 --- a/plugins/plugin-activity/che-plugin-activity-ide/pom.xml +++ b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml @@ -20,7 +20,7 @@ ../pom.xml che-plugin-activity-ide - jar + gwt-lib Che Plugin :: Activity :: IDE @@ -37,13 +37,15 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.activity.ActivityModule + + + diff --git a/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml b/plugins/plugin-activity/che-plugin-activity-ide/src/main/module.gwt.xml similarity index 94% rename from plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml rename to plugins/plugin-activity/che-plugin-activity-ide/src/main/module.gwt.xml index c923d288a30..3c448e0b98f 100644 --- a/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml +++ b/plugins/plugin-activity/che-plugin-activity-ide/src/main/module.gwt.xml @@ -13,7 +13,5 @@ - - diff --git a/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml index 3daca882b6a..841fbb09a73 100644 --- a/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml @@ -124,14 +124,6 @@ - - - src/main/java - - - src/main/resources - - org.apache.maven.plugins diff --git a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml index 7b4174d72bf..16483060c97 100644 --- a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-composer-ide - jar + gwt-lib Che Plugin :: Composer :: IDE @@ -42,9 +42,19 @@ org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-api-core + sources + + + org.eclipse.che.core + che-core-api-project-shared + org.eclipse.che.core che-core-api-project-shared + sources org.eclipse.che.core @@ -66,9 +76,19 @@ org.eclipse.che.plugin che-plugin-composer-shared + + org.eclipse.che.plugin + che-plugin-composer-shared + sources + + + org.eclipse.che.plugin + che-plugin-php-lang-shared + org.eclipse.che.plugin che-plugin-php-lang-shared + sources com.google.gwt @@ -77,13 +97,34 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.composer.Composer + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-core + org.eclipse.che.core:che-core-api-project-shared + org.eclipse.che.plugin:che-plugin-composer-shared + org.eclipse.che.plugin:che-plugin-php-lang-shared + + + + + + diff --git a/plugins/plugin-composer/che-plugin-composer-ide/src/main/resources/org/eclipse/che/plugin/composer/Composer.gwt.xml b/plugins/plugin-composer/che-plugin-composer-ide/src/main/module.gwt.xml similarity index 86% rename from plugins/plugin-composer/che-plugin-composer-ide/src/main/resources/org/eclipse/che/plugin/composer/Composer.gwt.xml rename to plugins/plugin-composer/che-plugin-composer-ide/src/main/module.gwt.xml index a165427c898..e5ff3d18f5a 100644 --- a/plugins/plugin-composer/che-plugin-composer-ide/src/main/resources/org/eclipse/che/plugin/composer/Composer.gwt.xml +++ b/plugins/plugin-composer/che-plugin-composer-ide/src/main/module.gwt.xml @@ -17,11 +17,8 @@ - - - diff --git a/plugins/plugin-composer/che-plugin-composer-server/pom.xml b/plugins/plugin-composer/che-plugin-composer-server/pom.xml index bed63912fe4..8ca2a57fcfb 100644 --- a/plugins/plugin-composer/che-plugin-composer-server/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-server/pom.xml @@ -79,16 +79,4 @@ test - - - - src/main/java - - - - - src/test/java - - - diff --git a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml index 841c3f38fba..c98f4d569e5 100644 --- a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml @@ -48,17 +48,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo 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 2e3b8e5e2df..973941e7896 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-cpp-lang-ide - jar + gwt-lib Che Plugin :: C/C++ :: IDE @@ -50,6 +50,11 @@ org.eclipse.che.plugin che-plugin-cpp-lang-shared + + org.eclipse.che.plugin + che-plugin-cpp-lang-shared + sources + org.vectomatic lib-gwt-svg @@ -61,13 +66,31 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.cpp.Cpp + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-cpp-lang-shared + + + + + + diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources/org/eclipse/che/ide/ext/gwt/GWT.gwt.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/module.gwt.xml similarity index 90% rename from plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources/org/eclipse/che/ide/ext/gwt/GWT.gwt.xml rename to plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/module.gwt.xml index dc1f289c512..2ae5274432e 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources/org/eclipse/che/ide/ext/gwt/GWT.gwt.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/module.gwt.xml @@ -17,9 +17,9 @@ - + - + diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml deleted file mode 100644 index 475e33505ef..00000000000 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml index d1b4c804760..833bddde66e 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml @@ -27,14 +27,4 @@ provided - - - - src/main/java - - - src/main/resources - - - diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml index 53cb7db6f25..85892946e34 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-csharp-lang-ide - jar + gwt-lib Che Plugin :: C# :: IDE @@ -50,6 +50,11 @@ org.eclipse.che.plugin che-plugin-csharp-lang-shared + + org.eclipse.che.plugin + che-plugin-csharp-lang-shared + sources + org.vectomatic lib-gwt-svg @@ -61,13 +66,31 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.csharp.CSharp + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-csharp-lang-shared + + + + + + diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/module.gwt.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..2ae5274432e --- /dev/null +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/module.gwt.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/resources/org/eclipse/che/plugin/csharp/CSharp.gwt.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/resources/org/eclipse/che/plugin/csharp/CSharp.gwt.xml deleted file mode 100644 index 475e33505ef..00000000000 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/resources/org/eclipse/che/plugin/csharp/CSharp.gwt.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml index 4e8e13b8836..b78a1774c47 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml @@ -27,14 +27,4 @@ provided - - - - src/main/java - - - src/main/resources - - - diff --git a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml index c97d712cf69..d7dfcde7de9 100644 --- a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml +++ b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-ext-dashboard-client - jar + gwt-lib Che Plugin :: Dashboard :: Client ${project.build.directory}/generated-sources/dto/ @@ -53,23 +53,15 @@ - src/main/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/java - - - src/test/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.ext.dashboard.Dashboard + + + diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml index 20f20ac259c..6d862ec124e 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-debugger-ide - jar + gwt-lib Che Plugin :: Debugger :: Extension Debugger IDE ${project.build.directory}/generated-sources/dto/ @@ -57,6 +57,11 @@ org.eclipse.che.core che-core-api-debug-shared + + org.eclipse.che.core + che-core-api-debug-shared + sources + org.eclipse.che.core che-core-api-dto @@ -65,6 +70,11 @@ org.eclipse.che.core che-core-api-model + + org.eclipse.che.core + che-core-api-model + sources + org.eclipse.che.core che-core-commons-annotations @@ -121,12 +131,7 @@ - src/test/java - target/classes - - src/main/java - src/main/resources @@ -134,12 +139,15 @@ ${dto-generator-out-directory} - - - src/test/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.debugger.Debugger + + org.codehaus.mojo build-helper-maven-plugin @@ -219,13 +227,21 @@ maven-surefire-plugin - com.mycila - license-maven-plugin - - - **/*.png - - + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-debug-shared + org.eclipse.che.core:che-core-api-model + + + + diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/module.gwt.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..d75e9640349 --- /dev/null +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/module.gwt.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/resources/org/eclipse/che/plugin/debugger/Debugger.gwt.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/resources/org/eclipse/che/plugin/debugger/Debugger.gwt.xml deleted file mode 100644 index da7fe46a36c..00000000000 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/resources/org/eclipse/che/plugin/debugger/Debugger.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml index 4a0a174bf8e..fc3ef345091 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-gdb-ide - jar + gwt-lib Che Plugin :: GDB :: GDB IDE @@ -46,6 +46,11 @@ org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-api-core + sources + org.eclipse.che.core che-core-api-project @@ -114,22 +119,15 @@ - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.gdb.Gdb + + org.apache.maven.plugins maven-dependency-plugin @@ -146,15 +144,6 @@ org.apache.maven.plugins maven-surefire-plugin - - com.mycila - license-maven-plugin - - - **/*.png - - - diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/module.gwt.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..b32b29bbfe9 --- /dev/null +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/module.gwt.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/resources/org/eclipse/che/plugin/gdb/Gdb.gwt.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/resources/org/eclipse/che/plugin/gdb/Gdb.gwt.xml deleted file mode 100644 index db22d29be01..00000000000 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/resources/org/eclipse/che/plugin/gdb/Gdb.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml index 07c44c303a9..c9921d1487c 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml @@ -75,14 +75,6 @@ - - - src/main/java - - - src/main/resources - - org.apache.maven.plugins 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 22123aed3f3..b428cfbefbf 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-git-ext-git - jar + gwt-lib Che Plugin :: Git :: Extension ${project.build.directory}/generated-sources/dto/ @@ -57,14 +57,29 @@ org.eclipse.che.core che-core-api-git-shared + + org.eclipse.che.core + che-core-api-git-shared + sources + + + org.eclipse.che.core + che-core-api-model + org.eclipse.che.core che-core-api-model + sources org.eclipse.che.core che-core-api-project-shared + + org.eclipse.che.core + che-core-api-project-shared + sources + org.eclipse.che.core che-core-commons-annotations @@ -114,6 +129,12 @@ che-core-api-workspace-shared provided + + org.eclipse.che.core + che-core-api-workspace-shared + sources + provided + org.vectomatic lib-gwt-svg @@ -156,13 +177,7 @@ - src/main/java - src/test/java - target/classes - - src/main/java - src/main/resources @@ -170,15 +185,15 @@ ${project.build.directory}/generated-sources/dto/ - - - src/test/java - - - src/test/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.ext.git.Git + + org.codehaus.mojo build-helper-maven-plugin @@ -269,6 +284,24 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-project-shared + org.eclipse.che.core:che-core-api-model + org.eclipse.che.core:che-core-api-git-shared + + + + + diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml deleted file mode 100644 index c596b64c2b6..00000000000 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml index 4175ba7d382..dbd236e59da 100644 --- a/plugins/plugin-github/che-plugin-github-ide/pom.xml +++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-github-ide - jar + gwt-lib Che Plugin :: Github :: IDE ${project.build.directory}/generated-sources/dto/ @@ -49,6 +49,11 @@ org.eclipse.che.core che-core-api-ssh-shared + + org.eclipse.che.core + che-core-api-ssh-shared + sources + org.eclipse.che.core che-core-commons-gwt @@ -69,6 +74,11 @@ org.eclipse.che.plugin che-plugin-github-shared + + org.eclipse.che.plugin + che-plugin-github-shared + sources + org.eclipse.che.plugin che-plugin-ssh-key-ide @@ -116,9 +126,6 @@ - - src/main/java - src/main/resources @@ -126,15 +133,15 @@ ${project.build.directory}/generated-sources/dto/ - - - src/test/java - - - src/test/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.github.GitHub + + org.codehaus.mojo build-helper-maven-plugin @@ -209,6 +216,23 @@ client + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-ssh-shared + org.eclipse.che.plugin:che-plugin-github-shared + + + + + diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/module.gwt.xml b/plugins/plugin-github/che-plugin-github-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..94706cb6349 --- /dev/null +++ b/plugins/plugin-github/che-plugin-github-ide/src/main/module.gwt.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml b/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml deleted file mode 100644 index dcc027027a2..00000000000 --- a/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml index e4ae47d139d..76eab6ca0fa 100644 --- a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml +++ b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml @@ -67,16 +67,4 @@ che-core-commons-json - - src/main/java - target/classes - - - src/main/java - - - src/main/resources - - - diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml index 4bc605a4bb2..55d7410fc4b 100644 --- a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml +++ b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-github-pullrequest + gwt-lib Che Plugin :: Github :: Pull request ${project.build.directory}/generated-sources/dto/ @@ -64,6 +65,11 @@ org.eclipse.che.plugin che-plugin-github-shared + + org.eclipse.che.plugin + che-plugin-github-shared + sources + org.eclipse.che.plugin che-plugin-pullrequest-ide @@ -72,6 +78,11 @@ org.eclipse.che.plugin che-plugin-pullrequest-shared + + org.eclipse.che.plugin + che-plugin-pullrequest-shared + sources + com.google.gwt gwt-user @@ -115,13 +126,32 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.pullrequest.GithubPullRequest + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-pullrequest-shared + org.eclipse.che.plugin:che-plugin-github-shared + + + + + + diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/src/main/resources/org/eclipse/che/plugin/pullrequest/GithubPullRequest.gwt.xml b/plugins/plugin-github/che-plugin-github-pullrequest/src/main/module.gwt.xml similarity index 61% rename from plugins/plugin-github/che-plugin-github-pullrequest/src/main/resources/org/eclipse/che/plugin/pullrequest/GithubPullRequest.gwt.xml rename to plugins/plugin-github/che-plugin-github-pullrequest/src/main/module.gwt.xml index 1fb0057c78d..31031ae3207 100644 --- a/plugins/plugin-github/che-plugin-github-pullrequest/src/main/resources/org/eclipse/che/plugin/pullrequest/GithubPullRequest.gwt.xml +++ b/plugins/plugin-github/che-plugin-github-pullrequest/src/main/module.gwt.xml @@ -12,16 +12,7 @@ --> - - - - - - - - - diff --git a/plugins/plugin-github/che-plugin-github-server/pom.xml b/plugins/plugin-github/che-plugin-github-server/pom.xml index 4eb15134958..ad6b5f4da29 100644 --- a/plugins/plugin-github/che-plugin-github-server/pom.xml +++ b/plugins/plugin-github/che-plugin-github-server/pom.xml @@ -99,25 +99,6 @@ - - - src/main/java - - - src/main/resources - - - ${project.build.directory}/generated-sources/dto/ - - - - - src/test/java - - - src/test/resources - - org.codehaus.mojo diff --git a/plugins/plugin-github/che-plugin-github-shared/pom.xml b/plugins/plugin-github/che-plugin-github-shared/pom.xml index 57fa9ba4c3a..b347af5f650 100644 --- a/plugins/plugin-github/che-plugin-github-shared/pom.xml +++ b/plugins/plugin-github/che-plugin-github-shared/pom.xml @@ -30,11 +30,4 @@ che-core-commons-annotations - - - - src/main/java - - - 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 b8e6111b188..6dc2abb1783 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-gwt-ext-gwt - jar + gwt-lib Che Plugin :: GWT @@ -83,21 +83,15 @@ - - - src/main/java - - - src/main/resources - - - - - src/test/java - - - src/test/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.ext.gwt.GWT + + + diff --git a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml index 17155a0b228..899521e4ea1 100644 --- a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml +++ b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-help-ext-client - jar + gwt-lib Che Plugin :: Help :: Client @@ -62,23 +62,15 @@ - src/main/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/java - - - src/test/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.ext.help.HelpAboutExtension + + + diff --git a/plugins/plugin-help/che-plugin-help-ext-client/src/main/resources/org/eclipse/che/ide/ext/help/HelpAboutExtension.gwt.xml b/plugins/plugin-help/che-plugin-help-ext-client/src/main/resources/org/eclipse/che/ide/ext/help/HelpAboutExtension.gwt.xml deleted file mode 100644 index 598fe0fd63c..00000000000 --- a/plugins/plugin-help/che-plugin-help-ext-client/src/main/resources/org/eclipse/che/ide/ext/help/HelpAboutExtension.gwt.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml index 4cfd5fbbceb..92f96dd18c7 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-java-debugger-ide - jar + gwt-lib Che Plugin :: Java :: Java Debugger IDE @@ -38,6 +38,11 @@ org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-api-core + sources + org.eclipse.che.core che-core-api-debug-shared @@ -46,6 +51,11 @@ org.eclipse.che.core che-core-api-model + + org.eclipse.che.core + che-core-api-model + sources + org.eclipse.che.core che-core-commons-gwt @@ -106,27 +116,35 @@ - - - src/main/java - - - src/main/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.jdb.JavaDebugger + + org.apache.maven.plugins maven-surefire-plugin - com.mycila - license-maven-plugin - - - **/*.png - - + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-core + org.eclipse.che.core:che-core-api-model + + + + diff --git a/plugins/plugin-product-info/src/main/resources/org/eclipse/che/plugin/product/info/ProductInfo.gwt.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/module.gwt.xml similarity index 91% rename from plugins/plugin-product-info/src/main/resources/org/eclipse/che/plugin/product/info/ProductInfo.gwt.xml rename to plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/module.gwt.xml index 25a168459eb..4ed37b9ea1b 100644 --- a/plugins/plugin-product-info/src/main/resources/org/eclipse/che/plugin/product/info/ProductInfo.gwt.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/module.gwt.xml @@ -17,8 +17,7 @@ - - + diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/resources/org/eclipse/che/plugin/jdb/JavaDebugger.gwt.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/resources/org/eclipse/che/plugin/jdb/JavaDebugger.gwt.xml deleted file mode 100644 index 07e60427243..00000000000 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/resources/org/eclipse/che/plugin/jdb/JavaDebugger.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml index d75384755cb..1f9bd3d0804 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml @@ -147,14 +147,6 @@ - - - src/main/java - - - src/main/resources - - org.apache.maven.plugins 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 8f66c04e810..b607d4212d9 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 @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-java-ext-lang-client - jar + gwt-lib Che Plugin :: Java :: Extension Java Client @@ -62,10 +62,20 @@ org.eclipse.che.core che-core-api-model + + org.eclipse.che.core + che-core-api-model + sources + org.eclipse.che.core che-core-api-project-shared + + org.eclipse.che.core + che-core-api-project-shared + sources + org.eclipse.che.core che-core-commons-annotations @@ -94,6 +104,11 @@ org.eclipse.che.plugin che-plugin-java-ext-lang-shared + + org.eclipse.che.plugin + che-plugin-java-ext-lang-shared + sources + org.eclipse.che.plugin che-plugin-java-plain-ide @@ -159,23 +174,15 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.ext.java.Java + + org.apache.maven.plugins maven-surefire-plugin @@ -213,6 +220,24 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-model + org.eclipse.che.core:che-core-api-project-shared + org.eclipse.che.plugin:che-plugin-java-ext-lang-shared + + + + + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/module.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/module.gwt.xml new file mode 100644 index 00000000000..2a0c63afd72 --- /dev/null +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/module.gwt.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml deleted file mode 100644 index 9a82dc75451..00000000000 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml index e5e625a9c79..8a9e034f93a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml @@ -48,17 +48,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml index b554d7c12db..51eb17f6347 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-java-plain-ide - jar + gwt-lib Che Plugin :: Java :: Plain :: IDE @@ -58,9 +58,19 @@ org.eclipse.che.plugin che-plugin-java-ext-lang-shared + + org.eclipse.che.plugin + che-plugin-java-ext-lang-shared + sources + + + org.eclipse.che.plugin + che-plugin-java-plain-shared + org.eclipse.che.plugin che-plugin-java-plain-shared + sources com.google.gwt @@ -89,13 +99,32 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.java.plain.PlainJava + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-java-plain-shared + org.eclipse.che.plugin:che-plugin-java-ext-lang-shared + + + + + + diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml deleted file mode 100644 index d380cb69659..00000000000 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml index c2784adff36..80944e6bd7b 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml @@ -137,22 +137,4 @@ test - - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/resources - - - diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml index e77a2a993e0..9e7a9949c53 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml @@ -20,11 +20,4 @@ che-plugin-java-plain-shared Che Plugin :: Java :: Plain :: Shared - - - - src/main/java - - - diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml index 89cbcb233e8..c6e63e3d4b7 100644 --- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml +++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml @@ -20,7 +20,7 @@ ../pom.xml che-plugin-keybinding-eclipse-ide - jar + gwt-lib Che Plugin :: Key Binding Eclipse :: IDE @@ -49,15 +49,15 @@ - - - src/main/java - - - src/main/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.keybinding.EclipseKeyBinding + + org.apache.maven.plugins maven-dependency-plugin diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/EclipseKeyBinding.java similarity index 99% rename from plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java rename to plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/EclipseKeyBinding.java index 4ba39c4dfc2..8fcb5e88d50 100644 --- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java +++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/EclipseKeyBinding.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.plugin.keybinding.eclipse; +package org.eclipse.che.plugin.keybinding; import static org.eclipse.che.ide.api.action.IdeActions.CLOSE_ACTIVE_EDITOR; import static org.eclipse.che.ide.api.action.IdeActions.FORMAT; diff --git a/plugins/plugin-web/che-plugin-web-ext-shared/src/main/resources/org/eclipse/che/plugin/web/WebShared.gwt.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/module.gwt.xml similarity index 95% rename from plugins/plugin-web/che-plugin-web-ext-shared/src/main/resources/org/eclipse/che/plugin/web/WebShared.gwt.xml rename to plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/module.gwt.xml index a38507d261f..709ed8a8857 100644 --- a/plugins/plugin-web/che-plugin-web-ext-shared/src/main/resources/org/eclipse/che/plugin/web/WebShared.gwt.xml +++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/module.gwt.xml @@ -13,5 +13,5 @@ --> - + diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/resources/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.gwt.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/resources/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.gwt.xml deleted file mode 100644 index 7895f6d6952..00000000000 --- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/resources/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml index d46f622428c..8345a605248 100644 --- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml +++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml @@ -20,7 +20,7 @@ .. che-plugin-languageserver-ide - jar + gwt-lib Che Plugin :: Language Server :: IDE ${project.build.directory}/generated-sources/dto/ @@ -54,13 +54,28 @@ org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-api-core + sources + org.eclipse.che.core che-core-api-languageserver-shared + + org.eclipse.che.core + che-core-api-languageserver-shared + sources + + + org.eclipse.che.core + che-core-api-model + org.eclipse.che.core che-core-api-model + sources org.eclipse.che.core @@ -155,9 +170,6 @@ - - src/main/java - src/main/resources @@ -165,12 +177,15 @@ ${dto-generator-out-directory} - - - src/test/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.languageserver.LanguageServer + + com.mycila license-maven-plugin @@ -252,7 +267,12 @@ analyze - org.eclipse.xtext:org.eclipse.xtext.xbase.lib.gwt + org.eclipse.xtext:org.eclipse.xtext.xbase.lib.gwt + + org.eclipse.che.core:che-core-api-core + org.eclipse.che.core:che-core-api-languageserver-shared + org.eclipse.che.core:che-core-api-model diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/module.gwt.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..882a72c10a9 --- /dev/null +++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/module.gwt.xml @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/resources/org/eclipse/che/plugin/languageserver/LanguageServer.gwt.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/resources/org/eclipse/che/plugin/languageserver/LanguageServer.gwt.xml deleted file mode 100644 index 7d0916887b6..00000000000 --- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/resources/org/eclipse/che/plugin/languageserver/LanguageServer.gwt.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml index 549e87a5db8..da75cf3dbc4 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-machine-ssh-client - jar + gwt-lib Che Plugin :: Machine :: SSH Client ${project.build.directory}/generated-sources/dto/ @@ -38,6 +38,11 @@ org.eclipse.che.core che-core-api-ssh-shared + + org.eclipse.che.core + che-core-api-ssh-shared + sources + com.google.gwt gwt-user @@ -100,16 +105,31 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.ext.ssh.MachineSsh + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-ssh-shared + + + + + + diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/PluginsDevelopment.gwt.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/module.gwt.xml similarity index 91% rename from plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/PluginsDevelopment.gwt.xml rename to plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/module.gwt.xml index dc1f289c512..35dac6093e1 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/PluginsDevelopment.gwt.xml +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/module.gwt.xml @@ -17,9 +17,9 @@ - + - + diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources/org/eclipse/che/ide/ext/ssh/MachineSsh.gwt.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources/org/eclipse/che/ide/ext/ssh/MachineSsh.gwt.xml deleted file mode 100644 index 5a1080efb80..00000000000 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources/org/eclipse/che/ide/ext/ssh/MachineSsh.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml index 85ff18cd960..24ed0c5c067 100644 --- a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml @@ -97,17 +97,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml index 05d170502ed..50090820541 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-maven-ide + gwt-lib Che Plugin :: Maven :: Extension Maven Client ${project.build.directory}/generated-sources/dto/ @@ -56,6 +57,11 @@ org.eclipse.che.core che-core-api-project-shared + + org.eclipse.che.core + che-core-api-project-shared + sources + org.eclipse.che.core che-core-commons-annotations @@ -84,9 +90,19 @@ org.eclipse.che.plugin che-plugin-java-ext-lang-shared + + org.eclipse.che.plugin + che-plugin-java-ext-lang-shared + sources + + + org.eclipse.che.plugin + che-plugin-maven-shared + org.eclipse.che.plugin che-plugin-maven-shared + sources org.vectomatic @@ -119,21 +135,34 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.maven.Maven + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-project-shared + org.eclipse.che.core:che-core-api-project-shared + org.eclipse.che.plugin:che-plugin-java-ext-lang-shared + org.eclipse.che.plugin:che-plugin-maven-shared + + + + + + diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/resources/org/eclipse/che/plugin/maven/Maven.gwt.xml b/plugins/plugin-maven/che-plugin-maven-ide/src/main/resources/org/eclipse/che/plugin/maven/Maven.gwt.xml deleted file mode 100644 index 5987cb2ce7a..00000000000 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/resources/org/eclipse/che/plugin/maven/Maven.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-maven/che-plugin-maven-server/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/pom.xml index 007b6863326..4c823a14f5d 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-server/pom.xml @@ -226,27 +226,6 @@ - src/main/java - target/classes - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - src/test/java - - - src/test/resources - - org.apache.maven.plugins diff --git a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml index 0bbb3124811..c684228cd23 100644 --- a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml @@ -48,17 +48,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml index 4ea7a33f4b1..768c172ef0f 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-nodejs-debugger-ide - jar + gwt-lib Che Plugin :: NodeJs Debugger :: IDE @@ -110,15 +110,15 @@ - - - src/main/java - - - src/main/resources - - + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.nodejsdbg.NodeJsDebugger + + org.apache.maven.plugins maven-dependency-plugin diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/module.gwt.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..b32b29bbfe9 --- /dev/null +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/module.gwt.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/resources/org/eclipse/che/plugin/nodejsdbg/NodeJsDebugger.gwt.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/resources/org/eclipse/che/plugin/nodejsdbg/NodeJsDebugger.gwt.xml deleted file mode 100644 index db22d29be01..00000000000 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/resources/org/eclipse/che/plugin/nodejsdbg/NodeJsDebugger.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - 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 e3159204831..a92eab5cfc6 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-nodejs-lang-ide - jar + gwt-lib Che Plugin :: NodeJs :: IDE @@ -38,6 +38,11 @@ org.eclipse.che.plugin che-plugin-nodejs-lang-shared + + org.eclipse.che.plugin + che-plugin-nodejs-lang-shared + sources + org.vectomatic lib-gwt-svg @@ -49,13 +54,31 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.nodejs.NodeJs + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-nodejs-lang-shared + + + + + + diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/module.gwt.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..3ae96a2c4b5 --- /dev/null +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/module.gwt.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml deleted file mode 100644 index 475e33505ef..00000000000 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml index d28c0d38a99..65eb7db9def 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml @@ -20,11 +20,4 @@ che-plugin-nodejs-lang-shared Che Plugin :: NodeJs :: Extension Shared - - - - src/main/java - - - diff --git a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml index 8078684e091..f3f9675da9e 100644 --- a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-orion-compare - jar + gwt-lib Che Plugin :: Orion :: Compare Widget false @@ -48,13 +48,15 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.orion.OrionCompare + + + diff --git a/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml b/plugins/plugin-orion/che-plugin-orion-compare/src/main/module.gwt.xml similarity index 86% rename from plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml rename to plugins/plugin-orion/che-plugin-orion-compare/src/main/module.gwt.xml index 8aece44a63e..ce398fd539b 100644 --- a/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml +++ b/plugins/plugin-orion/che-plugin-orion-compare/src/main/module.gwt.xml @@ -13,8 +13,6 @@ --> - - - + diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml index d09af60f567..93c8d92c845 100644 --- a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-php-lang-ide - jar + gwt-lib Che Plugin :: PHP :: IDE @@ -50,6 +50,11 @@ org.eclipse.che.plugin che-plugin-php-lang-shared + + org.eclipse.che.plugin + che-plugin-php-lang-shared + sources + org.vectomatic lib-gwt-svg @@ -61,13 +66,31 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.php.Php + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-php-lang-shared + + + + + + diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/src/main/module.gwt.xml b/plugins/plugin-php/che-plugin-php-lang-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..3ae96a2c4b5 --- /dev/null +++ b/plugins/plugin-php/che-plugin-php-lang-ide/src/main/module.gwt.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/src/main/resources/org/eclipse/che/plugin/php/Php.gwt.xml b/plugins/plugin-php/che-plugin-php-lang-ide/src/main/resources/org/eclipse/che/plugin/php/Php.gwt.xml deleted file mode 100644 index 475e33505ef..00000000000 --- a/plugins/plugin-php/che-plugin-php-lang-ide/src/main/resources/org/eclipse/che/plugin/php/Php.gwt.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml index 2295b1c61ec..90d339b04b1 100644 --- a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml @@ -27,14 +27,4 @@ provided - - - - src/main/java - - - src/main/resources - - - diff --git a/plugins/plugin-product-info/pom.xml b/plugins/plugin-product-info/pom.xml index c4aa3121a4b..d0e39b95516 100644 --- a/plugins/plugin-product-info/pom.xml +++ b/plugins/plugin-product-info/pom.xml @@ -20,7 +20,7 @@ ../pom.xml che-plugin-product-info - jar + gwt-lib Che Plugin :: Product Info :: Client @@ -54,14 +54,15 @@ - target/classes - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.product.info.ProductInfo + + + diff --git a/plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources/org/eclipse/che/ide/ext/dashboard/Dashboard.gwt.xml b/plugins/plugin-product-info/src/main/module.gwt.xml similarity index 90% rename from plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources/org/eclipse/che/ide/ext/dashboard/Dashboard.gwt.xml rename to plugins/plugin-product-info/src/main/module.gwt.xml index 4fed2709b2a..e885f86b278 100644 --- a/plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources/org/eclipse/che/ide/ext/dashboard/Dashboard.gwt.xml +++ b/plugins/plugin-product-info/src/main/module.gwt.xml @@ -17,7 +17,5 @@ - - - + diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml index 4de9f80763e..14177638148 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-pullrequest-ide + gwt-lib Che Plugin :: Pull request :: IDE @@ -45,25 +46,55 @@ org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-api-core + sources + + + org.eclipse.che.core + che-core-api-factory-shared + org.eclipse.che.core che-core-api-factory-shared + sources org.eclipse.che.core che-core-api-git-shared + + org.eclipse.che.core + che-core-api-git-shared + sources + + + org.eclipse.che.core + che-core-api-model + org.eclipse.che.core che-core-api-model + sources org.eclipse.che.core che-core-api-ssh-shared + + org.eclipse.che.core + che-core-api-ssh-shared + sources + + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-api-workspace-shared + sources org.eclipse.che.core @@ -89,6 +120,11 @@ org.eclipse.che.plugin che-plugin-pullrequest-shared + + org.eclipse.che.plugin + che-plugin-pullrequest-shared + sources + org.vectomatic lib-gwt-svg @@ -105,13 +141,37 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.pullrequest.PullRequest + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-factory-shared + org.eclipse.che.core:che-core-api-core + org.eclipse.che.core:che-core-api-model + org.eclipse.che.core:che-core-api-git-shared + org.eclipse.che.core:che-core-api-ssh-shared + org.eclipse.che.core:che-core-api-workspace-shared + org.eclipse.che.plugin:che-plugin-pullrequest-shared + + + + + + diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml index 94bd84fcb80..7a5cccaeb1c 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml @@ -86,14 +86,6 @@ - - - src/main/java - - - src/main/resources - - org.apache.maven.plugins diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml index ed93452468e..20ec9acdc21 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml @@ -20,14 +20,7 @@ che-plugin-pullrequest-shared Che Plugin :: Pull request :: Shared - - ${project.build.directory}/generated-sources/dto/ - - - com.google.inject - guice - org.eclipse.che.core che-core-api-dto @@ -43,80 +36,4 @@ provided - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - - generate-client-dto - generate-sources - - generate - - - - org.eclipse.che.plugin.pullrequest.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.plugin.pullrequest.shared.dto.DtoClientImpls - client - - - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - - - - - 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 960fa5bd97d..7edbd57698b 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-python-lang-ide - jar + gwt-lib Che Plugin :: Python :: IDE @@ -50,6 +50,11 @@ org.eclipse.che.plugin che-plugin-python-lang-shared + + org.eclipse.che.plugin + che-plugin-python-lang-shared + sources + org.vectomatic lib-gwt-svg @@ -61,13 +66,31 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.python.Python + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-python-lang-shared + + + + + + diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/module.gwt.xml b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..3ae96a2c4b5 --- /dev/null +++ b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/module.gwt.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml deleted file mode 100644 index 475e33505ef..00000000000 --- a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml index 847ecd8d849..6107e47b345 100644 --- a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml @@ -20,11 +20,4 @@ che-plugin-python-lang-shared che-plugin-python-lang-shared - - - - src/main/java - - - 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 e8ab6ac44bd..a0fc82a9bc9 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-sdk-ext-plugins - jar + gwt-lib Che Plugin :: SDK :: Plugins Development @@ -30,10 +30,6 @@ com.google.inject guice - - org.eclipse.che.core - che-core-commons-gwt - org.eclipse.che.core che-core-ide-api @@ -47,47 +43,17 @@ gwt-user provided - - javax.validation - validation-api - sources - test - - - junit - junit - test - - - org.easytesting - fest-assert - test - - - org.mockito - mockito-core - test - - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/java - - - src/test/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.ide.ext.plugins.SDK + + + diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandType.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/GwtCheCommandType.java similarity index 58% rename from plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandType.java rename to plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/GwtCheCommandType.java index 759215109a5..2f68b7dea6b 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandType.java +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/GwtCheCommandType.java @@ -8,17 +8,17 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.plugins.client.command; +package org.eclipse.che.ide.ext.plugins.client; + +import static java.util.Collections.emptyList; import com.google.inject.Inject; import com.google.inject.Singleton; -import java.util.LinkedList; import java.util.List; import org.eclipse.che.ide.api.command.CommandPage; import org.eclipse.che.ide.api.command.CommandType; import org.eclipse.che.ide.api.icon.Icon; import org.eclipse.che.ide.api.icon.IconRegistry; -import org.eclipse.che.ide.ext.plugins.client.PluginsResources; /** * 'GWT SDM for Che' command type. @@ -28,25 +28,12 @@ @Singleton public class GwtCheCommandType implements CommandType { - public static final String CODE_SERVER_FQN = "com.google.gwt.dev.codeserver.CodeServer"; - public static final String COMMAND_TEMPLATE = - "java -classpath $CHE_CLASSPATH " - + CODE_SERVER_FQN - + " $GWT_MODULE -noincremental -noprecompile"; - + private static final String COMMAND_TEMPLATE = + "mvn -f /projects/che gwt:codeserver -pl :che-ide-gwt-app -am -Pfast"; private static final String ID = "gwt_sdm_che"; - private static final String IDE_GWT_MODULE = "org.eclipse.che.ide.IDE"; - - private final PluginsResources resources; - - private final List pages; @Inject - public GwtCheCommandType( - PluginsResources resources, GwtCheCommandPagePresenter page, IconRegistry iconRegistry) { - this.resources = resources; - pages = new LinkedList<>(); - pages.add(page); + public GwtCheCommandType(PluginsResources resources, IconRegistry iconRegistry) { iconRegistry.registerIcon(new Icon("command.type." + ID, resources.gwtCheCommandType())); } @@ -68,15 +55,12 @@ public String getDescription() { @Override public List getPages() { - return pages; + return emptyList(); } @Override public String getCommandLineTemplate() { - return COMMAND_TEMPLATE - .replace("$GWT_MODULE", IDE_GWT_MODULE) - .replace("$CHE_CLASSPATH", '"' + resources.cheClassPath().getText() + '"') - + " -bindAddress 0.0.0.0"; + return COMMAND_TEMPLATE; } @Override diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java index 7173a80c6ba..ef9b1589e83 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java @@ -14,7 +14,6 @@ import com.google.gwt.inject.client.multibindings.GinMultibinder; import org.eclipse.che.ide.api.command.CommandType; import org.eclipse.che.ide.api.extension.ExtensionGinModule; -import org.eclipse.che.ide.ext.plugins.client.command.GwtCheCommandType; /** * GIN module for 'Che Plugins Development' extension. diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.java deleted file mode 100644 index f2bfecdf9f3..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2012-2017 Red Hat, Inc. - * 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: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.ide.ext.plugins.client; - -import com.google.gwt.i18n.client.Messages; - -/** - * Localization constants. Interface represents the constants contained in resource bundle: - * 'PluginsLocalizationConstant.properties'. - * - * @author Artem Zatsarynnyi - */ -public interface PluginsLocalizationConstant extends Messages { - - /* GwtCheCommandPageView */ - @Key("view.gwtCheCommandPage.gwtModule.text") - String gwtCheCommandPageViewGwtModuleText(); - - @Key("view.gwtCheCommandPage.codeServerAddress.text") - String gwtCommandPageViewCodeServerAddressText(); - - @Key("view.gwtCheCommandPage.classPath.text") - String gwtCommandPageViewClassPathText(); - - @Key("view.gwtCheCommandPage.warn") - String gwtCommandPageViewWarning(); -} diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java index 92c4db2db95..f6d43825924 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java @@ -11,7 +11,6 @@ package org.eclipse.che.ide.ext.plugins.client; import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.TextResource; import org.vectomatic.dom.svg.ui.SVGResource; /** @@ -23,7 +22,4 @@ public interface PluginsResources extends ClientBundle { @Source("images/gwt-che-command-type.svg") SVGResource gwtCheCommandType(); - - @Source("cheClassPath.txt") - TextResource cheClassPath(); } diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandModel.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandModel.java deleted file mode 100644 index 2c6aef615db..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandModel.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2012-2017 Red Hat, Inc. - * 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: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.ide.ext.plugins.client.command; - -import static org.eclipse.che.ide.ext.plugins.client.command.GwtCheCommandType.CODE_SERVER_FQN; -import static org.eclipse.che.ide.ext.plugins.client.command.GwtCheCommandType.COMMAND_TEMPLATE; - -import org.eclipse.che.ide.CommandLine; - -/** - * Model of the 'GWT SDM for Che' command. - * - * @author Artem Zatsarynnyi - */ -class GwtCheCommandModel { - - private String gwtModule; - private String codeServerAddress; - private String classPath; - - GwtCheCommandModel(String gwtModule, String codeServerAddress, String classPath) { - this.gwtModule = gwtModule; - this.codeServerAddress = codeServerAddress; - this.classPath = classPath; - } - - /** Crates {@link GwtCheCommandModel} instance from the given command line. */ - static GwtCheCommandModel fromCommandLine(String commandLine) { - final CommandLine cmd = new CommandLine(commandLine); - - final String classPathArgument = cmd.getArgument(2); - // remove quotes - final String classPath = classPathArgument.substring(1, classPathArgument.length() - 1); - - final int gwtModuleArgumentIndex = cmd.indexOf(CODE_SERVER_FQN) + 1; - final String gwtModule = cmd.getArgument(gwtModuleArgumentIndex); - - String codeServerAddress = null; - - for (String arg : cmd.getArguments()) { - if (arg.equals("-bindAddress")) { - int bindAddressArgumentIndex = cmd.indexOf(arg) + 1; - codeServerAddress = cmd.getArgument(bindAddressArgumentIndex); - } - } - - return new GwtCheCommandModel(gwtModule, codeServerAddress, classPath); - } - - String getGwtModule() { - return gwtModule; - } - - void setGwtModule(String gwtModule) { - this.gwtModule = gwtModule; - } - - String getCodeServerAddress() { - return codeServerAddress; - } - - void setCodeServerAddress(String codeServerAddress) { - this.codeServerAddress = codeServerAddress; - } - - String getClassPath() { - return classPath; - } - - void setClassPath(String classPath) { - this.classPath = classPath; - } - - String toCommandLine() { - final StringBuilder cmd = - new StringBuilder( - COMMAND_TEMPLATE - .replace("$GWT_MODULE", gwtModule.trim()) - .replace("$CHE_CLASSPATH", '"' + classPath + '"')); - if (!codeServerAddress.trim().isEmpty()) { - cmd.append(" -bindAddress ").append(codeServerAddress.trim()); - } - - return cmd.toString(); - } -} diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPagePresenter.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPagePresenter.java deleted file mode 100644 index 9011d457a44..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPagePresenter.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2012-2017 Red Hat, Inc. - * 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: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.ide.ext.plugins.client.command; - -import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import org.eclipse.che.ide.api.command.CommandImpl; -import org.eclipse.che.ide.api.command.CommandPage; - -/** - * Page allows to customize command of {@link GwtCheCommandType}. - * - * @author Artem Zatsarynnyi - */ -@Singleton -public class GwtCheCommandPagePresenter - implements GwtCheCommandPageView.ActionDelegate, CommandPage { - - private final GwtCheCommandPageView view; - - private CommandImpl editedCommand; - private GwtCheCommandModel editedCommandModel; - - // initial value of the 'GWT module' parameter - private String gwtModuleInitial; - // initial value of the 'Code Server address' parameter - private String codeServerAddressInitial; - // initial value of the 'Classpath' parameter - private String classPathInitial; - - private DirtyStateListener listener; - - @Inject - public GwtCheCommandPagePresenter(GwtCheCommandPageView view) { - this.view = view; - - view.setDelegate(this); - } - - @Override - public void resetFrom(CommandImpl command) { - editedCommand = command; - - editedCommandModel = GwtCheCommandModel.fromCommandLine(command.getCommandLine()); - - gwtModuleInitial = editedCommandModel.getGwtModule(); - codeServerAddressInitial = editedCommandModel.getCodeServerAddress(); - classPathInitial = editedCommandModel.getClassPath(); - } - - @Override - public void go(AcceptsOneWidget container) { - container.setWidget(view); - - view.setGwtModule(editedCommandModel.getGwtModule()); - view.setCodeServerAddress(editedCommandModel.getCodeServerAddress()); - view.setClassPath(editedCommandModel.getClassPath()); - } - - @Override - public void onSave() { - gwtModuleInitial = editedCommandModel.getGwtModule(); - codeServerAddressInitial = editedCommandModel.getCodeServerAddress(); - classPathInitial = editedCommandModel.getClassPath(); - } - - @Override - public boolean isDirty() { - return !(gwtModuleInitial.equals(editedCommandModel.getGwtModule()) - && codeServerAddressInitial.equals(editedCommandModel.getCodeServerAddress()) - && classPathInitial.equals(editedCommandModel.getClassPath())); - } - - @Override - public void setDirtyStateListener(DirtyStateListener listener) { - this.listener = listener; - } - - @Override - public void setFieldStateActionDelegate(FieldStateActionDelegate delegate) {} - - @Override - public void onGwtModuleChanged() { - editedCommandModel.setGwtModule(view.getGwtModule()); - - editedCommand.setCommandLine(editedCommandModel.toCommandLine()); - listener.onDirtyStateChanged(); - } - - @Override - public void onCodeServerAddressChanged() { - editedCommandModel.setCodeServerAddress(view.getCodeServerAddress()); - - editedCommand.setCommandLine(editedCommandModel.toCommandLine()); - listener.onDirtyStateChanged(); - } - - @Override - public void onClassPathChanged() { - editedCommandModel.setClassPath(view.getClassPath()); - - editedCommand.setCommandLine(editedCommandModel.toCommandLine()); - listener.onDirtyStateChanged(); - } -} diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageView.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageView.java deleted file mode 100644 index f0947ddb137..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageView.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2012-2017 Red Hat, Inc. - * 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: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.ide.ext.plugins.client.command; - -import com.google.inject.ImplementedBy; -import org.eclipse.che.ide.api.mvp.View; - -/** - * The view of {@link GwtCheCommandPagePresenter}. - * - * @author Artem Zatsarynnyi - */ -@ImplementedBy(GwtCheCommandPageViewImpl.class) -public interface GwtCheCommandPageView extends View { - - /** Returns GWT module name. */ - String getGwtModule(); - - /** Sets GWT module name. */ - void setGwtModule(String gwtModule); - - /** Returns GWT code server address. */ - String getCodeServerAddress(); - - /** Sets GWT code server address. */ - void setCodeServerAddress(String codeServerAddress); - - /** Returns Che classpath. */ - String getClassPath(); - - /** Sets Che classpath. */ - void setClassPath(String classPath); - - /** Action handler for the view actions/controls. */ - interface ActionDelegate { - - /** Called when GWT module has been changed. */ - void onGwtModuleChanged(); - - /** Called when GWT code server address has been changed. */ - void onCodeServerAddressChanged(); - - /** Called when classpath has been changed. */ - void onClassPathChanged(); - } -} diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.java deleted file mode 100644 index 101fac1a796..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (c) 2012-2017 Red Hat, Inc. - * 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: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.ide.ext.plugins.client.command; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.KeyUpEvent; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.TextArea; -import com.google.gwt.user.client.ui.TextBox; -import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; -import org.eclipse.che.ide.ext.plugins.client.PluginsLocalizationConstant; - -/** - * The implementation of {@link GwtCheCommandPageView}. - * - * @author Artem Zatsarynnyi - */ -public class GwtCheCommandPageViewImpl implements GwtCheCommandPageView { - - private static final CommandPageViewImplUiBinder UI_BINDER = - GWT.create(CommandPageViewImplUiBinder.class); - - private final FlowPanel rootElement; - - @UiField TextBox gwtModule; - @UiField TextBox codeServerAddress; - @UiField TextArea classPath; - - @UiField(provided = true) - PluginsLocalizationConstant locale; - - private ActionDelegate delegate; - - @Inject - public GwtCheCommandPageViewImpl(PluginsLocalizationConstant locale) { - this.locale = locale; - rootElement = UI_BINDER.createAndBindUi(this); - } - - @Override - public void setDelegate(ActionDelegate delegate) { - this.delegate = delegate; - } - - @Override - public Widget asWidget() { - return rootElement; - } - - @Override - public String getGwtModule() { - return gwtModule.getValue(); - } - - @Override - public void setGwtModule(String gwtModule) { - this.gwtModule.setValue(gwtModule); - } - - @Override - public String getCodeServerAddress() { - return codeServerAddress.getValue(); - } - - @Override - public void setCodeServerAddress(String codeServerAddress) { - this.codeServerAddress.setValue(codeServerAddress); - } - - @Override - public String getClassPath() { - return classPath.getValue(); - } - - @Override - public void setClassPath(String classPath) { - this.classPath.setValue(classPath); - } - - @UiHandler({"gwtModule"}) - void onGwtModuleChanged(KeyUpEvent event) { - // gwtModule value may not be updated immediately after keyUp - // therefore use the timer with delay=0 - new Timer() { - @Override - public void run() { - delegate.onGwtModuleChanged(); - } - }.schedule(0); - } - - @UiHandler({"codeServerAddress"}) - void onCodeServerAddressChanged(KeyUpEvent event) { - // codeServerAddress value may not be updated immediately after keyUp - // therefore use the timer with delay=0 - new Timer() { - @Override - public void run() { - delegate.onCodeServerAddressChanged(); - } - }.schedule(0); - } - - @UiHandler({"classPath"}) - void onClassPathChanged(KeyUpEvent event) { - // classPath value may not be updated immediately after keyUp - // therefore use the timer with delay=0 - new Timer() { - @Override - public void run() { - delegate.onClassPathChanged(); - } - }.schedule(0); - } - - interface CommandPageViewImplUiBinder extends UiBinder {} -} diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.ui.xml b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.ui.xml deleted file mode 100644 index 25123462ad0..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.ui.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - .inputField { - color: #dbdbdb; - border: 1px solid #191c1e; - border-radius: 1px; - box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.19) inset, 0px 1px 0px 0px rgba(223, 223, 223, 0.4); - font-size: 12px; - padding-left: 8px; - height: 70px; - } - - .label { - position: relative; - line-height: 29px; - } - - .mainPanel { - margin: 15px; - } - - .floatLeft { - float: left; - } - - .floatRight { - float: right; - } - - .marginBottom { - margin-bottom: 7px !important; - } - - .warning { - color: orange; - } - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.properties b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.properties deleted file mode 100644 index ddec25fa55c..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.properties +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2012-2017 Red Hat, Inc. -# 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: -# Red Hat, Inc. - initial API and implementation -# - -##### GwtCheCommandPageView ##### -view.gwtCheCommandPage.gwtModule.text = GWT module -view.gwtCheCommandPage.codeServerAddress.text = Code server address -view.gwtCheCommandPage.classPath.text = Class path -view.gwtCheCommandPage.warn = NOTE: CHE project have to be built first diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/cheClassPath.txt b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/cheClassPath.txt deleted file mode 100644 index 80bd2070d1b..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/cheClassPath.txt +++ /dev/null @@ -1,304 +0,0 @@ -/home/user/.m2/repository/com/google/gwt/gwt-codeserver/2.7.0/gwt-codeserver-2.7.0.jar:\ -/home/user/.m2/repository/com/google/gwt/gwt-dev/2.7.0/gwt-dev-2.7.0.jar:\ -/projects/che/assembly-ide-war/src/main/java:\ -/projects/che/assembly-ide-war/src/main/resources:\ -/projects/che/assembly-ide-war/target/generated-sources/gen:\ -/projects/che-core/platform-api/che-core-api-account/src/main/java:\ -/projects/che-core/platform-api/che-core-api-account/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-dto/src/main/java:\ -/projects/che-core/platform-api/che-core-api-model/src/main/java:\ -/projects/che-core/platform-api/che-core-api-model/src/main/resources:\ -/projects/che-core/commons/che-core-commons-annotations/src/main/java:\ -/projects/che-core/commons/che-core-commons-lang/src/main/java:\ -/projects/che-core/platform-api/che-core-api-auth/src/main/java:\ -/projects/che-core/platform-api/che-core-api-auth/src/main/resources:\ -/projects/che-core/platform-api/che-core-api-auth/target/generated-sources/dto:\ -/projects/che-core/commons/che-core-commons-env/src/main/java:\ -/projects/che-core/commons/che-core-commons-json/src/main/java:\ -/projects/che-core/platform-api/che-core-api-core/src/main/java:\ -/projects/che-core/platform-api/che-core-api-core/src/main/resources:\ -/projects/che-core/platform-api/che-core-api-core/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-infrastructure-local/src/main/java:\ -/projects/che-core/platform-api/che-core-api-machine/src/main/java:\ -/projects/che-core/platform-api/che-core-api-machine/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-project/src/main/java:\ -/projects/che-core/platform-api/che-core-api-project/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-ssh/src/main/java:\ -/projects/che-core/platform-api/che-core-api-ssh/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-user/src/main/java:\ -/projects/che-core/platform-api/che-core-api-user/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-vfs/src/main/java:\ -/projects/che-core/platform-api/che-core-api-vfs/src/main/resources:\ -/projects/che-core/platform-api/che-core-api-vfs/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-workspace/src/main/java:\ -/projects/che-core/platform-api/che-core-api-workspace/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-core/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-core/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-factory/src/main/java:\ -/projects/che-core/platform-api/che-core-api-factory/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/target/generated-sources/dto:\ -/projects/che-core/platform-api/che-core-api-git/src/main/java:\ -/projects/che-core/platform-api/che-core-api-git/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/target/generated-sources/dto:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/resources:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/target/generated-sources/dto:\ -/projects/che-core/commons/che-core-commons-gwt/src/main/java:\ -/projects/che-core/commons/che-core-commons-gwt/src/main/resources:\ -/projects/che-core/commons/che-core-commons-inject/src/main/java:\ -/projects/che-core/commons/che-core-commons-inject/src/main/resources:\ -/projects/che-core/ide/che-core-ide-api/src/main/java:\ -/projects/che-core/ide/che-core-ide-api/src/main/resources:\ -/projects/che-core/ide/che-core-ide-api/target/generated-sources/gen:\ -/projects/che-core/ide/che-core-ide-app/src/main/java:\ -/projects/che-core/ide/che-core-ide-app/src/main/resources:\ -/projects/che-core/ide/che-core-ide-app/target/generated-sources/dto:\ -/projects/che-core/ide/che-core-ide-app/target/generated-sources/gen:\ -/projects/che-core/ide/che-core-ide-generators/src/main/java:\ -/projects/che-core/ide/che-core-ide-ui/src/main/java:\ -/projects/che-core/ide/che-core-ide-ui/src/main/resources:\ -/projects/che-core/ide/che-core-ide-jseditor/src/main/java:\ -/projects/che-core/ide/che-core-ide-jseditor/src/main/resources:\ -/projects/che-core/ide/che-core-ide-jseditor/target/requirejs-2.1.15:\ -/projects/che-core/che-core-vfs-impl/src/main/java:\ -/projects/che-core/che-core-vfs-impl/src/main/resources:\ -/projects/che-plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/java:\ -/projects/che-plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources:\ -/projects/che-plugins/plugin-git/che-plugin-git-ext-git/src/main/java:\ -/projects/che-plugins/plugin-git/che-plugin-git-ext-git/src/main/resources:\ -/projects/che-plugins/plugin-git/che-plugin-git-ext-git/target/generated-sources/dto:\ -/projects/che-plugins/plugin-github/che-plugin-github-ext-github/src/main/java:\ -/projects/che-plugins/plugin-github/che-plugin-github-ext-github/src/main/resources:\ -/projects/che-plugins/plugin-github/che-plugin-github-ext-github/target/generated-sources/dto:\ -/projects/che-plugins/plugin-git/che-plugin-git-ssh-client/src/main/java:\ -/projects/che-plugins/plugin-git/che-plugin-git-ssh-client/src/main/resources:\ -/projects/che-plugins/plugin-github/che-plugin-github-oauth2/src/main/java:\ -/projects/che-plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/java:\ -/projects/che-plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources:\ -/projects/che-plugins/plugin-help/che-plugin-help-ext-client/src/main/java:\ -/projects/che-plugins/plugin-help/che-plugin-help-ext-client/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-client/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-client/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-shared/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-shared/target/generated-sources/dto:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-shared/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-shared/target/generated-sources/dto:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/target/generated-sources/dto:\ -/projects/che-core/commons/che-core-commons-xml/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-generator-archetype/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-generator-archetype/target/generated-sources/dto:\ -/projects/che-plugins/plugin-java/che-plugin-java-maven-tools/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/src/main/resources:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/src/main/java:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/src/main/resources:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ext-client/src/main/resources:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources:\ -/projects/che-plugins/plugin-orion/che-plugin-orion-compare/src/main/java:\ -/projects/che-plugins/plugin-orion/che-plugin-orion-compare/src/main/resources:\ -/projects/che-plugins/plugin-orion/che-plugin-orion-editor/src/main/java:\ -/projects/che-plugins/plugin-orion/che-plugin-orion-editor/src/main/resources:\ -/projects/che-plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java:\ -/projects/che-plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources:\ -/projects/che-plugins/plugin-web/che-plugin-web-ext-web/src/main/java:\ -/projects/che-plugins/plugin-web/che-plugin-web-ext-web/src/main/resources:\ -/projects/che/assembly-ide-war/target/classes:\ -/home/user/.m2/repository/com/google/guava/guava/18.0/guava-18.0.jar:\ -/home/user/.m2/repository/com/google/guava/guava-gwt/18.0/guava-gwt-18.0.jar:\ -/home/user/.m2/repository/com/google/gwt/inject/gin/2.1.2/gin-2.1.2.jar:\ -/home/user/.m2/repository/com/google/inject/guice/4.0/guice-4.0.jar:\ -/home/user/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:\ -/home/user/.m2/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar:\ -/home/user/.m2/repository/com/google/inject/extensions/guice-multibindings/4.0/guice-multibindings-4.0.jar:\ -/home/user/.m2/repository/com/google/inject/extensions/guice-servlet/4.0/guice-servlet-4.0.jar:\ -/home/user/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar:\ -/projects/che-core/platform-api/che-core-api-account/target/classes:\ -/home/user/.m2/repository/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar:\ -/home/user/.m2/repository/io/swagger/swagger-annotations/1.5.6/swagger-annotations-1.5.6.jar:\ -/home/user/.m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar:\ -/home/user/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar:\ -/projects/che-core/platform-api/che-core-api-dto/target/classes:\ -/home/user/.m2/repository/org/reflections/reflections/0.9.9/reflections-0.9.9.jar:\ -/home/user/.m2/repository/org/javassist/javassist/3.18.2-GA/javassist-3.18.2-GA.jar:\ -/projects/che-core/platform-api/che-core-api-model/target/classes:\ -/projects/che-core/commons/che-core-commons-annotations/target/classes:\ -/projects/che-core/commons/che-core-commons-lang/target/classes:\ -/home/user/.m2/repository/org/apache/commons/commons-compress/1.9/commons-compress-1.9.jar:\ -/home/user/.m2/repository/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar:\ -/projects/che-core/platform-api/che-core-api-auth/target/classes:\ -/home/user/.m2/repository/com/google/http-client/google-http-client/1.19.0/google-http-client-1.19.0.jar:\ -/home/user/.m2/repository/com/google/http-client/google-http-client-jackson2/1.19.0/google-http-client-jackson2-1.19.0.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.5.0/jackson-core-2.5.0.jar:\ -/home/user/.m2/repository/com/google/oauth-client/google-oauth-client/1.19.0/google-oauth-client-1.19.0.jar:\ -/projects/che-core/commons/che-core-commons-env/target/classes:\ -/projects/che-core/commons/che-core-commons-json/target/classes:\ -/projects/che-core/platform-api/che-core-api-core/target/classes:\ -/home/user/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.0/javax.ws.rs-api-2.0.jar:\ -/home/user/.m2/repository/net/java/dev/jna/jna/4.1.0/jna-4.1.0.jar:\ -/projects/che-core/platform-api/che-core-api-infrastructure-local/target/classes:\ -/projects/che-core/platform-api/che-core-api-machine/target/classes:\ -/projects/che-core/platform-api/che-core-api-project/target/classes:\ -/home/user/.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar:\ -/projects/che-core/platform-api/che-core-api-ssh/target/classes:\ -/home/user/.m2/repository/com/jcraft/jsch/0.1.53/jsch-0.1.53.jar:\ -/projects/che-core/platform-api/che-core-api-user/target/classes:\ -/projects/che-core/platform-api/che-core-api-vfs/target/classes:\ -/home/user/.m2/repository/commons-io/commons-io/2.4/commons-io-2.4.jar:\ -/home/user/.m2/repository/org/apache/lucene/lucene-analyzers-common/5.2.1/lucene-analyzers-common-5.2.1.jar:\ -/home/user/.m2/repository/org/apache/lucene/lucene-core/5.2.1/lucene-core-5.2.1.jar:\ -/home/user/.m2/repository/org/apache/lucene/lucene-queryparser/5.2.1/lucene-queryparser-5.2.1.jar:\ -/home/user/.m2/repository/org/apache/lucene/lucene-queries/5.2.1/lucene-queries-5.2.1.jar:\ -/home/user/.m2/repository/org/apache/lucene/lucene-sandbox/5.2.1/lucene-sandbox-5.2.1.jar:\ -/home/user/.m2/repository/org/apache/tika/tika-core/1.11/tika-core-1.11.jar:\ -/projects/che-core/platform-api/che-core-api-workspace/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-core/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/target/classes:\ -/projects/che-core/platform-api/che-core-api-factory/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/target/classes:\ -/projects/che-core/platform-api/che-core-api-git/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/target/classes:\ -/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/target/classes:\ -/projects/che-core/commons/che-core-commons-gwt/target/classes:\ -/home/user/.m2/repository/com/google/gwt/gwt-elemental/2.7.0/gwt-elemental-2.7.0.jar:\ -/home/user/.m2/repository/org/vectomatic/lib-gwt-svg/0.5.10/lib-gwt-svg-0.5.10.jar:\ -/projects/che-core/commons/che-core-commons-inject/target/classes:\ -/projects/che-core/ide/che-core-ide-api/target/classes:\ -/projects/che-core/ide/che-core-ide-app/target/che-core-ide-app-4.0.0-beta-12-SNAPSHOT/WEB-INF/classes:\ -/projects/che-core/ide/che-core-ide-generators/target/classes:\ -/projects/che-core/ide/che-core-ide-ui/target/classes:\ -/projects/che-core/ide/che-core-ide-jseditor/target/classes:\ -/projects/che-core/che-core-vfs-impl/target/classes:\ -/home/user/.m2/repository/commons-codec/commons-codec/1.10/commons-codec-1.10.jar:\ -/home/user/.m2/repository/org/bouncycastle/bcpkix-jdk15on/1.51/bcpkix-jdk15on-1.51.jar:\ -/home/user/.m2/repository/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar:\ -/projects/che-plugins/plugin-dashboard/che-plugin-ext-dashboard/target/classes:\ -/projects/che-plugins/plugin-git/che-plugin-git-ext-git/target/classes:\ -/projects/che-plugins/plugin-github/che-plugin-github-ext-github/target/classes:\ -/projects/che-plugins/plugin-git/che-plugin-git-ssh-client/target/classes:\ -/home/user/.m2/repository/org/kohsuke/github-api/1.67/github-api-1.67.jar:\ -/home/user/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar:\ -/home/user/.m2/repository/com/infradna/tool/bridge-method-annotation/1.14/bridge-method-annotation-1.14.jar:\ -/home/user/.m2/repository/org/jenkins-ci/annotation-indexer/1.4/annotation-indexer-1.4.jar:\ -/projects/che-plugins/plugin-github/che-plugin-github-oauth2/target/classes:\ -/home/user/.m2/repository/javax/mail/mail/1.4.4/mail-1.4.4.jar:\ -/home/user/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar:\ -/projects/che-plugins/plugin-gwt/che-plugin-gwt-ext-gwt/target/classes:\ -/projects/che-plugins/plugin-help/che-plugin-help-ext-client/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-client/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-shared/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-client/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-server/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-shared/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/target/classes:\ -/home/user/.m2/repository/org/eclipse/birt/runtime/org.eclipse.equinox.common/3.6.200.v20130402-1505/org.eclipse.equinox.common-3.6.200.v20130402-1505.jar:\ -/projects/che-core/commons/che-core-commons-xml/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-generator-archetype/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/che-plugin-java-jdt-core-repack/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-maven-tools/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/target/classes:\ -/home/user/.m2/repository/org/eclipse/birt/runtime/org.eclipse.core.jobs/3.6.0.v20140424-0053/org.eclipse.core.jobs-3.6.0.v20140424-0053.jar:\ -/home/user/.m2/repository/org/eclipse/birt/runtime/org.eclipse.core.runtime/3.10.0.v20140318-2214/org.eclipse.core.runtime-3.10.0.v20140318-2214.jar:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/target/classes:\ -/home/user/.m2/repository/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2.jar:\ -/home/user/.m2/repository/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2.jar:\ -/home/user/.m2/repository/org/eclipse/core/contenttype/3.4.200-v20140207-1251/contenttype-3.4.200-v20140207-1251.jar:\ -/home/user/.m2/repository/org/eclipse/core/org.eclipse.core.commands/3.6.0/org.eclipse.core.commands-3.6.0.jar:\ -/home/user/.m2/repository/org/eclipse/equinox/preferences/3.5.200-v20140224-1527/preferences-3.5.200-v20140224-1527.jar:\ -/home/user/.m2/repository/org/eclipse/equinox/common/3.6.200-v20130402-1505/common-3.6.200-v20130402-1505.jar:\ -/home/user/.m2/repository/org/eclipse/tycho/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/target/classes:\ -/home/user/.m2/repository/org/mod4j/org/eclipse/core/expressions/3.4.100/expressions-3.4.100.jar:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/target/classes:\ -/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/target/classes:\ -/home/user/.m2/repository/org/eclipse/equinox/registry/3.5.400-v20140428-1507/registry-3.5.400-v20140428-1507.jar:\ -/home/user/.m2/repository/org/eclipse/search/org.eclipse.search/3.10.0.v20150318-0856/org.eclipse.search-3.10.0.v20150318-0856.jar:\ -/home/user/.m2/repository/org/eclipse/text/org.eclipse.text/3.5.101/org.eclipse.text-3.5.101.jar:\ -/home/user/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.common/3.6.0/org.eclipse.equinox.common-3.6.0.jar:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ext-client/target/classes:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ext-server/target/classes:\ -/projects/che-plugins/plugin-machine/che-plugin-machine-ssh-client/target/classes:\ -/projects/che-plugins/plugin-orion/che-plugin-orion-compare/target/classes:\ -/projects/che-plugins/plugin-orion/che-plugin-orion-editor/target/classes:\ -/projects/che-plugins/plugin-sdk/che-plugin-sdk-ext-plugins/target/classes:\ -/projects/che-plugins/plugin-web/che-plugin-web-ext-web/target/classes:\ -/home/user/.m2/repository/org/eclipse/che/swagger/che-swagger-module/4.0.0-beta-12-SNAPSHOT/che-swagger-module-4.0.0-beta-12-20160117.063216-1.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.5.0/jackson-databind-2.5.0.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.5.0/jackson-annotations-2.5.0.jar:\ -/home/user/.m2/repository/io/swagger/swagger-core/1.5.6/swagger-core-1.5.6.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.4.5/jackson-datatype-joda-2.4.5.jar:\ -/home/user/.m2/repository/joda-time/joda-time/2.2/joda-time-2.2.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.4.5/jackson-dataformat-yaml-2.4.5.jar:\ -/home/user/.m2/repository/org/yaml/snakeyaml/1.12/snakeyaml-1.12.jar:\ -/home/user/.m2/repository/io/swagger/swagger-jaxrs/1.5.6/swagger-jaxrs-1.5.6.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.4.5/jackson-dataformat-xml-2.4.5.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.5/jackson-module-jaxb-annotations-2.4.5.jar:\ -/home/user/.m2/repository/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.5/jackson-jaxrs-json-provider-2.4.5.jar:\ -/home/user/.m2/repository/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.5/jackson-jaxrs-base-2.4.5.jar:\ -/home/user/.m2/repository/io/swagger/swagger-models/1.5.6/swagger-models-1.5.6.jar:\ -/home/user/.m2/repository/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar:\ -/home/user/.m2/repository/org/everrest/everrest-core/1.10.0/everrest-core-1.10.0.jar:\ -/home/user/.m2/repository/org/everrest/everrest-integration-guice/1.10.0/everrest-integration-guice-1.10.0.jar:\ -/home/user/.m2/repository/org/everrest/everrest-websockets/1.10.0/everrest-websockets-1.10.0.jar:\ -/home/user/.m2/repository/com/google/gwt/gwt-user/2.7.0/gwt-user-2.7.0.jar:\ -/home/user/.m2/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar:\ -/home/user/.m2/repository/com/google/gwt/gwt-servlet/2.7.0/gwt-servlet-2.7.0.jar:\ -/home/user/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar:\ -/home/user/.m2/repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar:\ -/home/user/.m2/repository/org/ow2/asm/asm-util/5.0.3/asm-util-5.0.3.jar:\ -/home/user/.m2/repository/org/ow2/asm/asm-commons/5.0.3/asm-commons-5.0.3.jar:\ -/home/user/.m2/repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java deleted file mode 100644 index 1a5a44ec2cc..00000000000 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2012-2017 Red Hat, Inc. - * 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: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.ide.ext.plugins.client.command; - -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import com.google.gwt.user.client.ui.AcceptsOneWidget; -import org.eclipse.che.ide.api.command.CommandImpl; -import org.eclipse.che.ide.api.command.CommandPage; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; - -/** @author Artem Zatsarynnyi */ -@RunWith(MockitoJUnitRunner.class) -public class GwtChePagePresenterTest { - - private static final String GWT_MODULE = "org.eclipse.CHE"; - private static final String CODE_SERVER_ADDRESS = "0.0.0.0"; - private static final String CHE_CLASS_PATH = "class_path"; - private static final String COMMAND_LINE = - "java -classpath \"" - + CHE_CLASS_PATH - + "\" com.google.gwt.dev.codeserver.CodeServer " - + GWT_MODULE - + " -noincremental -noprecompile -bindAddress " - + CODE_SERVER_ADDRESS; - - @Mock private GwtCheCommandPageView view; - @Mock private CommandImpl command; - - @InjectMocks private GwtCheCommandPagePresenter presenter; - - @Before - public void setUp() { - when(command.getCommandLine()).thenReturn(COMMAND_LINE); - - presenter.resetFrom(command); - } - - @Test - public void testResetting() throws Exception { - verify(command).getCommandLine(); - } - - @Test - public void testGo() throws Exception { - AcceptsOneWidget container = Mockito.mock(AcceptsOneWidget.class); - - presenter.go(container); - - verify(container).setWidget(eq(view)); - verify(view).setGwtModule(eq(GWT_MODULE)); - verify(view).setCodeServerAddress(eq(CODE_SERVER_ADDRESS)); - verify(view).setClassPath(eq(CHE_CLASS_PATH)); - } - - @Test - public void testOnGwtModuleChanged() throws Exception { - when(view.getGwtModule()).thenReturn(GWT_MODULE); - - final CommandPage.DirtyStateListener listener = mock(CommandPage.DirtyStateListener.class); - presenter.setDirtyStateListener(listener); - - presenter.onGwtModuleChanged(); - - verify(view).getGwtModule(); - verify(command).setCommandLine(eq(COMMAND_LINE)); - verify(listener).onDirtyStateChanged(); - } - - @Test - public void testOnCodeServerAddressChanged() throws Exception { - when(view.getCodeServerAddress()).thenReturn(CODE_SERVER_ADDRESS); - - final CommandPage.DirtyStateListener listener = mock(CommandPage.DirtyStateListener.class); - presenter.setDirtyStateListener(listener); - - presenter.onCodeServerAddressChanged(); - - verify(view).getCodeServerAddress(); - verify(command).setCommandLine(eq(COMMAND_LINE)); - verify(listener).onDirtyStateChanged(); - } - - @Test - public void testOnClassPathChanged() throws Exception { - when(view.getClassPath()).thenReturn(CHE_CLASS_PATH); - - final CommandPage.DirtyStateListener listener = mock(CommandPage.DirtyStateListener.class); - presenter.setDirtyStateListener(listener); - - presenter.onClassPathChanged(); - - verify(view).getClassPath(); - verify(command).setCommandLine(eq(COMMAND_LINE)); - verify(listener).onDirtyStateChanged(); - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml index 0a447afe408..71027f2f4fa 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-testing-junit-ide + gwt-lib Che Plugin :: Java Testing :: JUnit IDE @@ -37,6 +38,11 @@ org.eclipse.che.core che-core-api-testing-shared + + org.eclipse.che.core + che-core-api-testing-shared + sources + org.eclipse.che.core che-core-commons-gwt @@ -73,16 +79,31 @@ - - - src/main/java - - **/*.java - - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.testing.junit.JUnit + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.core:che-core-api-testing-shared + + + + + + diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/module.gwt.xml similarity index 74% rename from plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml rename to plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/module.gwt.xml index cb353782b23..6fa971dab42 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/module.gwt.xml @@ -12,10 +12,7 @@ --> - - - diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml index c2137d56f2e..12385f3f3a7 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-testing-testng-ide + gwt-lib Che Plugin :: Java Testing :: TestNG IDE @@ -73,16 +74,15 @@ - - - src/main/java - - **/*.java - - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.testing.testng.TestNG + + + diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/module.gwt.xml similarity index 74% rename from plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml rename to plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/module.gwt.xml index cb353782b23..6fa971dab42 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/module.gwt.xml @@ -12,10 +12,7 @@ --> - - - diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml index af3a95112ea..364b741c3c0 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-testing-phpunit-ide + gwt-lib Che Plugin :: PHP Testing :: PHPUnit IDE @@ -61,16 +62,15 @@ - - - src/main/java - - **/*.java - - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.testing.phpunit.PHPUnit + + + diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/module.gwt.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..d09f3217e17 --- /dev/null +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/module.gwt.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/resources/org/eclipse/che/plugin/testing/phpunit/PHPUnit.gwt.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/resources/org/eclipse/che/plugin/testing/phpunit/PHPUnit.gwt.xml deleted file mode 100644 index 8ce81f40a99..00000000000 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/resources/org/eclipse/che/plugin/testing/phpunit/PHPUnit.gwt.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml index 3dddb773bf7..597f7985b22 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml +++ b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml @@ -19,6 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-testing-ide + gwt-lib Che Plugin :: Testing :: IDE ${project.build.directory}/generated-sources/dto/ @@ -111,12 +112,6 @@ - - src/main/java - - **/*.java - - src/main/resources @@ -125,6 +120,14 @@ + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.testing.TestingExtension + + org.apache.maven.plugins maven-dependency-plugin diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/src/main/resources/org/eclipse/che/plugin/pullrequest/PullRequest.gwt.xml b/plugins/plugin-testing/che-plugin-testing-ide/src/main/module.gwt.xml similarity index 76% rename from plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/src/main/resources/org/eclipse/che/plugin/pullrequest/PullRequest.gwt.xml rename to plugins/plugin-testing/che-plugin-testing-ide/src/main/module.gwt.xml index 7705dac5761..74caa779e73 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/src/main/resources/org/eclipse/che/plugin/pullrequest/PullRequest.gwt.xml +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/module.gwt.xml @@ -1,4 +1,3 @@ - - + - - - - + diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/TestingExtension.gwt.xml b/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/TestingExtension.gwt.xml deleted file mode 100644 index 57a3e36bf48..00000000000 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/TestingExtension.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml index 78d6910231e..c81d7054564 100644 --- a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml +++ b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml @@ -62,14 +62,4 @@ test - - - - src/main/java - - - src/main/resources - - - diff --git a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml index a8097ab836d..9630f574290 100644 --- a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml @@ -19,21 +19,4 @@ 6.0.0-M1-SNAPSHOT che-plugin-web-ext-shared - - src/main/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/resources - - - diff --git a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml index 2033deea352..b5d18bff6fe 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-web-ext-web - jar + gwt-lib Che Plugin :: Web :: File Types false @@ -45,6 +45,12 @@ org.eclipse.che.plugin che-plugin-web-ext-shared + + + org.eclipse.che.plugin + che-plugin-web-ext-shared + sources + com.google.gwt gwt-elemental @@ -77,20 +83,31 @@ - src/main/java - target/classes - - - src/main/java - - - src/main/resources - - - - - src/test/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.web.Web + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-web-ext-shared + + + + + + diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtension.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtension.java similarity index 91% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtension.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtension.java index adfceef232a..545c5614c8f 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtension.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtension.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web; +package org.eclipse.che.plugin.web.client; import static org.eclipse.che.ide.api.action.IdeActions.GROUP_ASSISTANT; import static org.eclipse.che.ide.api.action.IdeActions.GROUP_FILE_NEW; @@ -25,13 +25,13 @@ import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.api.icon.Icon; import org.eclipse.che.ide.api.icon.IconRegistry; -import org.eclipse.che.ide.ext.web.css.NewCssFileAction; -import org.eclipse.che.ide.ext.web.css.NewLessFileAction; -import org.eclipse.che.ide.ext.web.html.NewHtmlFileAction; -import org.eclipse.che.ide.ext.web.html.PreviewHTMLAction; -import org.eclipse.che.ide.ext.web.html.editor.HtmlEditorProvider; -import org.eclipse.che.ide.ext.web.js.NewJavaScriptFileAction; -import org.eclipse.che.ide.ext.web.js.editor.JsEditorProvider; +import org.eclipse.che.plugin.web.client.css.NewCssFileAction; +import org.eclipse.che.plugin.web.client.css.NewLessFileAction; +import org.eclipse.che.plugin.web.client.html.NewHtmlFileAction; +import org.eclipse.che.plugin.web.client.html.PreviewHTMLAction; +import org.eclipse.che.plugin.web.client.html.editor.HtmlEditorProvider; +import org.eclipse.che.plugin.web.client.js.NewJavaScriptFileAction; +import org.eclipse.che.plugin.web.client.js.editor.JsEditorProvider; import org.vectomatic.dom.svg.ui.SVGImage; /** diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtensionResource.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtensionResource.java similarity index 95% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtensionResource.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtensionResource.java index f6160edf6a8..d6ae2fc4865 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtensionResource.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtensionResource.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web; +package org.eclipse.che.plugin.web.client; import com.google.gwt.resources.client.ClientBundle; import org.vectomatic.dom.svg.ui.SVGResource; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebLocalizationConstant.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebLocalizationConstant.java similarity index 96% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebLocalizationConstant.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebLocalizationConstant.java index 519c9167811..0d2794f5447 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebLocalizationConstant.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebLocalizationConstant.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web; +package org.eclipse.che.plugin.web.client; import com.google.gwt.i18n.client.Messages; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewCssFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewCssFileAction.java similarity index 94% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewCssFileAction.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewCssFileAction.java index b56294d83da..285817e9259 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewCssFileAction.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewCssFileAction.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.css; +package org.eclipse.che.plugin.web.client.css; import com.google.inject.Inject; import com.google.inject.Provider; @@ -18,9 +18,9 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.ext.web.WebLocalizationConstant; import org.eclipse.che.ide.newresource.AbstractNewResourceAction; import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.plugin.web.client.WebLocalizationConstant; /** * Action to create new CSS file. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewLessFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewLessFileAction.java similarity index 94% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewLessFileAction.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewLessFileAction.java index e0a394a983c..39e78df8572 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewLessFileAction.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewLessFileAction.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.css; +package org.eclipse.che.plugin.web.client.css; import com.google.inject.Inject; import com.google.inject.Provider; @@ -18,9 +18,9 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.ext.web.WebLocalizationConstant; import org.eclipse.che.ide.newresource.AbstractNewResourceAction; import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.plugin.web.client.WebLocalizationConstant; /** * Action to create new Less file. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/NewHtmlFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/NewHtmlFileAction.java similarity index 94% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/NewHtmlFileAction.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/NewHtmlFileAction.java index d4f5757e937..25fe56a6cf9 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/NewHtmlFileAction.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/NewHtmlFileAction.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html; +package org.eclipse.che.plugin.web.client.html; import com.google.inject.Inject; import com.google.inject.Provider; @@ -18,9 +18,9 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.ext.web.WebLocalizationConstant; import org.eclipse.che.ide.newresource.AbstractNewResourceAction; import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.plugin.web.client.WebLocalizationConstant; /** * Action to create new HTML file. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/PreviewHTMLAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/PreviewHTMLAction.java similarity index 95% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/PreviewHTMLAction.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/PreviewHTMLAction.java index 624e1c4efc1..5a2753957db 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/PreviewHTMLAction.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/PreviewHTMLAction.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html; +package org.eclipse.che.plugin.web.client.html; import static java.util.Collections.singletonList; import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID; @@ -21,8 +21,8 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.resources.File; import org.eclipse.che.ide.api.resources.Resource; -import org.eclipse.che.ide.ext.web.WebLocalizationConstant; import org.eclipse.che.ide.util.browser.BrowserUtils; +import org.eclipse.che.plugin.web.client.WebLocalizationConstant; /** * Action for previewing an HTML page. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/AutoEditStrategyFactory.java similarity index 93% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/AutoEditStrategyFactory.java index 582230b4232..f6b623e4831 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/AutoEditStrategyFactory.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html.editor; +package org.eclipse.che.plugin.web.client.html.editor; import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/DefaultCodeAssistProcessor.java similarity index 94% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/DefaultCodeAssistProcessor.java index db0cebc9a13..4186081304f 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/DefaultCodeAssistProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html.editor; +package org.eclipse.che.plugin.web.client.html.editor; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLCodeAssistProcessor.java similarity index 91% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLCodeAssistProcessor.java index 09ef724eee6..97c1a37f58f 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLCodeAssistProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html.editor; +package org.eclipse.che.plugin.web.client.html.editor; import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLEditorConfigurationProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLEditorConfigurationProvider.java similarity index 95% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLEditorConfigurationProvider.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLEditorConfigurationProvider.java index 15594aa0c39..c1aea2e850e 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLEditorConfigurationProvider.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLEditorConfigurationProvider.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html.editor; +package org.eclipse.che.plugin.web.client.html.editor; import com.google.inject.Inject; import java.util.Set; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorConfiguration.java similarity index 98% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorConfiguration.java index edfd76525be..ceb1e3d2709 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorConfiguration.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html.editor; +package org.eclipse.che.plugin.web.client.html.editor; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorProvider.java similarity index 95% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorProvider.java index 850a8b1a3cc..ff4ecdbd68c 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorProvider.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.html.editor; +package org.eclipse.che.plugin.web.client.html.editor; import com.google.inject.Inject; import org.eclipse.che.ide.api.editor.EditorProvider; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/inject/WebModule.java similarity index 92% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/inject/WebModule.java index 3fa5b605089..b4019ac3216 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/inject/WebModule.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.inject; +package org.eclipse.che.plugin.web.client.inject; import com.google.gwt.inject.client.AbstractGinModule; import com.google.gwt.inject.client.multibindings.GinMultibinder; @@ -18,8 +18,8 @@ import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.project.type.wizard.ProjectWizardRegistrar; -import org.eclipse.che.ide.ext.web.WebExtensionResource; -import org.eclipse.che.ide.ext.web.typescript.TSProjectWizardRegistrar; +import org.eclipse.che.plugin.web.client.WebExtensionResource; +import org.eclipse.che.plugin.web.client.typescript.TSProjectWizardRegistrar; /** * Adds custom binding for Editors. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/NewJavaScriptFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/NewJavaScriptFileAction.java similarity index 94% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/NewJavaScriptFileAction.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/NewJavaScriptFileAction.java index 626dc32bbde..5a430dadaf0 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/NewJavaScriptFileAction.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/NewJavaScriptFileAction.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.js; +package org.eclipse.che.plugin.web.client.js; import com.google.inject.Inject; import com.google.inject.Provider; @@ -18,9 +18,9 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.ext.web.WebLocalizationConstant; import org.eclipse.che.ide.newresource.AbstractNewResourceAction; import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.plugin.web.client.WebLocalizationConstant; /** * Action to create new JavaScript file. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/DefaultCodeAssistProcessor.java similarity index 95% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/DefaultCodeAssistProcessor.java index 7f6999e66e7..38657a99397 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/DefaultCodeAssistProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.js.editor; +package org.eclipse.che.plugin.web.client.js.editor; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsCodeAssistProcessor.java similarity index 91% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsCodeAssistProcessor.java index 1494252b7ec..c34466ca14f 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsCodeAssistProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.js.editor; +package org.eclipse.che.plugin.web.client.js.editor; import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfiguration.java similarity index 95% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfiguration.java index 46dc24fa0f6..f0f89b8a8a8 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfiguration.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.js.editor; +package org.eclipse.che.plugin.web.client.js.editor; import java.util.ArrayList; import java.util.HashMap; @@ -20,7 +20,7 @@ import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; import org.eclipse.che.ide.api.editor.editorconfig.DefaultTextEditorConfiguration; import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner; -import org.eclipse.che.ide.ext.web.html.editor.AutoEditStrategyFactory; +import org.eclipse.che.plugin.web.client.html.editor.AutoEditStrategyFactory; /** * The JS type editor configuration. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfigurationProvider.java similarity index 88% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfigurationProvider.java index 898f42ff8c5..baea84c4edb 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfigurationProvider.java @@ -8,12 +8,12 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.js.editor; +package org.eclipse.che.plugin.web.client.js.editor; import com.google.inject.Inject; import java.util.Set; import javax.inject.Provider; -import org.eclipse.che.ide.ext.web.html.editor.AutoEditStrategyFactory; +import org.eclipse.che.plugin.web.client.html.editor.AutoEditStrategyFactory; /** * Provider for JS Editor configuration. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorProvider.java similarity index 96% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorProvider.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorProvider.java index 2cfdebfc878..c1a703cb234 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorProvider.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorProvider.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.js.editor; +package org.eclipse.che.plugin.web.client.js.editor; import com.google.inject.Inject; import org.eclipse.che.ide.api.editor.EditorProvider; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/typescript/TSProjectWizardRegistrar.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/typescript/TSProjectWizardRegistrar.java similarity index 96% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/typescript/TSProjectWizardRegistrar.java rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/typescript/TSProjectWizardRegistrar.java index 7754d073ff7..3d201ff3275 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/typescript/TSProjectWizardRegistrar.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/typescript/TSProjectWizardRegistrar.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.ide.ext.web.typescript; +package org.eclipse.che.plugin.web.client.typescript; import com.google.inject.Provider; import java.util.ArrayList; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/Web.gwt.xml b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/Web.gwt.xml deleted file mode 100644 index 30b99c5afea..00000000000 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/Web.gwt.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/WebLocalizationConstant.properties b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/WebLocalizationConstant.properties similarity index 100% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/WebLocalizationConstant.properties rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/WebLocalizationConstant.properties diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/category/js.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/category/js.svg similarity index 100% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/category/js.svg rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/category/js.svg diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/css.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/css.svg similarity index 100% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/css.svg rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/css.svg diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/html.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/html.svg similarity index 100% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/html.svg rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/html.svg diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/js.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/js.svg similarity index 100% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/js.svg rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/js.svg diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/less.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/less.svg similarity index 100% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/less.svg rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/less.svg diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/php.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/php.svg similarity index 100% rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/php.svg rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/php.svg diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml index adbe72bfd28..fe161e213b0 100644 --- a/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml +++ b/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml @@ -19,7 +19,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-yaml-ide - jar + gwt-lib Che Plugin :: Yaml :: Ide @@ -42,6 +42,11 @@ org.eclipse.che.plugin che-plugin-yaml-shared + + org.eclipse.che.plugin + che-plugin-yaml-shared + sources + org.slf4j slf4j-api @@ -71,6 +76,12 @@ che-core-api-workspace-shared provided + + org.eclipse.che.core + che-core-api-workspace-shared + sources + provided + org.vectomatic lib-gwt-svg @@ -113,13 +124,30 @@ - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.yaml.Yaml + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + + org.eclipse.che.plugin:che-plugin-yaml-shared + + + + + + diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/module.gwt.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..3ae96a2c4b5 --- /dev/null +++ b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/module.gwt.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml deleted file mode 100644 index aad7573529f..00000000000 --- a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml index d7d6ecc89f8..fd4201d6eca 100644 --- a/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml +++ b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml @@ -77,14 +77,4 @@ slf4j-api - - - - src/main/java - - - src/main/resources - - - diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml index 68306499f95..19bc8f26427 100644 --- a/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml +++ b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml @@ -49,17 +49,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml index 954d7be1c66..bff09f7f8b0 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml @@ -16,7 +16,7 @@ 6.0.0-M1-SNAPSHOT che-plugin-zend-debugger-ide - jar + gwt-lib Che Plugin :: PHP :: Zend Debugger IDE @@ -87,28 +87,19 @@ - - - src/main/java - - - src/main/resources - - - org.apache.maven.plugins - maven-surefire-plugin - - - com.mycila - license-maven-plugin + net.ltgt.gwt.maven + gwt-maven-plugin + true - - **/*.png - + org.eclipse.che.plugin.zdb.ZendDebugger + + org.apache.maven.plugins + maven-surefire-plugin + diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/module.gwt.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..cea03b4405a --- /dev/null +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/module.gwt.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/resources/org/eclipse/che/plugin/zdb/ZendDebugger.gwt.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/resources/org/eclipse/che/plugin/zdb/ZendDebugger.gwt.xml deleted file mode 100644 index a94d91644f2..00000000000 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/resources/org/eclipse/che/plugin/zdb/ZendDebugger.gwt.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 740f54f18d9..31781db103e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,7 @@ infrastructures plugins ide/che-ide-core + ide/che-ide-gwt-app dashboard assembly assembly-multiuser @@ -83,12 +84,6 @@ ${che.version} war - - org.eclipse.che - assembly-ide-war - ${che.version} - classes - org.eclipse.che assembly-main @@ -137,6 +132,18 @@ zip linux_amd64 + + org.eclipse.che + che-ide-gwt-app + ${che.version} + pom + + + org.eclipse.che + che-ide-gwt-app + ${che.version} + war + org.eclipse.che che-multiuser-keycloak-shared @@ -267,11 +274,23 @@ che-core-api-auth-shared ${che.version} + + org.eclipse.che.core + che-core-api-auth-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-core ${che.version} + + org.eclipse.che.core + che-core-api-core + ${che.version} + sources + org.eclipse.che.core che-core-api-debug @@ -282,6 +301,12 @@ che-core-api-debug-shared ${che.version} + + org.eclipse.che.core + che-core-api-debug-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-dto @@ -308,6 +333,12 @@ che-core-api-factory-shared ${che.version} + + org.eclipse.che.core + che-core-api-factory-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-git @@ -324,6 +355,12 @@ che-core-api-git-shared ${che.version} + + org.eclipse.che.core + che-core-api-git-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-infrastructure-local @@ -360,11 +397,23 @@ che-core-api-languageserver-shared ${che.version} + + org.eclipse.che.core + che-core-api-languageserver-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-model ${che.version} + + org.eclipse.che.core + che-core-api-model + ${che.version} + sources + org.eclipse.che.core che-core-api-oauth @@ -380,6 +429,12 @@ che-core-api-project-shared ${che.version} + + org.eclipse.che.core + che-core-api-project-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-project-templates @@ -390,6 +445,12 @@ che-core-api-project-templates-shared ${che.version} + + org.eclipse.che.core + che-core-api-project-templates-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-ssh @@ -406,6 +467,12 @@ che-core-api-ssh-shared ${che.version} + + org.eclipse.che.core + che-core-api-ssh-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-system @@ -426,6 +493,12 @@ che-core-api-testing-shared ${che.version} + + org.eclipse.che.core + che-core-api-testing-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-user @@ -442,6 +515,12 @@ che-core-api-user-shared ${che.version} + + org.eclipse.che.core + che-core-api-user-shared + ${che.version} + sources + org.eclipse.che.core che-core-api-workspace @@ -458,6 +537,12 @@ che-core-api-workspace-shared ${che.version} + + org.eclipse.che.core + che-core-api-workspace-shared + ${che.version} + sources + org.eclipse.che.core che-core-commons-annotations @@ -473,6 +558,12 @@ che-core-commons-gwt ${che.version} + + org.eclipse.che.core + che-core-commons-gwt + ${che.version} + sources + org.eclipse.che.core che-core-commons-inject @@ -533,16 +624,34 @@ che-core-gwt-logger ${che.version} + + org.eclipse.che.core + che-core-gwt-logger + ${che.version} + gwt-lib + + + org.eclipse.che.core + che-core-ide-api + ${che.version} + org.eclipse.che.core che-core-ide-api ${che.version} + gwt-lib org.eclipse.che.core che-core-ide-app ${che.version} + + org.eclipse.che.core + che-core-ide-app + ${che.version} + gwt-lib + org.eclipse.che.core che-core-ide-generators @@ -563,11 +672,23 @@ che-core-ide-ui ${che.version} + + org.eclipse.che.core + che-core-ide-ui + ${che.version} + gwt-lib + org.eclipse.che.core che-core-orion-editor ${che.version} + + org.eclipse.che.core + che-core-orion-editor + ${che.version} + gwt-lib + org.eclipse.che.core che-core-sql-schema @@ -578,6 +699,12 @@ che-ide-core ${che.version} + + org.eclipse.che.core + che-ide-core + ${che.version} + gwt-lib + org.eclipse.che.core che-wsagent-core @@ -732,6 +859,12 @@ che-multiuser-keycloak-ide ${che.version} + + org.eclipse.che.multiuser + che-multiuser-keycloak-ide + ${che.version} + gwt-lib + org.eclipse.che.multiuser che-multiuser-keycloak-server @@ -742,6 +875,12 @@ che-multiuser-keycloak-shared ${che.version} + + org.eclipse.che.multiuser + che-multiuser-keycloak-shared + ${che.version} + sources + org.eclipse.che.multiuser che-multiuser-keycloak-token-provider @@ -767,11 +906,23 @@ che-multiuser-machine-authentication-ide ${che.version} + + org.eclipse.che.multiuser + che-multiuser-machine-authentication-ide + ${che.version} + gwt-lib + org.eclipse.che.multiuser che-multiuser-machine-authentication-shared ${che.version} + + org.eclipse.che.multiuser + che-multiuser-machine-authentication-shared + ${che.version} + sources + org.eclipse.che.multiuser che-multiuser-permission-factory @@ -822,6 +973,7 @@ org.eclipse.che.plugin che-plugin-activity-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -843,6 +995,12 @@ che-plugin-composer-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-composer-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-composer-server @@ -853,11 +1011,23 @@ che-plugin-composer-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-composer-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-cpp-lang-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-cpp-lang-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-cpp-lang-server @@ -868,10 +1038,22 @@ che-plugin-cpp-lang-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-cpp-lang-shared + ${che.version} + sources + + + org.eclipse.che.plugin + che-plugin-csharp-lang-ide + ${che.version} + org.eclipse.che.plugin che-plugin-csharp-lang-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -883,10 +1065,22 @@ che-plugin-csharp-lang-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-csharp-lang-shared + ${che.version} + sources + + + org.eclipse.che.plugin + che-plugin-debugger-ide + ${che.version} + org.eclipse.che.plugin che-plugin-debugger-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -898,6 +1092,12 @@ che-plugin-ext-dashboard-client ${che.version} + + org.eclipse.che.plugin + che-plugin-ext-dashboard-client + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-factory-ide @@ -918,6 +1118,12 @@ che-plugin-gdb-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-gdb-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-gdb-server @@ -928,6 +1134,12 @@ che-plugin-git-ext-git ${che.version} + + org.eclipse.che.plugin + che-plugin-git-ext-git + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-github-factory-resolver @@ -938,6 +1150,12 @@ che-plugin-github-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-github-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-github-oauth2 @@ -953,6 +1171,12 @@ che-plugin-github-pullrequest ${che.version} + + org.eclipse.che.plugin + che-plugin-github-pullrequest + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-github-server @@ -963,21 +1187,40 @@ che-plugin-github-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-github-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-gwt-ext-gwt ${che.version} + + org.eclipse.che.plugin + che-plugin-gwt-ext-gwt + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-help-ext-client ${che.version} + gwt-lib org.eclipse.che.plugin che-plugin-java-debugger-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-java-debugger-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-java-debugger-server @@ -988,6 +1231,12 @@ che-plugin-java-ext-lang-client ${che.version} + + org.eclipse.che.plugin + che-plugin-java-ext-lang-client + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-java-ext-lang-server @@ -998,6 +1247,12 @@ che-plugin-java-ext-lang-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-java-ext-lang-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-java-maven-tools @@ -1008,6 +1263,12 @@ che-plugin-java-plain-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-java-plain-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-java-plain-server @@ -1018,6 +1279,12 @@ che-plugin-java-plain-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-java-plain-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-json-server @@ -1027,11 +1294,18 @@ org.eclipse.che.plugin che-plugin-keybinding-eclipse-ide ${che.version} + gwt-lib + + + org.eclipse.che.plugin + che-plugin-languageserver-ide + ${che.version} org.eclipse.che.plugin che-plugin-languageserver-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -1043,6 +1317,12 @@ che-plugin-machine-ssh-client ${che.version} + + org.eclipse.che.plugin + che-plugin-machine-ssh-client + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-maven-generator-archetype @@ -1053,6 +1333,12 @@ che-plugin-maven-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-maven-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-maven-server @@ -1063,11 +1349,23 @@ che-plugin-maven-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-maven-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-nodejs-debugger-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-nodejs-debugger-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-nodejs-debugger-server @@ -1078,6 +1376,12 @@ che-plugin-nodejs-lang-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-nodejs-lang-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-nodejs-lang-server @@ -1088,16 +1392,34 @@ che-plugin-nodejs-lang-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-nodejs-lang-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-orion-compare ${che.version} + + org.eclipse.che.plugin + che-plugin-orion-compare + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-php-lang-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-php-lang-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-php-lang-server @@ -1108,15 +1430,33 @@ che-plugin-php-lang-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-php-lang-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-product-info ${che.version} + + org.eclipse.che.plugin + che-plugin-product-info + ${che.version} + gwt-lib + + + org.eclipse.che.plugin + che-plugin-pullrequest-ide + ${che.version} + org.eclipse.che.plugin che-plugin-pullrequest-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -1128,10 +1468,22 @@ che-plugin-pullrequest-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-pullrequest-shared + ${che.version} + sources + + + org.eclipse.che.plugin + che-plugin-python-lang-ide + ${che.version} + org.eclipse.che.plugin che-plugin-python-lang-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -1143,11 +1495,23 @@ che-plugin-python-lang-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-python-lang-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-sdk-ext-plugins ${che.version} + + org.eclipse.che.plugin + che-plugin-sdk-ext-plugins + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-sdk-tools @@ -1164,6 +1528,12 @@ che-plugin-ssh-key-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-ssh-key-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-ssh-key-server @@ -1184,10 +1554,22 @@ che-plugin-testing-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-testing-ide + ${che.version} + gwt-lib + + + org.eclipse.che.plugin + che-plugin-testing-junit-ide + ${che.version} + org.eclipse.che.plugin che-plugin-testing-junit-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -1204,6 +1586,12 @@ che-plugin-testing-phpunit-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-testing-phpunit-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-testing-phpunit-server @@ -1214,6 +1602,12 @@ che-plugin-testing-testng-ide ${che.version} + + org.eclipse.che.plugin + che-plugin-testing-testng-ide + ${che.version} + gwt-lib + org.eclipse.che.plugin che-plugin-testing-testng-runtime @@ -1239,15 +1633,28 @@ che-plugin-web-ext-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-web-ext-shared + ${che.version} + sources + org.eclipse.che.plugin che-plugin-web-ext-web ${che.version} + gwt-lib + + + org.eclipse.che.plugin + che-plugin-yaml-ide + ${che.version} org.eclipse.che.plugin che-plugin-yaml-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -1259,10 +1666,22 @@ che-plugin-yaml-shared ${che.version} + + org.eclipse.che.plugin + che-plugin-yaml-shared + ${che.version} + sources + + + org.eclipse.che.plugin + che-plugin-zend-debugger-ide + ${che.version} + org.eclipse.che.plugin che-plugin-zend-debugger-ide ${che.version} + gwt-lib org.eclipse.che.plugin @@ -1436,13 +1855,37 @@ https://maven.codenvycorp.com/content/repositories/codenvy-public-snapshots/ + + + + + net.ltgt.gwt.maven + gwt-maven-plugin + false + + + -noprecompile + -noincremental + + -bindAddress + 0.0.0.0 + + + ${gwt.compiler.jvmArgs.Xss} + ${gwt.compiler.jvmArgs.Xmx} + + + + + fast true - 2 -T 1C + 1C true true true diff --git a/wsagent/che-core-api-debug-shared/pom.xml b/wsagent/che-core-api-debug-shared/pom.xml index 81b450b596e..e926c1c543d 100644 --- a/wsagent/che-core-api-debug-shared/pom.xml +++ b/wsagent/che-core-api-debug-shared/pom.xml @@ -35,11 +35,4 @@ che-core-commons-annotations - - - - src/main/java - - - diff --git a/wsagent/che-core-api-debug/pom.xml b/wsagent/che-core-api-debug/pom.xml index 8716d67278a..4f205d436ba 100644 --- a/wsagent/che-core-api-debug/pom.xml +++ b/wsagent/che-core-api-debug/pom.xml @@ -85,17 +85,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/wsagent/che-core-api-git-shared/pom.xml b/wsagent/che-core-api-git-shared/pom.xml index ca795110391..b73e2f13453 100644 --- a/wsagent/che-core-api-git-shared/pom.xml +++ b/wsagent/che-core-api-git-shared/pom.xml @@ -39,11 +39,4 @@ che-core-commons-annotations - - - - src/main/java - - - diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml index 8af1835289b..e6c2d56f5f2 100644 --- a/wsagent/che-core-api-git/pom.xml +++ b/wsagent/che-core-api-git/pom.xml @@ -136,28 +136,6 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - ${project.build.directory}/generated-sources/dto/ - - - - - src/test/java - - - src/test/resources - - org.codehaus.mojo diff --git a/wsagent/che-core-api-languageserver-shared/pom.xml b/wsagent/che-core-api-languageserver-shared/pom.xml index 42d11fefb8b..4122e2e2349 100644 --- a/wsagent/che-core-api-languageserver-shared/pom.xml +++ b/wsagent/che-core-api-languageserver-shared/pom.xml @@ -35,28 +35,4 @@ test - - - - src/main/java - - - src/main/resources - - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - diff --git a/wsagent/che-core-api-languageserver/pom.xml b/wsagent/che-core-api-languageserver/pom.xml index 30da251caca..4803c084c82 100644 --- a/wsagent/che-core-api-languageserver/pom.xml +++ b/wsagent/che-core-api-languageserver/pom.xml @@ -127,25 +127,6 @@ - - - src/main/java - - - src/main/resources - - - ${generated.sources.directory} - - - - - src/test/java - - - src/test/resources - - org.apache.maven.plugins diff --git a/wsagent/che-core-api-project-shared/pom.xml b/wsagent/che-core-api-project-shared/pom.xml index 06239954467..f579683b932 100644 --- a/wsagent/che-core-api-project-shared/pom.xml +++ b/wsagent/che-core-api-project-shared/pom.xml @@ -60,17 +60,6 @@ - - - src/main/java - - - src/main/resources - - - ${generated.sources.directory} - - org.eclipse.che.core diff --git a/wsagent/che-core-api-project/pom.xml b/wsagent/che-core-api-project/pom.xml index 2b16db9dffd..91d74dc12b4 100644 --- a/wsagent/che-core-api-project/pom.xml +++ b/wsagent/che-core-api-project/pom.xml @@ -221,17 +221,6 @@ - - - src/main/java - - - src/main/resources - - - ${generated.sources.directory} - - org.apache.maven.plugins diff --git a/wsagent/che-core-api-testing-shared/pom.xml b/wsagent/che-core-api-testing-shared/pom.xml index 50848d6c889..f16ede8a15c 100644 --- a/wsagent/che-core-api-testing-shared/pom.xml +++ b/wsagent/che-core-api-testing-shared/pom.xml @@ -36,11 +36,6 @@ - - - src/main/java - - com.mycila diff --git a/wsagent/che-core-api-testing/pom.xml b/wsagent/che-core-api-testing/pom.xml index 2ac93354fb8..ab99603a09e 100644 --- a/wsagent/che-core-api-testing/pom.xml +++ b/wsagent/che-core-api-testing/pom.xml @@ -100,17 +100,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - com.mycila diff --git a/wsagent/che-core-ssh-key-ide/pom.xml b/wsagent/che-core-ssh-key-ide/pom.xml index 365341fb39e..b492082286e 100644 --- a/wsagent/che-core-ssh-key-ide/pom.xml +++ b/wsagent/che-core-ssh-key-ide/pom.xml @@ -20,10 +20,9 @@ org.eclipse.che.plugin che-plugin-ssh-key-ide - jar + gwt-lib Che Core :: SSH Key :: Client - ${project.build.directory}/generated-sources/dto/ false @@ -110,16 +109,15 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - + + + net.ltgt.gwt.maven + gwt-maven-plugin + true + + org.eclipse.che.plugin.ssh.key.SshKey + + + diff --git a/wsagent/che-core-ssh-key-ide/src/main/module.gwt.xml b/wsagent/che-core-ssh-key-ide/src/main/module.gwt.xml new file mode 100644 index 00000000000..85ba56e5da2 --- /dev/null +++ b/wsagent/che-core-ssh-key-ide/src/main/module.gwt.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/wsagent/che-core-ssh-key-ide/src/main/resources/org/eclipse/che/plugin/ssh/key/SshKey.gwt.xml b/wsagent/che-core-ssh-key-ide/src/main/resources/org/eclipse/che/plugin/ssh/key/SshKey.gwt.xml deleted file mode 100644 index 999345002c0..00000000000 --- a/wsagent/che-core-ssh-key-ide/src/main/resources/org/eclipse/che/plugin/ssh/key/SshKey.gwt.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/wsagent/che-core-ssh-key-server/pom.xml b/wsagent/che-core-ssh-key-server/pom.xml index 4a92ee1752d..16bf4666e55 100644 --- a/wsagent/che-core-ssh-key-server/pom.xml +++ b/wsagent/che-core-ssh-key-server/pom.xml @@ -95,17 +95,4 @@ test - - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml index 2e19263013c..b4e98311d5d 100644 --- a/wsmaster/che-core-api-auth-shared/pom.xml +++ b/wsmaster/che-core-api-auth-shared/pom.xml @@ -40,17 +40,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml index b5505194088..ea84add3e20 100644 --- a/wsmaster/che-core-api-factory-shared/pom.xml +++ b/wsmaster/che-core-api-factory-shared/pom.xml @@ -49,17 +49,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.codehaus.mojo diff --git a/wsmaster/che-core-api-installer/pom.xml b/wsmaster/che-core-api-installer/pom.xml index 0667bdc31e2..46e3cf27e82 100644 --- a/wsmaster/che-core-api-installer/pom.xml +++ b/wsmaster/che-core-api-installer/pom.xml @@ -163,20 +163,6 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - ${project.build.directory}/generated-sources/dto/ - - org.codehaus.mojo diff --git a/wsmaster/che-core-api-project-templates-shared/pom.xml b/wsmaster/che-core-api-project-templates-shared/pom.xml index 92338dad381..0ac5fbfcebc 100644 --- a/wsmaster/che-core-api-project-templates-shared/pom.xml +++ b/wsmaster/che-core-api-project-templates-shared/pom.xml @@ -43,17 +43,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml index 0bea6050f9c..e98ac8250bf 100644 --- a/wsmaster/che-core-api-ssh-shared/pom.xml +++ b/wsmaster/che-core-api-ssh-shared/pom.xml @@ -43,14 +43,6 @@ - - - src/main/java - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/wsmaster/che-core-api-ssh/pom.xml b/wsmaster/che-core-api-ssh/pom.xml index 9589aff32ad..324dae06e5f 100644 --- a/wsmaster/che-core-api-ssh/pom.xml +++ b/wsmaster/che-core-api-ssh/pom.xml @@ -163,17 +163,6 @@ - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml index 3f138aa88c7..02e8d419eb9 100644 --- a/wsmaster/che-core-api-system-shared/pom.xml +++ b/wsmaster/che-core-api-system-shared/pom.xml @@ -44,17 +44,6 @@ - - - src/main/java - - - src/main/resources - - - ${project.build.directory}/generated-sources/dto/ - - org.codehaus.mojo diff --git a/wsmaster/che-core-api-system/pom.xml b/wsmaster/che-core-api-system/pom.xml index 81ff49f5757..c76af6a46f8 100644 --- a/wsmaster/che-core-api-system/pom.xml +++ b/wsmaster/che-core-api-system/pom.xml @@ -119,17 +119,6 @@ - - - src/main/java - - - src/main/resources - - - ${project.build.directory}/generated-sources/dto/ - - org.codehaus.mojo diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml index 5d393a6495b..5231f7ecb13 100644 --- a/wsmaster/che-core-api-user-shared/pom.xml +++ b/wsmaster/che-core-api-user-shared/pom.xml @@ -47,17 +47,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml index 9daa9332ed3..598378e97d1 100644 --- a/wsmaster/che-core-api-workspace-shared/pom.xml +++ b/wsmaster/che-core-api-workspace-shared/pom.xml @@ -52,17 +52,6 @@ - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - org.eclipse.che.core From 243ee4215918a311e0445b024ae4704195ef2968 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Mon, 30 Oct 2017 15:58:35 +0200 Subject: [PATCH 2/3] revert property's value Signed-off-by: Artem Zatsarynnyi --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31781db103e..cb8846132a9 100644 --- a/pom.xml +++ b/pom.xml @@ -1885,7 +1885,7 @@ fast true - 1C + 2 -T 1C true true true From 1373fe71d594e9c0066d0e22b34bca381e56dd15 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Mon, 30 Oct 2017 23:22:51 +0200 Subject: [PATCH 3/3] Update comments; remove unused property; include lib directory for assembly-ide-war overlay Signed-off-by: Artem Zatsarynnyi --- assembly-multiuser/assembly-ide-war/pom.xml | 3 ++- assembly/assembly-ide-war/pom.xml | 4 +--- pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/assembly-multiuser/assembly-ide-war/pom.xml b/assembly-multiuser/assembly-ide-war/pom.xml index bccbc5eff15..40bc6fe1299 100644 --- a/assembly-multiuser/assembly-ide-war/pom.xml +++ b/assembly-multiuser/assembly-ide-war/pom.xml @@ -32,7 +32,7 @@ assembly-ide-war war - + org.eclipse.che che-ide-gwt-app @@ -207,6 +207,7 @@ WEB-INF/rewrite.config WEB-INF/web.xml WEB-INF/classes/org/eclipse/che/*.class + WEB-INF/lib/ diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index 59bb78ace39..360bbb22de6 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -23,15 +23,13 @@ Che IDE :: War Packaging Packages Che IDE GWT application as a Java web app - ${project.build.directory}/generated-sources/gen UTF-8 + org.eclipse.che che-ide-gwt-app - war diff --git a/pom.xml b/pom.xml index cb8846132a9..0ee60f717df 100644 --- a/pom.xml +++ b/pom.xml @@ -1866,8 +1866,8 @@ -noprecompile -noincremental - + -bindAddress 0.0.0.0