reynisson
|
1e917ec3e8
|
Merge pull request #72 from SCS-ASSE-FS21-Group1/dev
Bugfixes + Security fixes
|
2021-11-17 18:29:37 +01:00 |
|
reynisson
|
9d8e6cf216
|
Logging bids received
|
2021-11-17 18:29:08 +01:00 |
|
reynisson
|
96b0e82113
|
Merge remote-tracking branch 'origin/dev' into dev
|
2021-11-17 18:26:02 +01:00 |
|
reynisson
|
01b5056671
|
Testing out getting Environment variables from main
|
2021-11-17 18:25:49 +01:00 |
|
|
|
add257fd5e
|
updated dependencies to remove security issues
|
2021-11-16 21:20:26 +01:00 |
|
|
|
b6488fa36f
|
added environment variables for uri's
|
2021-11-16 21:17:10 +01:00 |
|
reynisson
|
778535a437
|
Merge pull request #71 from SCS-ASSE-FS21-Group1/dev
fixes
|
2021-11-16 19:47:09 +01:00 |
|
|
|
084270bbb8
|
env changes
|
2021-11-16 19:43:46 +01:00 |
|
reynisson
|
1bc6ec6813
|
Small URI fixes
|
2021-11-16 19:41:56 +01:00 |
|
|
|
98c38b4fcf
|
Merge pull request #65 from SCS-ASSE-FS21-Group1/dev
Dev
|
2021-11-16 19:13:59 +01:00 |
|
|
|
1d13b8e746
|
Merge pull request #69 from SCS-ASSE-FS21-Group1/change_mqtt_broker_in_roster
Changed mqtt broker address in roster
|
2021-11-16 19:11:49 +01:00 |
|
|
|
861cf82f67
|
Merge pull request #68 from SCS-ASSE-FS21-Group1/auction_house_external_communication
Implemented auctioning of tasks workflow in auction house
|
2021-11-16 19:11:16 +01:00 |
|
reynisson
|
7a0488df74
|
Merge pull request #70 from SCS-ASSE-FS21-Group1/improvments-for-plugfest
Fixes
|
2021-11-16 19:10:58 +01:00 |
|
|
|
44cc0929bd
|
fixes
|
2021-11-16 19:09:38 +01:00 |
|
reynisson
|
5a2cc7a131
|
Changed mqtt broker address in roster
|
2021-11-16 18:53:06 +01:00 |
|
reynisson
|
e869fb9699
|
Bidding workflow
|
2021-11-16 18:51:39 +01:00 |
|
reynisson
|
33ab37c661
|
Merge pull request #67 from SCS-ASSE-FS21-Group1/renaming-executors
Renaming executors
|
2021-11-16 17:46:28 +01:00 |
|
reynisson
|
8fba9136b2
|
Implemented auctioning of tasks workflow in auction house
|
2021-11-16 17:42:14 +01:00 |
|
|
|
bce3619638
|
renaming
|
2021-11-16 15:48:46 +01:00 |
|
|
|
247768b5d6
|
Merge pull request #66 from SCS-ASSE-FS21-Group1/v2bugfixes
fixed multiple bugs & updated cicd workflows
|
2021-11-16 14:32:23 +01:00 |
|
|
|
4c5da8eed6
|
fix naming
|
2021-11-15 12:03:25 +01:00 |
|
|
|
1c4da28480
|
fixed multiple bugs & updated cicd workflows
|
2021-11-15 11:59:27 +01:00 |
|
reynisson
|
5400798e9c
|
Merge pull request #64 from SCS-ASSE-FS21-Group1/fixinf_roster
Renaming and small refactoring
|
2021-11-14 23:34:43 +01:00 |
|
reynisson
|
75feb5c4ae
|
Renaming and small refactoring
|
2021-11-14 23:33:23 +01:00 |
|
reynisson
|
071dee6d21
|
Merge pull request #63 from SCS-ASSE-FS21-Group1/auctionhouse-websub
Auctionhouse websub
|
2021-11-14 22:16:15 +01:00 |
|
|
|
b65df5f7be
|
Merge branch 'auctionhouse-websub' of https://github.com/SCS-ASSE-FS21-Group1/tapas into auctionhouse-websub
|
2021-11-14 22:09:33 +01:00 |
|
|
|
613c1482d7
|
fixed nameing
|
2021-11-14 22:09:10 +01:00 |
|
reynisson
|
f845440568
|
Merge pull request #62 from SCS-ASSE-FS21-Group1/auction_house_handle_executor_removed_event
Implemented the handling of the mqtt executor removed event
|
2021-11-14 21:07:04 +01:00 |
|
|
|
afb534b0e1
|
Merge branch 'dev' into auctionhouse-websub
|
2021-11-14 20:51:27 +01:00 |
|
|
|
333f6aab21
|
finished websub implementation
|
2021-11-14 20:46:42 +01:00 |
|
reynisson
|
1b7395ba0d
|
Implemented the handling of the mqtt executor removed event
|
2021-11-14 19:26:19 +01:00 |
|
reynisson
|
1d9459d8f3
|
Merge pull request #56 from SCS-ASSE-FS21-Group1/timestamp
changed deadline to timestamp and the logic to schedule an auction
|
2021-11-14 16:53:49 +01:00 |
|
julius.lautz
|
b37141f5ce
|
fixed issues
|
2021-11-14 16:51:42 +01:00 |
|
reynisson
|
1ab8fba661
|
Merge pull request #60 from SCS-ASSE-FS21-Group1/executor_pool_post_executor_removed_event
Implemented the executor removed event over mqtt
|
2021-11-14 16:37:58 +01:00 |
|
reynisson
|
396f24e007
|
Implemented the executor removed event over mqtt
|
2021-11-14 16:34:45 +01:00 |
|
reynisson
|
ccb800b6af
|
Merge branch 'auction_house_adapt_to_new_executor_event' into dev
# Conflicts:
# tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java
|
2021-11-14 16:15:22 +01:00 |
|
reynisson
|
e3d68b88d9
|
Merge pull request #51 from SCS-ASSE-FS21-Group1/ExecutorRemovedEventListenerMqttAdapter
Implemented RemovedEventListener...
|
2021-11-14 16:12:10 +01:00 |
|
reynisson
|
41b0e25a5e
|
Adapted the auction house to receive and handle the new executor event over mqtt
|
2021-11-14 16:06:03 +01:00 |
|
reynisson
|
491b529105
|
Merge pull request #58 from SCS-ASSE-FS21-Group1/post_new_auctions_to_mqtt
Implemented the auction started event over mqtt
|
2021-11-14 15:29:48 +01:00 |
|
reynisson
|
4bc441f047
|
Merge pull request #57 from SCS-ASSE-FS21-Group1/Post_executor_added_events
Implemented the new executor added event over mqtt
|
2021-11-14 15:17:03 +01:00 |
|
reynisson
|
2999fb294c
|
Implemented the auction started event over mqtt
|
2021-11-14 15:16:42 +01:00 |
|
reynisson
|
55c094fc56
|
Implemented the new executor added event over mqtt
|
2021-11-14 14:28:45 +01:00 |
|
reynisson
|
2f42da485d
|
Fixed imports so that the class builds
|
2021-11-12 13:30:16 +01:00 |
|
rahimiankeanu
|
c48a402e55
|
2.0
|
2021-11-12 08:59:09 +01:00 |
|
rahimiankeanu
|
f652a9ecaf
|
MQTT event adapter
|
2021-11-12 08:51:43 +01:00 |
|
|
|
18fdf819f1
|
First implementation of WebSub
|
2021-11-10 15:14:41 +01:00 |
|
julius.lautz
|
74a51cfcf6
|
changed deadline to timestamp and the logic to schedule an auction
|
2021-11-10 11:03:57 +00:00 |
|
|
|
59795d0234
|
Merge pull request #55 from SCS-ASSE-FS21-Group1/#38_Use_java.net.URI_for_all_URIs_in_the_ExecutorPool
#38 use java.net.uri for all ur is in the executor pool
|
2021-11-10 11:44:56 +01:00 |
|
|
|
f8de36ba5c
|
Merge pull request #54 from SCS-ASSE-FS21-Group1/small-refactoring
Small refactoring and fixes
|
2021-11-10 11:40:27 +01:00 |
|
reynisson
|
ec8ff4b3ba
|
Changed ExecutorIp and ExecutorPort to ExecutorUri. Also made all necessary changes for it to work
|
2021-11-09 22:56:11 +01:00 |
|
