lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
2,116 Commits 1 Branch 0 Tags
56ce99276405ea604e1e30fd646f83abe3be5607
Commit Graph

317 Commits

Author SHA1 Message Date
Melanie Retter
4e292d48b7 Fix typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-22 14:57:46 +02:00
SirWayne
84c9296a70 Merge branch 'eclipse/master' into 
fix_unhandled_ConstraintViolationException

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-19 14:38:28 +02:00
Kai Zimmermann
bd5d532d60 Fixed missing controller poll update in case of EVENT. Fixed eventBus 
duplicate event post.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-19 11:19:33 +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
Kai Zimmermann
09c329a485 Removed unnecessary target info startus persistence. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-18 10:34:43 +02:00
SirWayne
1d825f9c74 Add a textfield builder 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 17:33:06 +02:00
SirWayne
6db64dd5df Merge master 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 15:27:45 +02:00
SirWayne
a4703ea0a8 Merge remote-tracking branch 'eclipse/master' into 
fix-improve-code-quality

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 15:17:30 +02:00
SirWayne
e65849b922 Fix some code smells 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 13:20:07 +02:00
Michael Hirsch
79e0cccfa9 remove not used class 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-16 12:29:14 +02:00
Dominic Schabel
a9e15041d8 Minor code improvements 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-15 18:16:55 +02:00
SirWayne
aa5e4d0601 - Fix ds assignment result 
- Fix drag and drop to assignment

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-15 17:57:52 +02:00
Dominic Schabel
3accac9ade Minor code improvements 
Signed-off-by: Dominic Schabel dominic.schabel@bosch-si.com
 2016-08-15 13:17:37 +02:00
Gaurav
86f13452c5 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-15 11:42:03 +02:00
Melanie Retter
0d632d598a Delete empty rows in Java Doc 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 14:33:34 +02:00
Melanie Retter
3ec569f259 Merge branch 'fix_lock_session_on_show_error_notification' of 
https://github.com/bsinno/hawkbit.git into
fix_lock_session_on_show_error_notification

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 13:29:31 +02:00
Gaurav
d7539de64d Merge branch 'master' into feature_enable_push_in_deployment_view 
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/eventbus/event/TargetDeletedEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java
	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
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-10 11:44:23 +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
Gaurav
8fa2a60a71 Formatted the code. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-08 13:30:16 +02:00
Gaurav
1afd98e157 Merge branch 'feature_enable_push_in_deployment_view' of https://github.com/bsinno/hawkbit/ into feature_enable_push_in_deployment_view 2016-08-08 13:25:13 +02:00
Gaurav
e42f8164a8 Incorporated the review comments. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-08 13:24:12 +02:00
Michael Hirsch
b3702672a3 add javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-08 09:14:48 +02:00
SirWayne
c71cf4852a fix sonar issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 14:58:17 +02:00
Dominic Schabel
222f06d9bb JavaDoc comments added and method visibility raised to public 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-05 14:12:27 +02:00
Michael Hirsch
2ba9fd135d Add missing PreAuthorize annotation to secure methods and write unit 
test

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-03 09:08:03 +02:00
Gaurav
0854d023fb Fixed the code for the create ds for deployment view and fixed the issue 
for delete metadata(getting optimistic lock exception)
 2016-08-02 18:32:44 +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
Gaurav
1bf91372ae Added the javadoc. 2016-08-01 17:51:34 +02:00
Gaurav
1d72257b9f Merge branch 'feature_enable_push_in_deployment_view' of 
https://github.com/bsinno/hawkbit/ into
feature_enable_push_in_deployment_view

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
 2016-08-01 16:11:11 +02:00
Gaurav
d0f372765f Merge branch 'feature_enable_push_in_deployment_view' of 
https://github.com/bsinno/hawkbit/ into
feature_enable_push_in_deployment_view

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java
 2016-08-01 16:06:41 +02:00
Michael Hirsch
9c442967f8 add tests for repository entity events 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-01 15:14:40 +02:00
Gaurav
60cc2c333c Refactored the code for displaying distributions in the deployment view. 2016-08-01 15:12:03 +02:00
Michael Hirsch
4e237f748b refactor the EventAwareEntity interface 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-01 13:01:25 +02:00
Michael Hirsch
72899df4a4 remove notification of distribution set deletion from management layer 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-01 10:30:45 +02:00
Michael Hirsch
5be513422d remove notification of target deletion from management layer 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-01 10:24:09 +02:00
Gaurav
dfd449592c Fix for EOL from widows EOL to unix EOL 2016-07-29 13:22:38 +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
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
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
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
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
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
2d58cfcc59 Merge branch 'master' into feature_ui_metadata 2016-07-22 15:14:37 +02:00