Commit Graph

2437 Commits

Author SHA1 Message Date
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
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
Michael Hirsch
7a32d931b5 improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 17:12:56 +02:00
Michael Hirsch
5ae190c8c3 improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 17:11:04 +02:00
Michael Hirsch
2ad6f6946f improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 16:19:14 +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
Michael Hirsch
b7ca552c2f Merge branch 'master' into Feature_Improve_Code_Quality 2016-07-25 13:36:18 +02:00
Michael Hirsch
a04333b393 re-insert the method cleanMessageHeaderProperties
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 13:30:58 +02:00
Michael Hirsch
ebf2c15da9 use private method getEntityFactory()
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 12:07:35 +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
2f263faca0 suppress warning for multiple checked exception declaration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 12:01:28 +02:00
Michael Hirsch
7e94c9f684 write comment in constructor why necessary
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:58:11 +02:00
Michael Hirsch
227267af88 avoid more than 3 nested if/switch/try blocks
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:18:05 +02:00
Michael Hirsch
40a12c0321 remove unnecessary IOException from method signature
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:16:37 +02:00
Michael Hirsch
400c8bafcf move method to the right inner class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:10:59 +02:00
Michael Hirsch
9727af7a99 don't use getBytes using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:54:05 +02:00
Michael Hirsch
928ad1520b remove port 8080 to fix tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:39:55 +02:00
Michael Hirsch
812498d2fe don't use constructor using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:22:35 +02:00
Michael Hirsch
82fa485ddc suppress warning squid:S2221
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:13:07 +02:00
Michael Hirsch
f3b472bcd2 Merge branch 'master' into Feature_Improve_Code_Quality
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:08:24 +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
GAH6KOR
5f1db53def Removed the extra level of abstraction and modified the code
accordingly.
2016-07-21 12:39:54 +02:00
kaizimmerm
1c70527083 Upgrade Apache Collections to 4.1 due to known vulnerability.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-21 11:44:41 +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