Commit Graph

859 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
Michael Hirsch
9c75ae308d reduce usage of getTenantMetadata(String)
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-02 13:01:31 +02:00
Michael Hirsch
fc4747083c Use system role where necessary to invoke the getTenantMetadata method
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-02 12:51:08 +02:00
Gaurav
1bf91372ae Added the javadoc. 2016-08-01 17:51:34 +02:00
Michael Hirsch
046ec2b2ec add preauthorize to system management
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-01 17:22: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
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
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
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
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
kaizimmerm
b6506380ad Merge branch 'master' into feature_boot_13_sec_41
Conflicts:
	hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java
	pom.xml


Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-27 15:29:54 +02:00
kaizimmerm
99adab1a5f Fixed license header and entity scan.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-27 14:51:18 +02:00
GAH6KOR
5bc4b04039 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-26 10:16:44 +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
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
kaizimmerm
2e416d0027 Using same plugin for weave and metamodel
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-21 10:39:57 +02:00
Kai Zimmermann
6eadd6a3eb Merge pull request #251 from bsinno/feature_rsql_last_poll
Added feature to query by last target poll.
2016-07-21 10:38:09 +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
Kai Zimmermann
2ad5d8cfb1 Added feature to query by last target poll.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-07-20 10:34:19 +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
ecf59fd0b6 add test description
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 13:05:38 +02:00
Michael Hirsch
0c2604d1a1 add unit test for initial creating tenant without security context
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 13:03:39 +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
kaizimmerm
624d9491d0 Removed enable auto configure from repo config
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-16 20:17:44 +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