lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
556 Commits 1 Branch 0 Tags
878c5c869c0bccd7acccd92db7ec2d7e6f938bea
Commit Graph

63 Commits

Author SHA1 Message Date
Michael Hirsch
421bd9154c fix license header of UrlProtocol enum 2016-04-05 12:13:36 +02:00
Michael Hirsch
df1d4c5a20 Merge branch 'master' into 
Download_server_supports_download_through_HTTP_and_HTTPs

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-05 11:58:27 +02:00
Jonathan Philip Knoblauch
84f543382c Updated javadoc for the getURl method 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-04-04 10:48:14 +02:00
Kai Zimmermann
9b11d92b7f Added javadoc. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-31 15:56:51 +02:00
Kai Zimmermann
2b5a887f6e Fixed wrong timeframe check. Set proper 24h default. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-31 15:47:24 +02:00
Jonathan Philip Knoblauch
b03fa5eec8 Verify all download URLs generated by SP-server (e.g. DDI and DMF API) 
- the get artifact request for the DDI API know contains https links
- additional there where http links added
- section for creating download urls based on patters was moved to hawkbit-core
- tests where adapted and extended

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-31 13:17:08 +02:00
Kai Zimmermann
174be0b7c7 Missed one issue. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-31 12:45:32 +02:00
Kai Zimmermann
95259f3246 Fixed mixed polling time configuration. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-31 12:24:48 +02:00
Kai Zimmermann
6ee66dc4e1 Put BaseEntity below tenant aware and unaware entities 2016-03-23 14:09:40 +01:00
Jonathan Philip Knoblauch
a3295b518d Added tenant configuration for anyonmous download and UI element to allow to configure anonymous download 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-22 17:01:24 +01:00
Kai Zimmermann
9bb53df162 Hiding exception from user 2016-03-15 15:42:10 +01:00
Kai Zimmermann
618de8813d Javadoc for Dennis 2016-03-15 15:14:07 +01:00
Kai Zimmermann
201e2390bb Sorted members 2016-03-15 14:06:59 +01:00
Kai Zimmermann
d2a95b1c7c Fixed compile error and made utility final 2016-03-15 14:05:47 +01:00
Kai Zimmermann
40e8fdf5e0 Made duration helper a static utility class 2016-03-15 13:06:47 +01:00
Kai Zimmermann
4c282d8ee3 Documented differences between system wide properties and the veritable by tenant 2016-03-14 15:39:01 +01:00
SirWayne
57c722ea11 Remove the controller properties for polling time and overdue time and 
use the new tenant configuration management, which handle the tenant
specific polling time.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-14 15:13:51 +01:00
Kai Zimmermann
807aaf629c Merge remote-tracking branch 'eclipse/master' into feature_MECS-86_tenant_specific_polling_configuration 
# Conflicts:
#
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/Tena
ntConfigurationDashboardView.java
 2016-03-14 09:51:00 +01:00
SirWayne
e47d540eb5 Fix event listening for duration field 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-10 10:27:31 +01:00
Kai Zimmermann
6379e93c5e Fixed max assignments filter on sw module type 2016-03-09 19:34:28 +01:00
SirWayne
a4cc3df092 Fix test properties 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 15:36:59 +01:00
SirWayne
ed97031faf Merge branch 'master' into 
feature_MECS-86_tenant_specific_polling_configuration

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentficationTest.java
	hawkbit-repository/src/test/resources/application-test.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 13:29:40 +01:00
SirWayne
0824499322 Merge branch 'feature_MECS-86_tenant_specific_polling_configuration' of https://github.com/bsinno/hawkbit.git into feature_MECS-86_tenant_specific_polling_configuration 2016-03-09 11:13:09 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
9646e1eabc Fixed review findings 2016-03-04 12:34:39 +01:00
Kai Zimmermann
25832e7e16 Merge remote-tracking branch 'eclipse/master' into cleanup-properties 
# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
 2016-03-04 12:11:35 +01:00
Kai Zimmermann
0fc63a452f Switched to REPORTEDAT to be more consitend with other fields. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-04 08:59:17 +01:00
Kai Zimmermann
71653470dc Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-03 20:59:15 +01:00
Kai Zimmermann
e7173aa846 Cleanup messed up actionstatus sorting. We used sort param but had 
hardcoded sorting in the reposirory. I added also reportAt based
sorting.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 18:54:50 +01:00
SirWayne
e791954e13 Add a generic check for configuration validator 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-01 10:31:30 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
0e9991b0a4 Added missing licence header 
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 14:28:44 +01:00
Fabian Nonnenmacher
57e040aec1 Fixup merge conflict 
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:18:42 +01:00
Fabian Nonnenmacher
c39753001e Bugfix: Setting and getting configuration values 
- removed cache from global getter, because it was overriding the cache of
  the tenant specific getter
- changed Type of AuthName key, type of key was not important before the huge
  configuration refactoring
- fixed test conditions

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:17:28 +01:00
Fabian Nonnenmacher
ec79e9bd19 Added REST interfaces for tenant configuration 
- added GET, DELETE and PUT function on configuration value interfaces
- changed Exception in TenantConfigurationManagement for correct mapping to HTTP Status
- added function to get global configurations from TenantConfigurationManagement, to have
  only one class for handling these configuration values

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:16:57 +01:00
Fabian Nonnenmacher
4be880587a Added validation before saving TenantConfiguration and updated tests 
* run the validation methodes inside the storing methode, to make sure that only
  valid values are written inside the database
* updated TenantConfigurationManagementTest to match the validation
* added new Tests to test all validators

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:16:42 +01:00
Fabian Nonnenmacher
d83286c94a Changed validation method to throw exception/SpServerError 
* changed error handling from return value to throw exceptions, to give the user a feedback what was wrong
* added ValidationException to ResponseExceptionHandler, to map the correct REST status codes

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:16:27 +01:00
Fabian Nonnenmacher
a5a0dc17f6 Removed PollConfigurationHelper and not used Exceptions 
- removed PollConfigurationHelper and coresspending test, because it was replaced by TenantConfigurationManagement
- removed very specific configuration exceptions, because they are not needed anymore

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:16:13 +01:00
Fabian Nonnenmacher
49486755b2 Revert "changed datamodel, integrated poll configuration into tenant meta data table" 
This reverts commit 9d147aada710cc2333723604fa8893e4f2f0515f.

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
 2016-02-29 13:15:59 +01:00
Fabian Nonnenmacher
b56477191a Added generic validator fucntion to TenantConfigurationKey 
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:15:27 +01:00
Fabian Nonnenmacher
f2e7cdb92a Updated TenantConfigurationKey 
* added DataType of stored Value as attribute
* added Polling keys to Enum

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:14:46 +01:00
Fabian Nonnenmacher
f3fa085c62 First implemtation of REST-API 
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:14:36 +01:00
Fabian Nonnenmacher
088df73ea9 Refactoring of buisness logic 
* added DurationHelper to have access to Convertion in every class
* removed tenant specific getter and setter from PollConfigurationHelper
* changed getter and setter in TenantMetaData to use DurationObjects instead of Strings
* updated UI to call new functions
* updated module tests

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:14:21 +01:00
Fabian Nonnenmacher
1eedd3a531 Implemented Buisnesslogic to read and save correct polling configuration 
- added min and max values to config files
- updated ControllerPollProperties: added getter and setter of min and max values
- updated PollConfigurationHelper: added getter for different values

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:13:12 +01:00
Fabian Nonnenmacher
1f9c6bfd72 Changed datamodel, integrated poll configuration into tenant meta data table 
* updated sql scripts to update new collums
* updated coressponding JPA class TenantMetaData

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:09:19 +01:00
Kai Zimmermann
7692a29918 Fixed property bean setup 2016-02-25 20:36:17 +01:00
Kai Zimmermann
ab18e12b69 Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build. 2016-02-25 17:59:46 +01:00
Kai Zimmermann
0b8e693cec Migrated environment aware to property annotation mechanism, documented properties. 2016-02-25 11:36:21 +01:00
Kai Zimmermann
204fe1fd18 Created TODOs for missing descriptions 2016-02-23 20:53:21 +01:00
Kai Zimmermann
7f2a9d1ed2 Features harmonised, more test descriptions 2016-02-23 09:57:18 +01:00
SirWayne
5d7ade1cf2 Add create tenant 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-15 16:20:45 +01:00