Commit Graph

165 Commits

Author SHA1 Message Date
3c35f84913 bugfixes 2021-11-22 10:11:33 +01:00
reynisson
43036b4312 Merge remote-tracking branch 'origin/dev' into dev 2021-11-21 22:37:26 +01:00
reynisson
0f5adff167 Updated ADRs 2021-11-21 22:37:17 +01:00
df0e91fb23
Merge pull request #83 from SCS-ASSE-FS21-Group1/db_roster
added database to roster
2021-11-21 21:19:10 +01:00
d70ea75fb7
Merge pull request #84 from SCS-ASSE-FS21-Group1/Persistence-mongodb
Persistence mongodb
2021-11-21 21:18:14 +01:00
reynisson
c1f27d51f7 Updated ADRs 2021-11-21 19:48:37 +01:00
reynisson
54f959ac23 Updated ADRs 2021-11-21 19:45:16 +01:00
julius.lautz
ae9e3acbd2 added database to roster 2021-11-21 19:40:32 +01:00
rahimiankeanu
2aeaf86e59 Persistence layer in executor pool
(RemoveExecutorFrom... under Service folder still has an error)
2021-11-21 18:07:07 +01:00
reynisson
5968184b08 Merge remote-tracking branch 'origin/dev' into dev 2021-11-21 17:16:13 +01:00
reynisson
af820f23d9 Path the task output data instead of a hard coded 0 2021-11-21 17:16:01 +01:00
bc5c654154 Merge remote-tracking branch 'upstream/main' into dev 2021-11-21 12:14:26 +01:00
Ronny Seiger
b027a83aad
Merge pull request #11 from SCS-ASSE-FS21-Tutors/test
Test
2021-11-21 11:32:13 +01:00
reynisson
1bd387413e fixed Content-type header in external patch 2021-11-20 23:44:47 +01:00
reynisson
53d815b93d smallest fixes 2021-11-20 23:26:02 +01:00
reynisson
3141f97f41 smaller fixes 2021-11-20 23:08:22 +01:00
reynisson
ad27697bc7
Merge pull request #78 from SCS-ASSE-FS21-Group1/dev
using https for auction house link
2021-11-20 22:54:41 +01:00
reynisson
332f035622 small fixes 2021-11-20 22:53:52 +01:00
reynisson
3b205d80a5 using the bidders auction house uri 2021-11-20 22:39:20 +01:00
reynisson
e3768280ac using https for auction house link 2021-11-20 22:09:07 +01:00
ronsei
f6c0495c04 ArchUnit test for Assignment 8 2021-11-18 18:13:49 +01:00
ronsei
c126c34972 First set tests for Assignment 8 2021-11-18 16:02:28 +01:00
reynisson
ef044f1cf1
Merge pull request #76 from SCS-ASSE-FS21-Group1/dev
bugfixes + env variables
2021-11-17 21:37:26 +01:00
6fe4b4dfbe bugfixes + env variables 2021-11-17 21:35:38 +01:00
reynisson
ee818c8149
Merge pull request #75 from SCS-ASSE-FS21-Group1/dev
deployment script & tasklist & executor fixes
2021-11-17 19:55:36 +01:00
9d75a87dd6 deployment script & tasklist & executor fixes 2021-11-17 19:54:04 +01:00
reynisson
47956d1ac6
Merge pull request #73 from SCS-ASSE-FS21-Group1/dev
fixed deployment script
2021-11-17 19:03:13 +01:00
6b8f5bf013 fixed deployment script 2021-11-17 19:00:52 +01:00
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
Andrei Ciortea
1d2c7103e4 Merge branch 'main' of github.com:SCS-ASSE-FS21-Tutors/tapas into main 2021-11-16 22:41:45 +01:00
Andrei Ciortea
292d30d1bd Add example for reading config properties in the main method for TapasAuctionHouse 2021-11-16 22:41:22 +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
Peter Guhl
df53236853
Compiling and running tapas on a local docker installation (#10)
* First version building tasks and mongodb

* Creating container for local tests

* Initial version

* Added mongodb to correct network

* Added auction house

* Acknowledgments, Dockerfile for app

* Added app to build

* Dockerfile for app

* Mapped app port to localhost:8080

Co-authored-by: Ubuntu <ubuntu@docker-tests.novalocal>
2021-11-16 16:12:15 +01:00
bce3619638 renaming 2021-11-16 15:48:46 +01:00