Commit Graph

79 Commits

Author SHA1 Message Date
Gaurav
d7539de64d Merge branch 'master' into feature_enable_push_in_deployment_view
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/eventbus/event/TargetDeletedEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java
	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
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-10 11:44:23 +02:00
Gaurav
8fa2a60a71 Formatted the code.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:30:16 +02:00
Gaurav
1afd98e157 Merge branch 'feature_enable_push_in_deployment_view' of https://github.com/bsinno/hawkbit/ into feature_enable_push_in_deployment_view 2016-08-08 13:25:13 +02:00
Gaurav
e42f8164a8 Incorporated the review comments.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:24:12 +02:00
Michael Hirsch
b3702672a3 add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-08 09:14:48 +02:00
SirWayne
c71cf4852a fix sonar issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 14:58:17 +02:00
Dominic Schabel
222f06d9bb JavaDoc comments added and method visibility raised to public
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-05 14:12:27 +02:00
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
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
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
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
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
Gaurav
dfd449592c Fix for EOL from widows EOL to unix EOL 2016-07-29 13:22:38 +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
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
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
GAH6KOR
5bc4b04039 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-26 10:16:44 +02:00
Michael Hirsch
2d58cfcc59 Merge branch 'master' into feature_ui_metadata 2016-07-22 15:14:37 +02:00
GAH6KOR
02e96fa079 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-21 12:41:56 +02:00
GAH6KOR
5f1db53def Removed the extra level of abstraction and modified the code
accordingly.
2016-07-21 12:39:54 +02:00
Michael Hirsch
b04755eda8 remove caching from jpa_system_management
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-20 18:05:21 +02:00
GAH6KOR
7afb2f996f Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-20 12:31:28 +02:00
Michael Hirsch
03fecba57d Merge branch 'master' into feature_ui_metadata 2016-07-19 19:12:31 +02:00
Michael Hirsch
fe0a719ede remove cacheable on initial tenant creation
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-19 18:01:06 +02:00
gah6kor
85e22da7a2 Merge branch 'master' into feature_ui_metadata
Conflicts:
	hawkbit-ui/src/main/resources/messages.properties
2016-07-19 16:38:52 +02:00
gah6kor
8e98b5a8e2 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-19 16:12:01 +02:00
gah6kor
01d2cc8422 Merge branch 'master' into feature_enable_push_in_deployment_view
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
2016-07-19 16:09:47 +02:00
Michael Hirsch
cc986fe6f0 fix invalidating correct caches when update tenant metadata
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-19 13:35:47 +02:00
gah6kor
ffb29206fd Merge branch 'master' into feature_ui_metadata 2016-07-19 12:43:36 +02:00
Michael Hirsch
e54ec22a83 remove the current tenant cache evict when delete tenant
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 13:37:33 +02:00
Michael Hirsch
d2cd13996a fix initial creation of tenant when no current tenant and caching fix
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 12:48:50 +02:00
gah6kor
bdf28f75bf Merge branch 'master' into feature_ui_metadata 2016-07-15 14:42:37 +02:00
gah6kor
db753b5c3d Merge branch 'master' into feature_ui_metadata
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/resources/messages_en.properties
	
Resolved the conflicts.
2016-07-15 14:40:55 +02:00
Kai Zimmermann
015f88a54f Merge pull request #238 from bsinno/feature_traffic_tenant_stats
Traffic data in DownloadProgress event
2016-07-15 11:01:08 +02:00
kaizimmerm
9a4903526a Removed percentage from the event. Moved event into the repo API.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-08 13:00:47 +02:00
kaizimmerm
8fb2bd4322 Fixed download progress event.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-07 14:46:29 +02:00
Kai Zimmermann
e65b65b4e2 Merge pull request #233 from bsinno/fix_Introduce_consitent_button_icon_for_update_create_dialogs_refactor
Save button only enabled if form is filled out correctly
2016-07-07 12:14:13 +02:00
Kai Zimmermann
227b93c527 Added artifact download traffic statistics.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-07-05 17:41:08 +02:00
kaizimmerm
a4252283db Target securityToken and address fully manageable through MGMT API.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-01 08:42:17 +02:00
Melanie Retter
67ee674d41 Fix Update bug of softwareModuleType, refactored based on git comments
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-06-30 17:48:58 +02:00
Asharani
4f7bb98587 Enable push for update target, create/update/delete ds
Renamed constant MAX_TARGET_TABLE_ENTRIES

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-06-28 12:07:26 +05:30
Kai Zimmermann
796d3dda9c Metadata management for SM and DS in Management UI.
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-24 15:13:27 +02:00
kaizimmerm
fa2477f5cb Fixed nullpointer exception and optimized the code here and there.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-23 09:02:05 +02:00
Kai Zimmermann
837b62758a Removed closed todo
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-22 12:24:52 +02:00