Commit Graph

52 Commits

Author SHA1 Message Date
kaizimmerm
e7ee5ee3d4 Merge with master
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-14 11:05:05 +02:00
kaizimmerm
ca5b11b5a1 Adapt DDI interfaces to feign changes
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-14 10:56:27 +02:00
kaizimmerm
47e3417f55 Improved method naming
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-07 12:17:50 +02:00
Kai Zimmermann
8ce8d8e571 Fixed DMF sending out wrong message if action on CANCELING
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-09-05 09:17:15 +02:00
SirWayne
a1a7a6dc45 Adapt test to new json path
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-29 17:11:33 +02:00
Kai Zimmermann
0b0503a77f Fixed locale problem on non EN systems
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-25 15:19:53 +02:00
Kai Zimmermann
2e0208f054 Fixed test after merge
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-24 11:35:02 +02:00
Kai Zimmermann
d9b83a75d0 Merges with master
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by:
2016-08-24 11:03:16 +02:00
kaizimmerm
00539ea49c Merges with master
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-08-24 10:58:03 +02:00
kaizimmerm
ff500d3bd7 Started migration for Boot 1.3 and Security 4.1
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-08-24 09:38:53 +02:00
Kai Zimmermann
7f68aedd78 Merge branch 'master' into feature_boot_13_sec_41
Conflicts:
	hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/FreePortFileWriter.java
	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/FreePortFileWriter.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-19 08:35:58 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
2016-08-08 16:40:00 +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
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
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
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
kaizimmerm
04dad8d6de Started migration for Boot 1.3 and Security 4.1
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-07 12:39:40 +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
Kai Zimmermann
5defb8c6d9 Fixed bug where DDI deplyomentBase URL does not reflect TIMEFORCED
switch.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-27 17:52:55 +02:00
Kai Zimmermann
def8eafd92 Changed package name of test utils to allow sonar exclusion.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-05 16:17:58 +02:00
Kai Zimmermann
e71ab4e63f Ip Address tracking configurable.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-04 21:11:19 +02:00
Kai Zimmermann
a73d72bf58 Fixed header.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-03 18:13:44 +02:00
Kai Zimmermann
706c825909 Added test for DoSFilter.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-03 18:09:46 +02:00
Kai Zimmermann
13f9791891 Removed JPA dependencies from runtime. Test only now.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-31 20:50:22 +02:00
SirWayne
b14d3bbd3c Small fixes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-31 10:50:09 +02:00
Kai Zimmermann
7a98c58407 refactored test data generation. Refactored entity factor methods.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-31 08:51:49 +02:00
Kai Zimmermann
53156cb16f Javadoc, sonar issue, package cycles.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-27 15:25:08 +02:00
Kai Zimmermann
e6ff96dc5a Completed maven module split.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-27 13:30:18 +02:00
Kai Zimmermann
cf450dabfa Merge remote-tracking branch 'eclipse/master' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-24 21:51:59 +02:00
SirWayne
dc74ec8889 Some rework for the pull request
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-24 15:08:07 +02:00
Kai Zimmermann
9301de096c Worked on the interfaces and documentation.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-22 08:48:47 +02:00
SirWayne
05615a9e86 Modify JavaDoc
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 14:28:31 +02:00
SirWayne
5bb24c78ad Remove and Rename modules
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 13:48:04 +02:00
Jonathan Philip Knoblauch
e658e7dac6 Merged changes from master into ddi-resources
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-05-17 12:49:32 +02:00
SirWayne
354ed91fa7 Merge branch 'master' into Feature/Add_Rest_Api_with_Java_client
Conflicts:
	examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java
	examples/hawkbit-mgmt-api-client/pom.xml
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/RolloutBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TagBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TargetBuilder.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/ArtifactStoreController.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/DataConversionHelper.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEventProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/BaseSwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ProxyTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterQueryValidation.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/event/CustomFilterUIEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/LoginView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/CreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/ProxyRollout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/ProxyRolloutGroup.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
	hawkbit-ui/src/main/resources/messages.properties
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 11:16:18 +02:00
SirWayne
f33c8c05e2 Add download server api
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-03 12:52:53 +02:00
Jonathan Philip Knoblauch
a065a81aed Solvend maven depenency and added new DDI client functions
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-26 10:56:33 +02:00
SirWayne
5cfb933ca1 Add Rest configuration for test
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-25 10:45:48 +02:00
Jonathan Philip Knoblauch
347fb8d5fe Added new RequestResponseContextHolder to HTTP resources.
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-25 09:15:23 +02:00
Jonathan Philip Knoblauch
ff0f9ab039 Merge branch 'Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client' of https://github.com/bsinno/hawkbit.git into Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client
Conflicts:
	hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactStoreController.java


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-22 13:58:58 +02:00
Jonathan Philip Knoblauch
810900eee7 Removed http servlet response and request form method signature
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-22 13:36:21 +02:00
SirWayne
a615317ba4 Add Managment Default Feign Client
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-22 12:24:11 +02:00
SirWayne
2b3d978978 Add signature from interface to the concret class, because of Spring MVC
and parameter inheritance.
"also actually doesn’t work with Spring MVC in its current form (method
parameter mapping is not inherited"

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 13:00:54 +02:00
SirWayne
bb0fb5da8d Add name of @PathVariable
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 11:29:56 +02:00
SirWayne
2538d12785 Remove duplicate test util classes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 17:55:54 +02:00
SirWayne
c3c405c986 Rename and split rest resources ddi, mgmt and system
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 17:33:03 +02:00
SirWayne
8a22ea3df3 Rename Ddi classes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 13:47:09 +02:00
SirWayne
3c0e34ee41 Rename Ddi classes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 13:42:43 +02:00
Jonathan Philip Knoblauch
12cca669fe Added missing javadoc to DDI resources
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-19 09:29:55 +02:00