Commit Graph

67 Commits (af3bcd3874544a80e14d3d4331cf8d6efb4e0117)

Author SHA1 Message Date
Vitaliy Guliy 9f67748457 CHE-396 Rename perspective and Workspace agent
Signed-off-by: Vitaliy Guliy <vguliy@codenvy.com>
2016-03-14 14:11:14 +02:00
Alexander Garagatyi 1cc53f05e4 CHE-457: add servers conf and env vars to model of machine config.
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2016-03-11 13:11:17 +02:00
Eugene Ivantsov 9630a58caf Merge pull request #676 from eclipse/remove_unused_properties
Remove unused properties. Rename project_template.location.dir
2016-03-10 15:31:28 +02:00
Vitalii Parfonov ff84e068da Merge pull request #666 from eclipse/fixNpeEventOrigin
Avoid NPE if event don't has EventOrigin annotation
2016-03-10 14:56:01 +02:00
Eugene Ivantsov bc3c6642a9 Remove unused properties. Rename project_template.location.dir
Signed-off-by: Eugene Ivantsov <eivantsov@codenvy.com>
2016-03-10 12:47:28 +02:00
Roman Iuvshin 725c149608 [maven-release-plugin] prepare for next development iteration 2016-03-09 19:31:24 +00:00
Roman Iuvshin f491a9692b [maven-release-plugin] prepare release 4.0.0-RC13 2016-03-09 19:31:22 +00:00
Vitalii Parfonov 7f12dfe3c4 Avoid NPE if event don't has EventOrigin annotation
Signed-off-by: Vitalii Parfonov <vparfonov@codenvy.com>
2016-03-09 20:53:12 +02:00
Mykola Morhun bf1f449f9f Merge pull request #635 from eclipse/CHE-367
CHE-367: Return websocket URL of extension server when a workspace is launched
2016-03-07 12:29:26 +02:00
Roman Iuvshin 485da69940 [maven-release-plugin] prepare for next development iteration 2016-03-06 17:22:54 +00:00
Roman Iuvshin 15571e4039 [maven-release-plugin] prepare release 4.0.0-RC12 2016-03-06 17:22:50 +00:00
Mykola Morhun 13bdb085d7 CHE-367: Return websocket URL of extension server when a workspace is launched
Signed-off-by: Mykola Morhun <mmorhun@codenvy.com>
2016-03-04 15:17:50 +02:00
Max Shaposhnik b09d373f34 Merge branch 'master' into CODENVY-174 2016-03-04 10:47:26 +02:00
Roman Iuvshin 17c07f31b7 [maven-release-plugin] prepare for next development iteration 2016-03-03 20:06:01 +00:00
Roman Iuvshin 31194172ac [maven-release-plugin] prepare release 4.0.0-RC11 2016-03-03 20:05:58 +00:00
Max Shaposhnik cab7daea6e CODENVY-174 pre-select correct branch when start point is set
Signed-off-by: Max Shaposhnik <mshaposhnik@codenvy.com>
2016-03-03 18:00:45 +02:00
Roman Iuvshin 7cf7c09cc2 [maven-release-plugin] prepare for next development iteration 2016-03-02 20:25:05 +00:00
Roman Iuvshin 1981202585 [maven-release-plugin] prepare release 4.0.0-RC10 2016-03-02 20:25:02 +00:00
Igor Vinokur 2dd77ecf21 CHE-414: Display staged changes in green when status called 2016-03-02 14:54:04 +02:00
Roman Iuvshin bbeeb21bfe [maven-release-plugin] prepare for next development iteration 2016-03-01 19:42:14 +00:00
Roman Iuvshin 8ca2ca16bf [maven-release-plugin] prepare release 4.0.0-RC9 2016-03-01 19:42:11 +00:00
Aleksandr Andrienko 0f712f232f Merge pull request #557 from eclipse/fixStackTypeAdaptersProvider
Fix use of the wrong gson adapter
2016-03-01 19:02:19 +02:00
Aleksandr Andrienko fa9b539eba Fix use of the wrong gson adapter
Signed-off-by: Aleksandr Andrienko <aandrienko@codenvy.com>
2016-03-01 19:00:00 +02:00
Vladyslav Zhukovskii eed529369d Fetch module config directly from item reference
Get children operation (on the server side, project service) is returning item reference with project configuration for the module if such exists. Client based on this information may faster construct module node instead of making additional request for the configuration.

Note: temporary solution will be alive before new changes will be merged (related to new project type with server side vfs refactorings)

Related issue: CHE-660

Squashed commit of the following:

commit e86d058795c7bd1cb30221b6e79b376d662ad191
Merge: 32caa18 7b6bb02
Author: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>
Date:   Tue Mar 1 17:42:55 2016 +0200

    Merge branch 'master' into CHE-660

commit 32caa185e3cd18cbe71fa644a733abaaacc9562a
Author: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>
Date:   Tue Mar 1 17:37:36 2016 +0200

    Fetch module config directly from item reference

commit 04513ae3c58624028405e3b62edfacf7e13807ef
Author: Dmitry Shnurenko <dshnurenko@codenvy.com>
Date:   Tue Mar 1 17:06:12 2016 +0200

    CHE-660: Add java doc

commit 20e99f884e434b726cd2066b4f3663b86c77e455
Author: Dmitry Shnurenko <dshnurenko@codenvy.com>
Date:   Tue Mar 1 16:57:56 2016 +0200

    CHE-660: Improve server side code to less time of getting project

Signed-off-by: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>
2016-03-01 17:47:08 +02:00
Alexander Garagatyi 5dad4fe7b5 Merge pull request #518 from eclipse/CHE-22
CHE-22: check environment parameter on workspace start
2016-02-29 11:41:46 +02:00
Igor Vinokur 0af0f966ed CHE-521: Perform git init command without initial commit 2016-02-29 11:02:55 +02:00
Alexander Garagatyi 29865528df CHE-22: check environment parameter on workspace start
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2016-02-29 10:28:21 +02:00
Roman Iuvshin 3190022814 [maven-release-plugin] prepare for next development iteration 2016-02-28 19:34:00 +00:00
Roman Iuvshin d8964d886b [maven-release-plugin] prepare release 4.0.0-RC8 2016-02-28 19:33:57 +00:00
Alexander Garagatyi 0239b5aba0 CHE-81: fix ws agent pinging
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2016-02-27 00:10:05 +02:00
Sergii Kabashniuk 6c5e80118f Merge pull request #489 from stour/CODENVY-106
adding setAuthorizationHeader method
2016-02-26 22:45:07 +02:00
Vitaly Parfonov f8c94e6b27 Improve handling of ws agent started event
Add checking on ready state for websocket connection.
Make it possible rout org.eclipse.che.api.core.rest.ApiInfoService on wsAgent form MachineExtensionProxyServlet.
Renamee package in assembly-machine-war to more accurate for it

Signed-off-by: Vitaly Parfonov <vparfonov@codenvy.com>
2016-02-26 17:15:06 +02:00
Dmitry Shnurenko 1c45ad6e2f CHE-559: Fix output of creating new machine in existed workspace 2016-02-26 12:28:36 +02:00
Dmitry Shnurenko 2ccad0e7a5 CHE-12: Fix NPE when there is no tags 2016-02-26 09:10:47 +02:00
Roman Iuvshin 51c785523a [maven-release-plugin] prepare for next development iteration 2016-02-25 20:37:09 +00:00
Roman Iuvshin a3030e1c4d [maven-release-plugin] prepare release 4.0.0-RC7 2016-02-25 20:37:06 +00:00
Yevhenii Voevodin dc3395f9a2 Add generic String to the ArrayList creation 2016-02-25 19:15:27 +02:00
Stéphane Tournié 7a1df9b677 adding setAuthorizationHeader method
Signed-off-by: Stéphane Tournié <stephane.tournie@serli.com>
2016-02-25 17:57:51 +01:00
Sergii Leschenko cacfd19fe9 Merge pull request #510 from sleshchenko/eventService
Fix generic type for subscribe method of EventService
2016-02-25 15:46:13 +02:00
Yevhenii Voevodin 8ea9fcc169 Use list instead of null, when setting project attribute values 2016-02-25 15:32:11 +02:00
Sergii Leschenko a324943b0b Fix generic type for subscribe method of EventService
Events of type <T> can be accepted by EventSubscribers that can accept T and its super classes (not T and its child classes)
These changes are needed to avoid throwing of ClassCastException.

Signed-off-by: Sergii Leschenko <sleschenko@codenvy.com>
2016-02-25 15:08:28 +02:00
Yevhenii Voevodin 8b92440cc6 Exclude projects without location from the workspace 2016-02-25 14:42:31 +02:00
Anton Korneta 7b4cc2ece5 Fix finding of git remote branches
Signed-off-by: Anton Korneta <akorneta@codenvy.com>
2016-02-25 13:04:29 +02:00
Anton Korneta fb7d5591d6 CODENVY-31: Replaced messages from git importer on error codes
Also added git checkout event which goes through by websocket connection

Signed-off-by: Anton Korneta <akorneta@codenvy.com>
2016-02-24 09:35:36 +02:00
Valeriy Svydenko 7a2df06164 CHE-165: show move wizard after performing 'Cut' operation in project explorer for the java items 2016-02-22 15:13:19 +02:00
Max Shaposhnik 9465a574d9 Show auth window when performing import project from private repo or use factory with private repo
Signed-off-by: Max Shaposhnik <mshaposhnik@codenvy.com>
2016-02-22 11:52:45 +02:00
Alexander Garagatyi fbba82fe9c Merge pull request #350 from eclipse/IDEX-4222
IDEX-4222: Change model of machine & workspace
2016-02-20 16:44:41 +02:00
Roman Iuvshin 63b08fab17 [maven-release-plugin] prepare for next development iteration 2016-02-20 14:03:35 +00:00
Roman Iuvshin aaf82c04f8 [maven-release-plugin] prepare release 4.0.0-RC6 2016-02-20 14:03:33 +00:00
Alexander Garagatyi b3b38f890a IDEX-4222: Change model of machine & workspace
Machine model changes:
- MachineState was removed, Machine should be used instead
- Machine states API was removed
- Machine includes MachineConfig as field instead of extending it
- All runtime information of machine is in runtime field of Machine.
- Now API call GET */api/machine?workspace=ws-id123456* returns all existing machines of workspace,
including machines with status CREATING, DESTROYING
- Machine channels was removed from. To get channels clients should check links of WorkspaceConfigDto.

Workspace model changes:
- EnvironmentState was removed
- UsersWorkspace includes WorkspaceConfig as field instead of extending it
- Start tmp workspace API returns RuntimeWorkspace instead of UsersWorkspace
- Machine channels are included in links of MachineConfigDto of WorkspaceConfig. Don't try to find them
in runtime machines of RuntimeWorkspaceDto.
- Field activeEnvName in RuntimeWorkspace was renamed to envName in accordance with defaultEnv field
of WorkspaceConfig.

Also:
- add static method cloneDto to DtoFactory
- add getParameter(paramName) method to DTO Link to simplify parameter retrieval

Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2016-02-20 15:16:21 +02:00