Merge remote-tracking branch 'origin/feature/programming-exercises/re…

…vised-feedback' into feature/programming-exercises/revised-feedback
ls1intum · Sep 17, 2024 · 1ba71f3 · 1ba71f3
2 parents 3fa94a6 + 7ada9fe
commit 1ba71f3
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 62 deletions.
diff --git a/README.md b/README.md
diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java
@@ -49,7 +49,6 @@
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor;
 import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService;
 import de.tum.cit.aet.artemis.core.util.HeaderUtil;
-import de.tum.cit.aet.artemis.core.web.TeamWebsocketService;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
 import de.tum.cit.aet.artemis.exercise.domain.Team;
 import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation;

diff --git a/...rtemis/core/web/TeamWebsocketService.java → ...is/exercise/web/TeamWebsocketService.java b/...rtemis/core/web/TeamWebsocketService.java → ...is/exercise/web/TeamWebsocketService.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.core.web;
+package de.tum.cit.aet.artemis.exercise.web;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/...aet/artemis/core/web/LectureResource.java → .../artemis/lecture/web/LectureResource.java b/...aet/artemis/core/web/LectureResource.java → .../artemis/lecture/web/LectureResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.core.web;
+package de.tum.cit.aet.artemis.lecture.web;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java
@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.modeling.repository;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
 import java.util.List;
 
@@ -16,7 +16,7 @@
 /**
  * Spring Data JPA repository for the ApollonDiagram entity.
  */
-@Profile(PROFILE_APOLLON)
+@Profile(PROFILE_CORE)
 @Repository
 public interface ApollonDiagramRepository extends ArtemisJpaRepository<ApollonDiagram, Long> {
 

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java
@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.modeling.web;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -35,7 +35,7 @@
 /**
  * REST controller for managing ApollonDiagram.
  */
-@Profile(PROFILE_APOLLON)
+@Profile(PROFILE_CORE)
 @RestController
 @RequestMapping("api/")
 public class ApollonDiagramResource {

diff --git a/...et/artemis/core/web/PlantUmlResource.java → ...mis/programming/web/PlantUmlResource.java b/...et/artemis/core/web/PlantUmlResource.java → ...mis/programming/web/PlantUmlResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.core.web;
+package de.tum.cit.aet.artemis.programming.web;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom;