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
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
f4cc97acce
Set next version 6.0.0-M1-SNAPSHOT
2017-10-19 13:53:40 +03:00
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
13f7ebe9c2
Add dependency on tools.jar automatically but only if JDK is < 1.9 as after 1.8 the tools.jar is not required
...
Change-Id: I1b19ed8f5a5f1ed5de5f2727f6baa020ad72bfcd
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-18 17:23:23 +02:00
b9300dba80
Use version from che-parent repository, we should not define version in project.
...
Change-Id: I3cf8dc6875c29b649328c92792214b2b447a1315
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-18 17:23:14 +02:00
7a84f130f6
FixUp ( #6801 )
2017-10-18 13:01:55 +00:00
90142e268c
Move Docker client to Docker infrastructure packaging ( #6779 )
...
Also, remove OpenShiftConnector as it is replaced with OpenShift
infrastructure.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-10-18 15:08:55 +03:00
d3278187fb
CHE-6545: Add condition for breakpoints ( #6763 ) ( #6786 )
2017-10-18 11:46:00 +00:00
eee2bb681f
Apply sort pom
...
Change-Id: I88aa8e8b34772357faf203eb9d1a1fdafc53226c
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-18 00:18:38 +02:00
7a3bb3f5b7
Apply fixes to update maven plugins
...
- errorprone : ignore test methods that are using testxyz() pattern but are not annotated by @Test
- Remove deprecated stuff (for example use descriptors/descriptor for maven-assembly plugin
- Remove unnecessary stubbing
- fix dependencies
Change-Id: I16f512fc3bfd542463d3b0d3c062f45ceb5ac6b2
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-17 21:44:00 +02:00
f34021b968
Remove svn plugin ( #6745 )
...
Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
2017-10-17 15:19:04 +03:00
e321ab00b1
Merge with master
2017-10-15 14:33:47 +03:00
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
abe3271908
RELEASE: Set next development version ( #6692 )
...
* RELEASE: Set next development version
2017-10-14 20:17:04 +03:00
03cb20ad64
Merge branch 'master' into che6
...
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-10-14 17:00:09 +03:00
fe6d621302
Clean up 'YamlExtensionManagerViewImpl'
...
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2017-10-13 15:25:40 +03:00
70ac13c008
Merge remote-tracking branch 'origin/master' into che6
2017-10-12 16:14:51 +03:00
c35d27e7eb
Removing deprecated FileTreeWatcher ( #6688 )
2017-10-12 15:21:55 +03:00
5041b59e6e
Merge branch 'master' into spi
2017-10-12 11:54:46 +03:00
1870d7dd83
Integrated yaml language server ( #6371 )
...
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-10-11 17:05:16 +02:00
22c21265aa
Merge branch 'master' into spi
2017-10-11 10:16:43 +03:00
4f09d1d00f
CHE-5340: Rework 'VcsChangeMarkerRenderFactory' initialization ( #6658 )
...
Add ability to implement VcsChangeMarkerRenderFactory from multiple places
2017-10-10 17:00:46 +03:00
e2439d78d9
Send events from server to client about project's changes ( #6628 )
2017-10-10 15:46:27 +03:00
f65836ac43
#6624 send subscribe message when ws agent started ( #6634 )
...
Signed-off-by: Yevhen Vydolob <evidolob@codenvy.com>
2017-10-10 09:22:52 +02:00
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
c147f8b31d
che #6500 - Removing optional 'che-ws-' prefix during tag creation
...
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-10-09 15:36:25 +02:00
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
fe005f3df5
Add git changes markers to the editor ( #6054 )
2017-10-09 10:02:41 +03:00
ba47c0b825
Port AppStatesPreferenceCleaner to spi branch ( #6611 )
...
* Port AppStatesPreferenceCleaner from master branch. Class has been missed as a result of previous merges.
* Move AppStatesPreferenceCleaner to che-core-api-workspace.
* Move WorkspaceRemovedEvent and WorkspaceCreatedEvent to che-core-api-workspace-shared;
Move AppStatesPreferenceCleaner to che-core-api-user
2017-10-07 09:56:03 +03:00
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
8d70ec4024
Fix php debugger test ( #6556 )
2017-10-06 10:38:22 +03:00
405f9d4142
Merge branch 'che-multiuser' into spi
2017-10-06 10:06:34 +03:00
b291cad564
Merge with master
2017-10-06 08:51:39 +03:00
4bc18519db
Merge branch 'che-multiuser' into spi
2017-10-05 16:30:22 +03:00
af0376de7f
Add support to VS Code style snippets in code completion ( #6339 )
...
Added support for code completion snippets.
Signed-off-by: Thomas Mäder <tmader@redhat.com>
2017-10-05 14:50:02 +02:00
47da5d3063
Rework tests for checking TestRunner plugin ( #6559 )
...
* change methods in the Page Object for TestRunner plugin for using added ids for node items
2017-10-05 14:14:37 +03:00
787f5ee74d
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-10-05 08:19:04 +03:00
25c16a63be
Add pagination to the full text search results ( #6522 )
2017-10-04 18:08:39 +03:00
8b50b4dda2
Fix JWT usage for ws and activity checker
...
Signed-off-by: Anna Shumilova <ashumilo@redhat.com>
2017-10-04 11:10:00 +03:00
a3f001723f
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-10-04 08:34:59 +03:00
0181b6572e
CHE-6024: Add selenium test ( #6550 )
2017-10-03 15:51:50 +03:00
8de6dbe5fb
Merge branch 'che-multiuser' into spi
2017-10-03 13:04:39 +03:00
05642192b5
CHE-6342: Rework git status feature ( #6536 )
2017-10-03 10:23:17 +03:00
57b2fc7058
CHE-6024: Add 'Git revert' action ( #6108 )
2017-10-03 09:21:33 +03:00
f1e09ced81
Fix activity checker fails
...
Signed-off-by: Anna Shumilova <ashumilo@redhat.com>
2017-10-02 15:26:38 +03:00
81bce959ce
Merge branch 'che-multiuser' into spi
2017-10-02 14:59:55 +03:00
1f639c0557
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-10-02 09:03:47 +03:00
34ba429d58
Implemented getVersion in OpenShiftConnector ( #6222 )
...
* Implemented getVersion in OpenShiftConnector
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-10-02 07:42:42 +02:00
b9767355b7
Merge with master
2017-09-30 13:57:06 +03:00
Florent BENOIT