Commit Graph

1332 Commits

Author SHA1 Message Date
Gaurav
0854d023fb Fixed the code for the create ds for deployment view and fixed the issue
for delete metadata(getting optimistic lock exception)
2016-08-02 18:32:44 +02:00
Gaurav
1bf91372ae Added the javadoc. 2016-08-01 17:51:34 +02:00
Gaurav
fa3b5d69e9 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-01 17:25:19 +02:00
Michael Hirsch
30a88cc8f6 Merge pull request #259 from bsinno/feature_beautify_error_notifications
Beautify error notifications
2016-08-01 17:21:10 +02:00
Michael Hirsch
ecc70882a6 Merge pull request #260 from bsinno/feature_allow_to_use_other_exception_handler
Allow to set error handler or take default one
2016-08-01 16:45:21 +02:00
Gaurav
1d72257b9f Merge branch 'feature_enable_push_in_deployment_view' of
https://github.com/bsinno/hawkbit/ into
feature_enable_push_in_deployment_view

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
2016-08-01 16:11:11 +02:00
Gaurav
d0f372765f Merge branch 'feature_enable_push_in_deployment_view' of
https://github.com/bsinno/hawkbit/ into
feature_enable_push_in_deployment_view

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java
2016-08-01 16:06:41 +02:00
Melanie Retter
b8bc46d299 Add JavaDoc
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-01 15:34:00 +02:00
Michael Hirsch
9c442967f8 add tests for repository entity events
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-01 15:14:40 +02:00
Gaurav
60cc2c333c Refactored the code for displaying distributions in the deployment view. 2016-08-01 15:12:03 +02:00
Melanie Retter
c0a3a44277 Delete displayError in UiNotification
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-01 13:40:40 +02:00
Michael Hirsch
4e237f748b refactor the EventAwareEntity interface
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-01 13:01:25 +02:00
Jonathan Philip Knoblauch
4462d0aad9 Refactoring for configuration
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 11:15:52 +02:00
Jonathan Philip Knoblauch
de375fe183 Updated javadoc
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 10:51:36 +02:00
Jonathan Philip Knoblauch
1a1d3746df Moved errorHandler to to autoconfig
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 10:47:36 +02:00
Jonathan Philip Knoblauch
87dc8b8964 Set the errorHandler as parameter in method
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 10:38:28 +02:00
Michael Hirsch
72899df4a4 remove notification of distribution set deletion from management layer
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-01 10:30:45 +02:00
Michael Hirsch
5be513422d remove notification of target deletion from management layer
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-01 10:24:09 +02:00
Melanie Retter
26c376e22e Refactor HawkbitNotificationMessage
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-01 10:13:45 +02:00
Melanie Retter
27019b9e4c Beautify error notification.
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-29 16:23:43 +02:00
Jonathan Philip Knoblauch
e7e77cbb86 Extended method signature to allow to set a error handler and created the default one as bean
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-07-29 13:50:30 +02:00
Gaurav
dfd449592c Fix for EOL from widows EOL to unix EOL 2016-07-29 13:22:38 +02:00
Gaurav
9c468c76f0 Fix for EOL. 2016-07-29 13:12:51 +02:00
Gaurav
ea83b75e76 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-29 12:35:22 +02:00
Gaurav
e32d6b1b3e Modified EOL from windows to unix. 2016-07-29 12:33:10 +02:00
Michael Hirsch
2b79cafb9e Merge pull request #258 from bsinno/feature_add_entity_interceptor
Add entity lifercycle interceptor interface and add a entity listener.
2016-07-28 15:47:32 +02:00
SirWayne
53136d48fd Refactor some clean code staff
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-07-28 15:22:52 +02:00
SirWayne
2c70e7db1f Refactor some clean code staff
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-07-28 15:11:22 +02:00
SirWayne
c4b10982c5 Fix clean code
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-07-28 15:04:31 +02:00
SirWayne
a74ec2897c revert tenantaware
remove useless findAlltargets
fix typo

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-07-28 14:57:56 +02:00
SirWayne
faac47d6e4 Remove useless findAllTargets
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-07-28 14:56:33 +02:00
SirWayne
37eea0e16a Add test cases
refacor after pr review

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-07-28 14:51:50 +02:00
Gaurav
f2853e6d9f Resolved the conflicts 2016-07-28 14:24:49 +02:00
Gaurav
dd79829b6b Merge branch 'master' into feature_enable_push_in_deployment_view
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
2016-07-28 14:19:31 +02:00
Gaurav
bf28a8dde8 Fixed the issue for metadata not getting updated and also the refresh of
page not displaying the distribution details in deployment and
distribution view.

Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-07-28 14:07:19 +02:00
SirWayne
7fa89d7d3c Add entity lifercycle interceptor interface and add a entity listener.
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-07-28 12:39:12 +02:00
Michael Hirsch
34d98decc9 Merge pull request #257 from bsinno/feature_sonar_pom_hygiene
sonar pom hygiene
2016-07-28 11:25:22 +02:00
Michael Hirsch
271ee88d12 remove unnecessary property declaration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-28 10:38:29 +02:00
Michael Hirsch
1224221e8c sonar pom hygiene
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-28 10:09:51 +02:00
Michael Hirsch
069818fec6 Merge pull request #244 from bsinno/feature_multiunassignment_soft_mod
Feature multiunassignment soft mod
2016-07-28 09:35:37 +02:00
GAH6KOR
5bc4b04039 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-26 10:16:44 +02:00
Gaurav
b919dd7146 Fix for the selenium testcase failure 2016-07-25 15:52:27 +02:00
Gaurav
f4566d72ac Merge branch 'feature_multiunassignment_soft_mod' of https://github.com/bsinno/hawkbit/ into feature_multiunassignment_soft_mod 2016-07-25 14:44:44 +02:00
Gaurav
b97f787a8a Formatted the code 2016-07-25 14:39:51 +02:00
Gaurav
e2d435b68c Merge branch 'master' into feature_multiunassignment_soft_mod
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
2016-07-25 14:05:18 +02:00
Kai Zimmermann
a978662812 Merge pull request #226 from bsinno/feature_ui_metadata
Management UI DS and SM metadata mgmt
2016-07-25 12:03:57 +02:00
Michael Hirsch
3e4f76cca6 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-22 15:16:38 +02:00
Michael Hirsch
2d58cfcc59 Merge branch 'master' into feature_ui_metadata 2016-07-22 15:14:37 +02:00
Kai Zimmermann
0380fdf8ba Merge pull request #255 from bsinno/fix_upgrade_collections
Upgrade Apache Collections to 4.1 due to known vulnerability.
2016-07-21 12:52:35 +02:00
GAH6KOR
02e96fa079 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-21 12:41:56 +02:00