seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,851 Commits
124 Branches
308 Tags
147 MiB
Commit Graph

866 Commits (287c98d9c4df17258c8fc86baa79b78a6d9ea202)

Author SHA1 Message Date
Oleksandr Garagatyi 0143ad3ec8 CHE-6124: Add servers to workspace templates instead of exposed ports 
Since exposed ports won't be published anymore they should be
represented as machine servers.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
 2017-10-26 12:10:36 +03:00
Anatoliy Bazko c1463d3be9 CHE-6843: Navigate to breakpoint (#6960) 
Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
 2017-10-25 13:53:53 +00:00
Vitaliy Guliy 8763110b2f CHE-6820 UI elements are hard to recognize (#6988) 
* CHE-6820 IDE UI elements are hard to recognize
 2017-10-25 16:49:07 +03:00
Sergey Skorik dbef283aca [CHE 6] Extend FindTextFeatureTest selenium test (#6936) 
* added test method for testing FindText results pagination
 2017-10-25 16:42:25 +03:00
Oleksandr Andriienko e9726221c5 Add debugger watch expressions. (#6950) 
Add debugger watch expressions. Use smart tree widget for debugger variables tree. Remove some unused code.

Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
 2017-10-25 12:38:01 +00:00
Mykola Morhun 3b04cdb585 Fix tree scrollbar (#6958) 2017-10-25 10:50:56 +03:00
Florent BENOIT 3f262e620e Cleanup some Mockito deprecated usage (che6) (#6864) 
* Cleanup some Mockito deprecated usage
org.mockito.Matchers —> org.mockito.ArgumentMatchers
org.mockito.runners.MockitoJUnitRunner —> org.mockito.junit.MockitoJUnitRunner

Change-Id: Icf7351cb58e0f42fa95885c2d2cf6b5e98206c35
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
 2017-10-21 09:07:43 +02:00
Roman Nikitenko bd10c31380 CHE-5497. Sync dirty state for split editors 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
 2017-10-20 14:36:49 +03:00
Florent BENOIT 6a95b6d74a Apply google format v1.4 https://github.com/google/google-java-format/releases/tag/google-java-format-1.4 
Change-Id: I5df30c23165df1fd39eef4c57893bebd1d681c1d
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
 2017-10-19 22:23:04 +02:00
Sergii Kabashniuk f4cc97acce Set next version 6.0.0-M1-SNAPSHOT 2017-10-19 13:53:40 +03:00
Yevhen Vydolob ed2433e415 Provide Action interface, use DOM Element for Action image (#6811) 
* #6788 Add Action interface and declare all needed methods from absctract class Action in BaseAction class

Signed-off-by: Yevhen Vydolob <evidolob@codenvy.com>
 2017-10-19 11:25:03 +02:00
Sergii Leshchenko bac6efc5e2 Added environment variables configuration to Machine model (#6802) 
* CHE-6702 Add env variables to machine config

* CHE-6702 Add setting of env variables into OpenShift machines

* CHE-6702 Add setting of env variables into Docker machines

* CHE-6702 Make env field known for stack validator
 2017-10-18 18:11:54 +03:00
Anatoliy Bazko d3278187fb CHE-6545: Add condition for breakpoints (#6763) (#6786) 2017-10-18 11:46:00 +00:00
Sergii Kabashniuk ba04245aff Merge Mockito 2017-10-15 15:24:12 +03:00
Sergii Kabashniuk e321ab00b1 Merge with master 2017-10-15 14:33:47 +03:00
Florent BENOIT 70e3834356 Move to mockito 2.10 
Some changes are required like
 - anyString() --> nullable(String.class) for many tests as in fact we provide null values
 - add class for VerificationMode as there are more than one method now (can't use lambdas)
 - remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
 - remove unecessary stubbing (mockito is now reporting un-needed stubs)

Change-Id: I69c7ccc86bc85a4401d5e33671229ae0ce560dbb
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
 2017-10-15 10:45:04 +02:00
Florent BENOIT 9581a9bbef Move to mockito 2.10 
Some changes are required like
 - anyString() --> nullable(String.class) for many tests as in fact we provide null values
 - add class for VerificationMode as there are more than one method now (can't use lambdas)
 - remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
 - remove unecessary stubbing (mockito is now reporting un-needed stubs)

Change-Id: I69c7ccc86bc85a4401d5e33671229ae0ce560dbb
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
 2017-10-15 10:34:15 +02:00
Roman Iuvshyn abe3271908 RELEASE: Set next development version (#6692) 
* RELEASE: Set next development version
 2017-10-14 20:17:04 +03:00
Oleksandr Garagatyi 03cb20ad64 Merge branch 'master' into che6 
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
 2017-10-14 17:00:09 +03:00
Vladyslav Zhukovskyi e0f14682bb Provide new presentation model for the tree node (#6728) 
* Provide new presentation model for the tree node

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Add missing HasNewPresentation interface

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
 2017-10-13 16:38:55 +03:00
Roman Nikitenko 8d54442f0e CHE-6687. Fix initialization change markers render 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
 2017-10-13 14:05:48 +03:00
Artem Zatsarynnyi 1450590a80 Clean-up WorkspaceServiceClient: (#6721) 
* remove useless for IDE method for creating a workspace;
* remove obsolete parameters related to snapshots.
 2017-10-13 13:48:47 +03:00
Vladyslav Zhukovskyi c7c14af757 Add utility class to serve request consumers 
Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
 2017-10-13 11:57:49 +03:00
Oleksii Orel d748cb5d4b CHE-6198 fix default commands update after UD project import 
Signed-off-by: Oleksii Orel <oorel@redhat.com>
 2017-10-11 12:35:03 +03:00
Aleksandr Shmaraiev cc77f4f424 Adapt selenium tests according to SPI branch (#6664) 
* Adapt existing selenium tests according to changes in the SPI branch in the next packages   
   * editor
   * intelligencecommand
   * preferences
   * editor.autocomplete
   * miscellaneous

* Adapt new selenium tests and one reworking test from 'git' package
   * GitChangeMarkersTest
   * GitColorsTest
   * KeepDirectoryGitImportTest

*  Add changes to page objects
   * FindUsages
   * MultiSplitPanel
   * Refactor
 2017-10-11 08:57:25 +00:00
Artem Zatsarynnyi 22c21265aa Merge branch 'master' into spi 2017-10-11 10:16:43 +03:00
Roman Nikitenko db340fdcd7 CHE-6182. Mark 'Link with editor' button when this one is activated 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
 2017-10-10 17:22:42 +03:00
Roman Nikitenko 528dec5458 CHE-6183. Do not set focus on project tree when 'Link with editor' feature is applied 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
 2017-10-10 17:21:18 +03:00
Roman Nikitenko 77f06fc59d Fix top line position at restoring editors 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
 2017-10-10 17:19:56 +03:00
Igor Vinokur 4f09d1d00f CHE-5340: Rework 'VcsChangeMarkerRenderFactory' initialization (#6658) 
Add ability to implement VcsChangeMarkerRenderFactory from multiple places
 2017-10-10 17:00:46 +03:00
Valeriy Svydenko e2439d78d9 Send events from server to client about project's changes (#6628) 2017-10-10 15:46:27 +03:00
Anatoliy Bazko f231fc1171 CHE-4536: Prevent removing breakpoint annotations (#6588) 2017-10-10 09:34:10 +03:00
Yevhen Vydolob 59abab922c Language Server Protocol Rename implementation (#6615) 
* #1806 add service and UI for rename feature
Signed-off-by: Yevhen Vydolob <evidolob@codenvy.com>
 2017-10-09 16:06:53 +02:00
Sergii Leshchenko 03934a0804 Merge remote-tracking branch 'origin/master' into spi 
# Conflicts:
#	assembly-multiuser/assembly-wsmaster-war/pom.xml
#	assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MachineAuthModule.java
#	assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MultiUserCheWsMasterModule.java
#	assembly-multiuser/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
#	assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/CheWsMasterModule.java
#	assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
#	dashboard/src/app/admin/user-management/user-details/user-details.html
#	dashboard/src/app/organizations/organization-details/organization-details.html
#	dashboard/src/app/teams/team-details/team-details.html
#	dashboard/src/components/api/workspace/che-workspace.factory.ts
#	dockerfiles/init/manifests/che.env
#	dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh
#	dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_postgres_is_available.sh
#	ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/jsonrpc/WorkspaceMasterJsonRpcInitializer.java
#	ide/che-core-ide-stacks/src/main/resources/stacks.json
#	ide/che-core-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java
#	multiuser/api/che-multiuser-api-resource/pom.xml
#	multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java
#	multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTracker.java
#	multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManager.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/TestObjects.java
#	multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
#	multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java
#	multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/TestObjectsFactory.java
#	multiuser/integration-tests/che-multiuser-cascade-removal/src/test/resources/META-INF/persistence.xml
#	multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
#	multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java
#	multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/resources/META-INF/persistence.xml
#	multiuser/keycloak/che-multiuser-keycloak-ide/src/main/java/org/eclipse/che/multiuser/keycloak/ide/KeycloakProvider.java
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineAsyncRequestFactory.java
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineTokenServiceClientImpl.java
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/inject/MachineAuthGinModule.java
#	multiuser/machine-auth/che-multiuser-machine-authentication/src/main/java/org/eclipse/che/multiuser/machine/authentication/server/MachineSessionInvalidator.java
#	multiuser/permission/che-multiuser-permission-machine/pom.xml
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilter.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDao.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDao.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserMachineJpaModule.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/listener/RemoveRecipeOnLastUserRemovedEventSubscriber.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProvider.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipePermissionsImpl.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDaoTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaTestModule.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDaoTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/RemovePermissionsBeforeRecipeRemovedEventSubscriberTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/TestWorkspaceEntity.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProviderTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/spi/tck/RecipePermissionsDaoTest.java
#	multiuser/permission/che-multiuser-permission-workspace/pom.xml
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/MultiuserWorkspaceJpaModule.java
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/WorkspaceTckModule.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/JpaTckModule.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/RemovePermissionsBeforeStackRemovedEventSubscriberTest.java
#	multiuser/pom.xml
#	plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java
#	plugins/plugin-docker/pom.xml
#	plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
#	pom.xml
#	selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/workspace/TestWorkspaceProviderImpl.java
#	selenium/che-selenium-test/README.md
#	selenium/che-selenium-test/pom.xml
#	selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CodenvyEditor.java
#	selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/CreateWorkspaceOnDashboardTest.java
#	selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithNodeWsTest.java
#	selenium/che-selenium-test/src/test/resources/conf/selenium.properties
#	wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java
#	wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java
#	wsmaster/che-core-api-user/pom.xml
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/environment/server/MachineLinksInjector.java
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceServiceLinksInjector.java
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
#	wsmaster/integration-tests/postgresql-tck/pom.xml
 2017-10-09 14:51:25 +03:00
Igor Vinokur fe005f3df5 Add git changes markers to the editor (#6054) 2017-10-09 10:02:41 +03:00
Álvaro Manuel Recio Pérez c364856584 Remove the che-specifc variants of the Bitnami development container images (#5888) 
Signed-off-by: Alvaro Manuel Recio Perez <amrecio@gmail.com>
 2017-10-09 09:16:37 +03:00
Sergii Kabashniuk ee01b2998f Multi-user Eclipse Che (#6441) 
Multi-user Eclipse Che (#6441)
#### How to run it.
```docker run -it -e CHE_MULTIUSER=true -e CHE_HOST=<your ip> -e CHE_KEYCLOAK_AUTH-SERVER-URL=http://<your ip>:5050/auth -v /var/run/docker.sock:/var/run/docker.sock -v ~/.che-multiuser:/data eclipse/che:nightly start --skip:pull --skip:nightly```
#### How to manage it
 - Keycloak configured with two realms. ```Master``` and ```che```. Also we have one user admin/admin in both realm. Admin user in master realm is  - super admin. 
-  Eclipse Che configured for che realm
- We enabled user registration in ```Che``` realm
#### Known limitation
 - swagger would not work. We need to upgrade a version. to support openid authentification https://github.com/eclipse/che/issues/6015
- It's working on local docker. We are going to provide scalable version based on OpenShift on next versions.
- Invitation of non-existent users to Eclipse Che organization https://github.com/eclipse/che/issues/6335
#### How to run it when it is in a branch


To run an multiuser Che version, the following steps are required after building the branch:
 - Rebuild init, cli and che images (in the given sequence). To do that, proceed to folder _dockerfiles/<image_name>_ and run _build.sh_
 - Run Che in a  usual way using cli, with additional parameters:  `-e CHE_MULTIUSER=true` and `--skip:pull --skip:nightly`  
   Full command example:
   `docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -v /home/user/.che:/data -e CHE_MULTIUSER=true eclipse/che-cli:nightly start --skip:pull --skip:nightly`
 - MacOS users may need to edit _che.env_ file in the data folder, changing `CHE_HOST` and `CHE_KEYCLOAK_AUTH__SERVER__URL` values to their specific IP.
 
When start is succeeded, the following docker containers should be created:  
 - che, exposing 8080 port;
 - che_keycloak, exposing 5050 port;  
 - che_postgres, exposing 5432 port;
 2017-10-06 17:27:27 +03:00
Vladyslav Zhukovskyi 622f5fa8fd Replace abstract method with default implementation (#6593) 
* Replace abstract method with default implementation

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Replace abstract method with default implementation

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Fix formatting issue

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
 2017-10-06 11:25:42 +03:00
Artem Zatsarynnyi 405f9d4142 Merge branch 'che-multiuser' into spi 2017-10-06 10:06:34 +03:00
Sergii Kabashniuk b291cad564 Merge with master 2017-10-06 08:51:39 +03:00
jpinkney 1f892761f4 Added more quickstarts 
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
 2017-10-05 19:48:29 -07:00
Artem Zatsarynnyi 4bc18519db Merge branch 'che-multiuser' into spi 2017-10-05 16:30:22 +03:00
Anton Korneta 6a41ac85d9 Fix the addition of keycloak tokens into agents URLs 2017-10-05 16:02:43 +03:00
Sergii Kabashniuk 787f5ee74d Merge remote-tracking branch 'origin/master' into che-multiuser 2017-10-05 08:19:04 +03:00
Vitalii Parfonov a7aa135174 Various fix for selenium tests (#6574) 
1. Improve xpath for checking node in project tree.
2. Replace harcoded timeots with const
3. Fix typo CheckOpendDialogThroughFindActionTest ->  CheckOpenedDialogThroughFindActionTest
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
 2017-10-04 18:24:20 +03:00
Valeriy Svydenko 25c16a63be Add pagination to the full text search results (#6522) 2017-10-04 18:08:39 +03:00
Roman Iuvshyn 0d8d93377f merge with master 2017-10-04 15:16:15 +03:00
Roman Nikitenko 6f5277d7bc CHE-4952. Fix problems related to simultaneous opening files 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
 2017-10-04 10:48:41 +03:00
Valeriy Svydenko 3334413d5f Set default value of the command's goal if it doesn't exist (#6551) 2017-10-04 10:17:56 +03:00
Roman Nikitenko dd1c87e798 CHE-4167. Fix cursor position in editor after refresh IDE 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
 2017-10-04 10:11:31 +03:00