diff --git a/.gitignore b/.gitignore index 3efc32e90421705c49b974d7743cd30bebaee54b..4271fff9a6ef46ab62c92262b34dcaede1328967 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ *.ipr *.log -derby.log \ No newline at end of file +*/derby.log \ No newline at end of file diff --git a/README.md b/README.md index 4110d227e828386627bf67780019feb3dd64ec38..eb10ccabf907de92243230645c4750a2352c4363 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Assuming you are in the root directory of this project: ```bash cd winery mvn clean install +mvn spring-boot:run -pl webapp ``` # About Project diff --git a/winery/.gitignore b/winery/.gitignore index 382f972bad24c14baad74ab6b5d97880201368d8..a56fced71f1b40fb876c8099b9b48cb316e440b4 100644 --- a/winery/.gitignore +++ b/winery/.gitignore @@ -32,4 +32,5 @@ build/ ### VS Code ### .vscode/ -/test/ \ No newline at end of file +dao/test/ +service/test \ No newline at end of file diff --git a/winery/api/pom.xml b/winery/api/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..7dd8090ece6be567bc7bc04fe94bc345b35ba976 --- /dev/null +++ b/winery/api/pom.xml @@ -0,0 +1,19 @@ + + + + winery + cz.muni.fi.pa165.winery + 0.0.1-SNAPSHOT + + 4.0.0 + + api + + + 16 + 16 + + + \ No newline at end of file diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/enums/UserRoleType.java b/winery/api/src/main/java/cz/muni/fi/pa165/winery/enums/UserRoleType.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/enums/UserRoleType.java rename to winery/api/src/main/java/cz/muni/fi/pa165/winery/enums/UserRoleType.java diff --git a/winery/dao/pom.xml b/winery/dao/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..006ad7caaac7d123129937b22cef847000e7b516 --- /dev/null +++ b/winery/dao/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.4 + + + cz.muni.fi.pa165.winery + dao + 0.0.1-SNAPSHOT + dao + jar + + 11 + + + + cz.muni.fi.pa165.winery + api + 0.0.1-SNAPSHOT + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-data-jpa + + + javax.validation + validation-api + + + + org.apache.derby + derby + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + test + + + org.assertj + assertj-core + 3.22.0 + test + + + org.hibernate.validator + hibernate-validator + + + + diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/WineryApplication.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/WineryApplication.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/WineryApplication.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/WineryApplication.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBase.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBase.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBase.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBase.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBaseImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBaseImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBaseImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/DaoBaseImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/order/OrderItemDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/review/ProductReviewDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/user/UserRoleDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/GrapeDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/HarvestDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineBottleDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDao.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDao.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDao.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDao.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDaoImpl.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDaoImpl.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDaoImpl.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/dao/wine/WineTypeDaoImpl.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/EntityBase.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/EntityBase.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/EntityBase.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/EntityBase.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Grape.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Grape.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Grape.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Grape.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Harvest.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Harvest.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Harvest.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Harvest.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Order.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Order.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Order.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Order.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/OrderItem.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/OrderItem.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/OrderItem.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/OrderItem.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/ProductReview.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/ProductReview.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/ProductReview.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/ProductReview.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/User.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/User.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/User.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/User.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/UserRole.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/UserRole.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/UserRole.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/UserRole.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineBottle.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineBottle.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineBottle.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineBottle.java diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineType.java b/winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineType.java similarity index 100% rename from winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineType.java rename to winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineType.java diff --git a/winery/src/main/resources/META-INF/persistence.xml b/winery/dao/src/main/resources/META-INF/persistence.xml similarity index 100% rename from winery/src/main/resources/META-INF/persistence.xml rename to winery/dao/src/main/resources/META-INF/persistence.xml diff --git a/winery/src/main/resources/application.properties b/winery/dao/src/main/resources/application.properties similarity index 100% rename from winery/src/main/resources/application.properties rename to winery/dao/src/main/resources/application.properties diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/WineryApplicationTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/WineryApplicationTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/WineryApplicationTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/WineryApplicationTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/PersistenceTestConfig.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/PersistenceTestConfig.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/PersistenceTestConfig.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/PersistenceTestConfig.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/DaoTestBase.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/DaoTestBase.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/DaoTestBase.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/DaoTestBase.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/GrapeDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/GrapeDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/GrapeDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/GrapeDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/HarvestDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/HarvestDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/HarvestDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/HarvestDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderItemDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderItemDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderItemDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/OrderItemDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/ProductReviewTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/ProductReviewTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/ProductReviewTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/ProductReviewTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserRoleDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserRoleDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserRoleDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/UserRoleDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineBottleDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineBottleDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineBottleDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineBottleDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineTypeDaoTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineTypeDaoTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineTypeDaoTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/dao/WineTypeDaoTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/GrapeTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/GrapeTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/GrapeTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/GrapeTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/HarvestTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/HarvestTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/HarvestTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/HarvestTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderItemTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderItemTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderItemTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderItemTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/OrderTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/ProductReviewTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/ProductReviewTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/ProductReviewTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/ProductReviewTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserRoleTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserRoleTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserRoleTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserRoleTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/UserTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineBottleTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineBottleTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineBottleTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineBottleTests.java diff --git a/winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineTypeTests.java b/winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineTypeTests.java similarity index 100% rename from winery/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineTypeTests.java rename to winery/dao/src/test/java/cz/muni/fi/pa165/winery/persistence/entity/WineTypeTests.java diff --git a/winery/pom.xml b/winery/pom.xml index 4ad35d33b9205899d5824752a4856a65264e382e..a442b9d4e6978fc06d7f400ae65a9906ec40f89a 100644 --- a/winery/pom.xml +++ b/winery/pom.xml @@ -1,82 +1,18 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.4 - - - cz.muni.fi.pa165 - winery - 0.0.1-SNAPSHOT - winery - PA165 Semestral Project (Winery) - - 11 - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - javax.validation - validation-api - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.apache.derby - derby - runtime - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - junit - junit - test - - - org.assertj - assertj-core - 3.22.0 - test - - - org.hibernate.validator - hibernate-validator - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - + cz.muni.fi.pa165.winery + winery + 0.0.1-SNAPSHOT + winery + PA165 Semestral Project (Winery) + pom + + + dao + api + service + webapp + + \ No newline at end of file diff --git a/winery/service/pom.xml b/winery/service/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..3c6be356e2f8a6173f1e2e8ac5ead609fc2fbc96 --- /dev/null +++ b/winery/service/pom.xml @@ -0,0 +1,19 @@ + + + + winery + cz.muni.fi.pa165.winery + 0.0.1-SNAPSHOT + + 4.0.0 + + service + + + 16 + 16 + + + \ No newline at end of file diff --git a/winery/webapp/.gitignore b/winery/webapp/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..549e00a2a96fa9d7c5dbc9859664a78d980158c2 --- /dev/null +++ b/winery/webapp/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/winery/webapp/.mvn/wrapper/maven-wrapper.jar b/winery/webapp/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 Binary files /dev/null and b/winery/webapp/.mvn/wrapper/maven-wrapper.jar differ diff --git a/winery/webapp/.mvn/wrapper/maven-wrapper.properties b/winery/webapp/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..b7cb93e7050f42ff587aefbc40cc038ad4fa3271 --- /dev/null +++ b/winery/webapp/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/winery/webapp/mvnw b/winery/webapp/mvnw new file mode 100644 index 0000000000000000000000000000000000000000..8a8fb2282df5b8f7263470a5a2dc0e196f35f35f --- /dev/null +++ b/winery/webapp/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/winery/webapp/mvnw.cmd b/winery/webapp/mvnw.cmd new file mode 100644 index 0000000000000000000000000000000000000000..1d8ab018eaf11d9b3a4a90e7818ace373dfbb380 --- /dev/null +++ b/winery/webapp/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/winery/webapp/pom.xml b/winery/webapp/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..569265a2503e2bd0214d00f959c928a90cccd84c --- /dev/null +++ b/winery/webapp/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.6 + + + cz.muni.fi.pa165.winery + webapp + 0.0.1-SNAPSHOT + webapp + webapp + + 11 + + + + cz.muni.fi.pa165.winery + service + 0.0.1-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/WebappApplication.java b/winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/WebappApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..b991c174c66e5fe4e9dbf67d33069e087153c5f8 --- /dev/null +++ b/winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/WebappApplication.java @@ -0,0 +1,13 @@ +package cz.muni.fi.pa165.winery.webapp; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class WebappApplication { + + public static void main(String[] args) { + SpringApplication.run(WebappApplication.class, args); + } + +} diff --git a/winery/src/main/java/cz/muni/fi/pa165/winery/controllers/HomeController.java b/winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/controllers/HomeController.java similarity index 87% rename from winery/src/main/java/cz/muni/fi/pa165/winery/controllers/HomeController.java rename to winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/controllers/HomeController.java index 6db4f27c75b90d10ad788d3ce26e456b9eca1ca3..5e4b83ebf20d3e4d7695caf006e914c49285267f 100644 --- a/winery/src/main/java/cz/muni/fi/pa165/winery/controllers/HomeController.java +++ b/winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/controllers/HomeController.java @@ -1,4 +1,4 @@ -package cz.muni.fi.pa165.winery.controllers; +package cz.muni.fi.pa165.winery.webapp.controllers; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/winery/webapp/src/main/resources/application.properties b/winery/webapp/src/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc --- /dev/null +++ b/winery/webapp/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/winery/webapp/src/test/java/cz/muni/fi/pa165/winery/webapp/WebappApplicationTests.java b/winery/webapp/src/test/java/cz/muni/fi/pa165/winery/webapp/WebappApplicationTests.java new file mode 100644 index 0000000000000000000000000000000000000000..f04af14fe2cf932a2348ee88ed5b11fe919f3052 --- /dev/null +++ b/winery/webapp/src/test/java/cz/muni/fi/pa165/winery/webapp/WebappApplicationTests.java @@ -0,0 +1,13 @@ +package cz.muni.fi.pa165.winery.webapp; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class WebappApplicationTests { + + @Test + void contextLoads() { + } + +}