Commit Graph

146 Commits

Author SHA1 Message Date
Kai Zimmermann
2f415c4839 Merge pull request #274 from bsinno/fix_dialog_window_must_not_close_after_save_if_duplicate_exists
Fix for the dialog window must not close after save if duplicate exists.
2016-09-01 11:37:58 +02:00
SirWayne
a71179b5fa Remove abstract mongo db test class, because every test starts a mongo.
This class is not necessary

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-29 11:04:49 +02:00
Melanie Retter
fbe29a8a87 Merge branch 'master' into
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 14:46:23 +02:00
Melanie Retter
4d47a86285 Fix typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 14:26:46 +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
b3db6e4ae2 Merge pull request #276 from bsinno/fix_remove_unnecessary_save
Removed unnecessary target info startus persistence.
2016-08-24 09:05:26 +02:00
kaizimmerm
795515e0b7 Improve readability
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-08-19 14:22:12 +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
Michael Hirsch
2cbe13c14f don't reject too many status entries exception
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-12 16:32:04 +02:00
SirWayne
54ce3ad8e0 Fix sonar issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 08:56:38 +02:00
SirWayne
a1e939e233 Merge remote-tracking branch 'eclipse/master' into
Feature_Improve_Code_Quality

Conflicts:
	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


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-04 16:04:35 +02:00
Jonathan Philip Knoblauch
4462d0aad9 Refactoring for configuration
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 11:15:52 +02:00
Jonathan Philip Knoblauch
de375fe183 Updated javadoc
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 10:51:36 +02:00
Jonathan Philip Knoblauch
1a1d3746df Moved errorHandler to to autoconfig
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 10:47:36 +02:00
Jonathan Philip Knoblauch
87dc8b8964 Set the errorHandler as parameter in method
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-01 10:38:28 +02:00
Jonathan Philip Knoblauch
e7e77cbb86 Extended method signature to allow to set a error handler and created the default one as bean
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-07-29 13:50:30 +02:00
Michael Hirsch
2ad6f6946f improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 16:19:14 +02:00
Michael Hirsch
a04333b393 re-insert the method cleanMessageHeaderProperties
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 13:30:58 +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
Michael Hirsch
812498d2fe don't use constructor using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:22:35 +02:00
Michael Hirsch
f3b472bcd2 Merge branch 'master' into Feature_Improve_Code_Quality
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:08:24 +02:00
Kai Zimmermann
8d6526ae8f Fixed fail messages.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-29 17:01:24 +02:00
Kai Zimmermann
c3b999792b Clarified string conversion.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-29 16:18:35 +02:00
Kai Zimmermann
202054e129 Fixed sonar issue.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-29 15:20:23 +02:00
Kai Zimmermann
0c4d88a8f4 Fixed test.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-29 15:15:06 +02:00
Kai Zimmermann
8cd6e5d614 Made queue declaration retry count configurable.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-29 14:20:40 +02:00
Michael Hirsch
a5ee301820 update javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-25 12:29:12 +02:00
kaizimmerm
06b6b254b5 Merge remote-tracking branch 'origin/fix_resend_dmf_with_null_target_sec_token' into fix_executor_and_exchange 2016-06-24 14:02:19 +02:00
kaizimmerm
23cb62b9d9 Fix scheduled executor, auth exchange and simulator poll.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-24 13:59:19 +02:00
Michael Hirsch
128585c95e fix test
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-24 12:38:46 +02:00
Michael Hirsch
0a36f23bb3 retrieve target-security-token with system-context permission
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-24 12:09:23 +02:00
kaizimmerm
bb1d3a2668 Remove whitespace.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-23 09:15:40 +02:00
kaizimmerm
fa2477f5cb Fixed nullpointer exception and optimized the code here and there.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-23 09:02:05 +02:00
Kai Zimmermann
717a23671e Propr rabbit client version handling in parent POM.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-22 12:31:35 +02:00
kaizimmerm
3d049fada1 Add DMF message correlation-id to action history.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-22 09:17:35 +02:00
kaizimmerm
3557a58bd9 Merge branch 'feature_configurable_mgmt_sim_scenario' of https://github.com/bsinno/hawkbit.git into feature_configurable_mgmt_sim_scenario 2016-06-21 18:05:39 +02:00
kaizimmerm
7cb3b2f2ff Added storage of clients correlation ID in action history.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-21 18:05:20 +02:00
Michael Hirsch
2e23ed3871 remove scala dependency
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-21 15:37:22 +02:00
kaizimmerm
aee106b9a9 Merge branch 'master' into feature_configurable_mgmt_sim_scenario
Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java


Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-21 12:18:32 +02:00
kaizimmerm
cc1dc09516 Configurable prefetch and consumer pool.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-19 20:43:12 +02:00
kaizimmerm
20ebbed27f Set separate handling for invalid message handling and internal server
errors which should result in requeue instead of reject

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-17 11:32:04 +02:00
kaizimmerm
f04c3655ed Fixed problem where correlation data is null.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-15 11:25:46 +02:00
Kai Zimmermann
ecd5647438 extends mgmt simulator. Extended scalabaility of dmf listener.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-15 10:45:34 +02:00
Kai Zimmermann
a690ff2b70 Fixed new factory configuration. It was non optional which in result
will not work if the factory comes from another source, e.g. cloud
foundry.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-14 17:50:54 +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
Kai Zimmermann
f532a0907c Merge branch 'eclipsemaster' into feature_asynchronous_health
Conflicts:
	pom.xml


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-13 12:51:26 +02:00
Kai Zimmermann
12ce60f72a Rabbit publisherConfirms
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-12 08:09:28 +02:00
Kai Zimmermann
64f3acfa2b Improved documentation of time value.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-10 15:45:20 +02:00
Kai Zimmermann
00013a7f36 Added executor config to tests.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-09 13:00:47 +02:00
Kai Zimmermann
0beef57df7 Added rabbit connection heartbeat for DMF.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-09 11:57:44 +02:00