Commit Graph

891 Commits

Author SHA1 Message Date
Kai Zimmermann
608ffcecf4 Merge pull request #162 from bsinno/fix_create_filter_has_different_layout_than_rollout_and_the_other_widgets
Create filter has different layout than rollout and the other widgets
2016-05-24 18:08: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
SirWayne
c06c2e546e Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client 2016-05-24 15:08:33 +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
Michael Hirsch
18c8f55f62 Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client 2016-05-24 10:48:25 +02:00
Michael Hirsch
ee6566081b adding or fix javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-24 10:48:17 +02:00
SirWayne
57153b1244 Remove commons.lang 2.3
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-24 10:45:07 +02:00
SirWayne
f9ed3b305d Move annotation
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-19 18:28:09 +02:00
Michael Hirsch
088da91fde fix typo in readme.md
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-19 17:21:10 +02:00
Michael Hirsch
355218f7b7 Merge pull request #185 from bsinno/fix_flashing_whitepage_on_login_application
fix_flashing_whitepage_on_login_application
2016-05-19 14:02:28 +02:00
Michael Hirsch
08f0a9837f Merge pull request #184 from bsinno/fix_display_DSNameVersion_actionhistory_table
Fix display ds name version actionhistory table
2016-05-19 14:02:08 +02:00
Michael Hirsch
32ae3b7233 Merge pull request #183 from bsinno/feature_switch_back_boot_logback
Switch back Spring Boots default logger implementation logback
2016-05-19 13:23:56 +02:00
Michael Hirsch
5f8a2bebef add license header to logback.xml
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-19 12:57:32 +02:00
venu1278
22746ed87e Merge branch 'master' into fix_flashing_whitepage_on_login_application 2016-05-19 15:57:35 +05:30
venu1278
f345d5068f fix_flashing_whitepage_on_login_application
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-05-19 15:56:19 +05:30
SirWayne
176f190ec6 Update docu and readme.md
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-19 10:15:02 +02:00
Jonathan Philip Knoblauch
fcd6cef3fb Updated readme.md due to changes modules structure
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-05-18 16:16:11 +02:00
Jonathan Philip Knoblauch
c9248a80db Updated readme.md for changes module names
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-05-18 16:05:10 +02:00
SirWayne
27721c7cf8 Move Ddi client
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 15:39:47 +02:00
Michael Hirsch
88dc9cac3d Merge pull request #186 from bsinno/fix_device_simulator_ui_npe
the column name must be the same as the bean attribute name otherwise NPE
2016-05-18 15:37:01 +02:00
SirWayne
f02485129e Extend migration guide
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 15:24:28 +02:00
SirWayne
96af492a9c Fix NPE in equals
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 15:02:49 +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
Michael Hirsch
b58ba74565 the column name must be the same as the bean attribute name otherwise
NPE

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-18 12:45:09 +02:00
Kai Zimmermann
b8a3dbdf62 Fixed sonar issues.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 12:03:53 +02:00
venu1278
b8936409fe fix_flashing_whitepage_on_login_application
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-05-18 14:17:29 +05:30
venu1278
f1daaa9bbd Merge branch 'master' into fix_display_DSNameVersion_actionhistory_table 2016-05-18 14:09:07 +05:30
venu1278
40fa1325bd fix_display_DSNameVersion_actionhistory_table.
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-05-18 14:07:52 +05:30
SirWayne
e30748dd53 Modify name of artifacts in pom
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 09:24:33 +02:00
SirWayne
159fa3abb3 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 09:06:55 +02:00
Kai Zimmermann
fd6de4496d Improved simulator download case a bit. Added missing test asserts for
target token in DMF.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 09:05:01 +02:00
Kai Zimmermann
9d6527a3e2 Switched back to Boots default logger: logback
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 09:03:58 +02:00
SirWayne
610daed845 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:37:31 +02:00
SirWayne
58648cb9b2 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:34:31 +02:00
SirWayne
c8d0424706 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:34:02 +02:00
SirWayne
677b35ef42 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:32:33 +02:00
SirWayne
8125caf118 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:25:46 +02:00
SirWayne
e05b1bac59 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:24:58 +02:00
SirWayne
a48460ee03 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:24:14 +02:00
SirWayne
5c233c628c Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:02:10 +02:00
Michael Hirsch
e27bc5b32f Merge pull request #175 from bsinno/fix_target_security_permission_check_for_system_code
allow the getTargetSecurityToken can be called as system code
2016-05-17 17:01:50 +02:00
SirWayne
a47f7275eb Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:43:59 +02:00
SirWayne
eb3f9f6f2d Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:24:14 +02:00
SirWayne
806a0531f2 Merge branch 'Feature/Add_Rest_Api_with_Java_client' of
https://github.com/bsinno/hawkbit.git into
Feature/Add_Rest_Api_with_Java_client

Conflicts:
	README.md


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:13:42 +02:00
SirWayne
156da103b5 Modify readme
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 13:32:50 +02:00
Jonathan Philip Knoblauch
422918d907 Added module docu
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-05-17 13:12:01 +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
Michael Hirsch
56487ad1b7 remove if-statement and return immediately the instanceof result
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-17 10:57:08 +02:00