Commit Graph

677 Commits

Author SHA1 Message Date
Kai Zimmermann
d30eef7e6d Sonar false positive added for hidden exception.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 12:18:29 +02:00
Kai Zimmermann
882c689a51 Migrated sonar false positives from qube into code.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 12:13:26 +02:00
Michael Hirsch
26b581e904 Merge pull request #159 from bsinno/fix_assigned_installed_ds_tooltip_gliches
Fix assigned installed ds tooltip gliches
2016-04-29 15:32:03 +02:00
Michael Hirsch
a946f51da4 fix installed and assigned distribution set setting on the proxy target
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-29 12:57:25 +02:00
Michael Hirsch
59bec04c58 add null check for distribution set
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-29 12:52:27 +02:00
venu1278
8e2ea76c8c fix_assigned_installed_ds_tooltip_gliches
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-29 16:10:10 +05:30
Kai Zimmermann
b112643591 Merge pull request #158 from bsinno/use_vaadin_version_placeholder_for_bom
use vaadin-version placeholder in case of hard-coded vaadin version
2016-04-29 10:48:05 +02:00
Kai Zimmermann
7982727347 Merge pull request #157 from bsinno/fix_tenant_unknown_exception_for_rollout_scheduler
remove current tenant null check
2016-04-29 10:20:14 +02:00
Michael Hirsch
3c548c9121 use vaadin-version placeholder in case of hard-coded vaadin version
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-29 10:18:45 +02:00
Kai Zimmermann
c1b9fb48e8 No need to get EM if no tenant has to be set.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-29 08:44:29 +02:00
Michael Hirsch
607c98b819 remove current tenant null check cause not all queries have current
tenant and must set it for tenant indenpendent queries like
SystemManagement

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-29 07:21:43 +02:00
Michael Hirsch
ae5c083733 Merge pull request #151 from bsinno/Displaying-DistributionSet-Details-Tooltip
Displaying DistributionSet Details in Tooltip
2016-04-28 17:11:37 +02:00
Michael Hirsch
e899a3553f Merge pull request #156 from bsinno/Bug/Show_User_Information
Fix: Return trimmed username
2016-04-28 16:47:17 +02:00
SirWayne
345e9a7cf3 Rename method
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-28 16:24:13 +02:00
Michael Hirsch
f203e31d00 use constants for html tags used often
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 16:20:13 +02:00
SirWayne
8dcfc8412d Fix: Return trimmed username
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-28 16:05:37 +02:00
Michael Hirsch
97eb406fa6 Merge pull request #145 from bsinno/performance_rollout_target_group_creation
make use of the existencechecking annotation for targetrolloutgroup
2016-04-28 14:45:36 +02:00
Michael Hirsch
edab76dc5b Merge pull request #144 from bsinno/fix_rolloutmanagement_transaction_handling_deadlock
change transaction handling of creating groups and check running Rollouts
2016-04-28 12:30:52 +02:00
Michael Hirsch
1e6914ed25 Merge pull request #147 from bsinno/Add_TTL_to_Deadeletter_Queue
Add ttl to deadeletter queue
2016-04-28 11:53:03 +02:00
venu1278
d8d026e9a1 Displaying DistributionSet Details in Tooltip
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-28 15:17:01 +05:30
Michael Hirsch
4e48c7c9d7 code cleanup pull-request feedback
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 11:46:01 +02:00
Michael Hirsch
30788904be code cleanup pull-request feedback
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 11:45:06 +02:00
Michael Hirsch
f62b740ae8 change propagation level to SUPPORTS instead of NOT_SUPPORTED
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 11:43:46 +02:00
Michael Hirsch
9db2a1bf1b Merge branch 'master' into fix_rolloutmanagement_transaction_handling_deadlock 2016-04-28 11:27:49 +02:00
venu1278
63d6448432 Displaying DistributionSet Details in Tooltip
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-28 11:55:48 +05:30
venu1278
ad2e9a60f6 Merge branch 'master' into MECS-794-Display-DS-Details-Tooltip 2016-04-28 11:48:16 +05:30
Michael Hirsch
85d071c1b8 Merge pull request #155 from bsinno/feature_allow_devicesimulator_startup_generation_to_be_disabled
introduce a conditional property to disable startup generation devices
2016-04-27 18:32:10 +02:00
Michael Hirsch
e333877242 Merge pull request #154 from bsinno/feature-upgrade-vaadin-maria
Upgrade Vaadin and MariaDB to newest stable version.
2016-04-27 17:44:02 +02:00
Kai Zimmermann
610774b64f Merge pull request #152 from bsinno/Focus-On-TextArea-AddNewWindow
Focus-TextArea-On-AddNewWindow
2016-04-27 17:29:42 +02:00
Michael Hirsch
e5880561a1 re-name property aligning the autostart property
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-27 16:59:39 +02:00
Michael Hirsch
b53a635c1f introduce a conditional property which allows to disable the startup
generation of default simulator devices.

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-27 16:50:33 +02:00
SirWayne
9dd51e7105 Use java 8 duration to calculate ttl
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-27 15:37:54 +02:00
venu1278
d83b0751ca Merge branch 'master' into MECS-794-Display-DS-Details-Tooltip
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
2016-04-27 18:51:26 +05:30
Michael Hirsch
5703abf680 Merge pull request #132 from bsinno/eclipselink-tenancy
Eclipselink tenancy
2016-04-27 12:27:49 +02:00
Kai Zimmermann
5c86d2ad68 Upgrade Vaadin and MariaDB to newest stable version.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-26 17:36:19 +02:00
venu1278
0b275655c0 Focus-TextArea-On-AddNewWindow
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-26 18:47:47 +05:30
venu1278
23d15bf646 Displaying DistributionSet Details in Tooltip
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-26 16:13:06 +05:30
Kai Zimmermann
f2ea834d94 Merge pull request #148 from bsinno/Anonymous_download_checkBox_using_wrong_item
Small fix since checkbox was using wrong item for enabling
2016-04-26 11:53:43 +02:00
Kai Zimmermann
6e85c724bf Removed the method exception from transaction manager as they where not
needed anymore. The bean in systemmanagement should also not open a
transaction.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-25 14:09:38 +02:00
Michael Hirsch
13f2c36409 Merge pull request #146 from bsinno/Bug/Show_User_Information
Bug/show user information
2016-04-22 13:52:02 +02:00
SirWayne
51a00c4165 Merge branch 'Bug/Show_User_Information' of https://github.com/bsinno/hawkbit into Bug/Show_User_Information 2016-04-21 17:58:32 +02:00
SirWayne
9e6a26d482 Merge branch 'master' into Bug/Show_User_Information
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 17:55:07 +02:00
SirWayne
ef46062df3 Merge branch 'eclipse/master' of local repository 2016-04-21 17:46:37 +02:00
SirWayne
f7b30a59ba Signed-off-by: SirWayne <dennis.melzer@bosch-si.com> 2016-04-21 16:58:08 +02:00
SirWayne
ffd3373b34 Signed-off-by: SirWayne <dennis.melzer@bosch-si.com> 2016-04-21 11:53:54 +02:00
Michael Hirsch
d120d7b7f0 Merge pull request #149 from bsinno/fix_rollout_renderer
fix rollout renderer, using wrong itemd ID property naming
2016-04-21 08:47:19 +02:00
Michael Hirsch
d561ad99de fix rollout renderer, using wrong itemd ID property naming
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-21 08:06:10 +02:00
Jonathan Philip Knoblauch
1220b490f8 Small fix since checkbox was using wrong item for enabling
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-20 16:15:03 +02:00
Michael Hirsch
b1291679b2 Merge pull request #142 from bsinno/Rollout_Management_issues_refactor
Rollout management issues refactor
2016-04-20 14:13:51 +02:00
Dennis Melzer
5027b36c59 Update SPDateTimeUtil.java 2016-04-20 12:49:50 +02:00