Commit Graph

233 Commits

Author SHA1 Message Date
SirWayne
f5f07e4af2 Add line ending
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-15 10:57:06 +02:00
SirWayne
1b4d73bd13 Merge branch 'master' into feature_rollouts_credentials
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-15 09:53:06 +02:00
Kai Zimmermann
10e1a6c00b Merge pull request #205 from bsinno/fix_delete_ds
Fixed bug where DS could not be deleted as it was assigned to a rollout.
2016-06-13 16:57:56 +02:00
Kai Zimmermann
8230a47620 Fixed typos in repo default setup and logging.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-13 16:02:04 +02:00
Jonathan Knoblauch
2b245aec82 Misspelling
Changed refernce to reference
2016-06-13 14:50:45 +02:00
Kai Zimmermann
2b2ba523f5 Fixed bug where DS could not be delete as it was assigned to a rollout.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-10 11:00:58 +02:00
SirWayne
c3f0f6e0d6 Extract the tenant cache key generator to an own service
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-08 09:48:08 +02:00
SirWayne
9baf668b31 Fix header and change beand service registration
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-06 14:29:39 +02:00
SirWayne
876369d816 Merge changes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-06 10:49:37 +02:00
Kai Zimmermann
44aaaab4e2 Fixed sonar issues and changes package of test repo classes for easier
sonar exclusion.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-04 22:07:26 +02:00
Kai Zimmermann
d19a466668 Added missing READMEs
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-04 21:42:04 +02:00
Kai Zimmermann
7468d8961e Completed constants.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-03 12:34:09 +02:00
Kai Zimmermann
2769170c47 Created constants in API for default tenant type setup.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-02 15:13:49 +02:00
Kai Zimmermann
e12fcd804e Fixed default ds gen.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-02 14:08:37 +02:00
Kai Zimmermann
5d17a7d5c3 Added sonar exceptions.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-02 08:50:37 +02:00
Kai Zimmermann
935ca2f963 Fixed broken repo access security checks.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-02 08:20:55 +02:00
Kai Zimmermann
561e6b9706 Fixed event processing.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-01 13:51:42 +02:00
Kai Zimmermann
615cbe2308 Added null check for selected target 2016-06-01 13:17:40 +02:00
Kai Zimmermann
1881880cd9 Added findactions method.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-01 09:21:51 +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
Kai Zimmermann
e054a171ea Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 12:29:05 +02:00
Kai Zimmermann
91fd94b356 Migrated MySQL schema creation to test package. Small doc improvements
on testdatafactory.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-31 12:28:24 +02:00
Michael Hirsch
1117bbebbb re-add json dependency for tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 11:29:41 +02:00
Michael Hirsch
310071dd62 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 11:01:17 +02:00
Michael Hirsch
252f409912 fix generic wildcard
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 11:01:04 +02:00
SirWayne
965e283f42 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 10:56:17 +02:00
SirWayne
f1e3406b97 Move jackson dependendy from repo to rest-core
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-31 10:56:10 +02:00
Michael Hirsch
62a2e2cdb4 introduce own interfaces for registering the currentTenantKeyGenerator
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 10:50:10 +02:00
SirWayne
b14d3bbd3c Small fixes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-31 10:50:09 +02:00
Michael Hirsch
14cb962f42 fix sonar rule don't use generic wildcard
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 10:50:09 +02:00
Michael Hirsch
c2cb42df61 add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 10:50:08 +02:00
SirWayne
a0ec726fd0 Small fixes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-31 10:48:56 +02:00
Michael Hirsch
002e0d3048 Merge branch 'feature_split_repo_into_api_impl' of
https://github.com/bsinno/hawkbit.git into
feature_split_repo_into_api_impl

Conflicts:
	hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Constants.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 08:54:51 +02:00
Michael Hirsch
b369369c2c add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 08:52: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
Michael Hirsch
2d90900f37 fix javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 08:48:06 +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
eeee57fbc4 Refactored package names.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-26 14:03:14 +02:00
Kai Zimmermann
f2e13b8d22 Split into separate maven modules.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-25 17:43:57 +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
Kai Zimmermann
1e91643b83 Adapted repo scan 2016-05-24 18:04:09 +02:00
Kai Zimmermann
d59ebaebd8 Merge pull request #181 from bsinno/Feature/Add_Rest_Api_with_Java_client
Feature/add rest api with java client
2016-05-24 16:11:25 +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
Kai Zimmermann
f0a78369f2 Continued on the model API extraction. Merged rest api split branch.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-21 21:01:23 +02:00
Kai Zimmermann
8b7b24125f Merge remote-tracking branch
'origin/Feature/Add_Rest_Api_with_Java_client' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestDataUtil.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-20 17:42:55 +02:00
Kai Zimmermann
e3041aa9ae Started to split the actual model.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-20 17:25:38 +02:00
Kai Zimmermann
3e5330a5e6 Completed management separation.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-19 11:16:26 +02:00
Kai Zimmermann
3c0d5396b0 Removed default implementations as JaCoCo has problems with those. Split
software management.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 16:16:30 +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