From 6c5ab49b78f6375ff3d8df21b0a617534154e4de Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Wed, 7 Jun 2017 10:36:59 +0200 Subject: [PATCH] openvidu-sample-app package renamed --- .../openvidu/sample/app}/App.java | 2 +- .../openvidu/sample/app}/DatabaseInitializer.java | 10 +++++----- .../openvidu/sample/app}/lesson/Lesson.java | 5 +++-- .../openvidu/sample/app}/lesson/LessonController.java | 8 ++++---- .../openvidu/sample/app}/lesson/LessonRepository.java | 4 ++-- .../sample/app}/security/LoginController.java | 6 +++--- .../openvidu/sample/app}/security/SecurityConfig.java | 2 +- .../app}/security/UserRepositoryAuthProvider.java | 8 ++++---- .../app}/session_manager/SessionController.java | 11 +++++------ .../openvidu/sample/app}/user/User.java | 4 ++-- .../openvidu/sample/app}/user/UserComponent.java | 2 +- .../openvidu/sample/app}/user/UserController.java | 2 +- .../openvidu/sample/app}/user/UserRepository.java | 4 ++-- .../openvidu/sample/app/test}/AppTest.java | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/App.java (96%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/DatabaseInitializer.java (82%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/lesson/Lesson.java (94%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/lesson/LessonController.java (97%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/lesson/LessonRepository.java (72%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/security/LoginController.java (91%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/security/SecurityConfig.java (98%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/security/UserRepositoryAuthProvider.java (90%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/session_manager/SessionController.java (96%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/user/User.java (96%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/user/UserComponent.java (96%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/user/UserController.java (97%) rename openvidu-sample-app/src/main/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app}/user/UserRepository.java (78%) rename openvidu-sample-app/src/test/java/{openvidu/openvidu_sample_app => io/openvidu/sample/app/test}/AppTest.java (94%) diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/App.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/App.java similarity index 96% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/App.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/App.java index c49bf1ea..3c8439ee 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/App.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/App.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app; +package io.openvidu.sample.app; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/DatabaseInitializer.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/DatabaseInitializer.java similarity index 82% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/DatabaseInitializer.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/DatabaseInitializer.java index 33660b0b..d5ae7537 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/DatabaseInitializer.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/DatabaseInitializer.java @@ -1,13 +1,13 @@ -package openvidu.openvidu_sample_app; +package io.openvidu.sample.app; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Controller; -import openvidu.openvidu_sample_app.user.UserRepository; -import openvidu.openvidu_sample_app.user.User; -import openvidu.openvidu_sample_app.lesson.LessonRepository; -import openvidu.openvidu_sample_app.lesson.Lesson; +import io.openvidu.sample.app.lesson.Lesson; +import io.openvidu.sample.app.lesson.LessonRepository; +import io.openvidu.sample.app.user.User; +import io.openvidu.sample.app.user.UserRepository; @Controller public class DatabaseInitializer implements CommandLineRunner { diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/Lesson.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/Lesson.java similarity index 94% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/Lesson.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/Lesson.java index 0dac94ad..8f52da3e 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/Lesson.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/Lesson.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.lesson; +package io.openvidu.sample.app.lesson; import java.util.Set; import java.util.HashSet; @@ -11,7 +11,8 @@ import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonView; -import openvidu.openvidu_sample_app.user.User; + +import io.openvidu.sample.app.user.User; @Entity public class Lesson { diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/LessonController.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/LessonController.java similarity index 97% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/LessonController.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/LessonController.java index 240cb944..9b25fe48 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/LessonController.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/LessonController.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.lesson; +package io.openvidu.sample.app.lesson; import java.util.Collection; import java.util.HashSet; @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import openvidu.openvidu_sample_app.user.User; -import openvidu.openvidu_sample_app.user.UserComponent; -import openvidu.openvidu_sample_app.user.UserRepository; +import io.openvidu.sample.app.user.User; +import io.openvidu.sample.app.user.UserComponent; +import io.openvidu.sample.app.user.UserRepository; @RestController @RequestMapping("/api-lessons") diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/LessonRepository.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/LessonRepository.java similarity index 72% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/LessonRepository.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/LessonRepository.java index f7ce0582..f8feb673 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/lesson/LessonRepository.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/lesson/LessonRepository.java @@ -1,10 +1,10 @@ -package openvidu.openvidu_sample_app.lesson; +package io.openvidu.sample.app.lesson; import java.util.Collection; import org.springframework.data.jpa.repository.JpaRepository; -import openvidu.openvidu_sample_app.user.User; +import io.openvidu.sample.app.user.User; public interface LessonRepository extends JpaRepository { diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/LoginController.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/LoginController.java similarity index 91% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/LoginController.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/LoginController.java index afe92f91..60a46399 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/LoginController.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/LoginController.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.security; +package io.openvidu.sample.app.security; import javax.servlet.http.HttpSession; @@ -10,8 +10,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import openvidu.openvidu_sample_app.user.User; -import openvidu.openvidu_sample_app.user.UserComponent; +import io.openvidu.sample.app.user.User; +import io.openvidu.sample.app.user.UserComponent; /** * This class is used to provide REST endpoints to logIn and logOut to the diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/SecurityConfig.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/SecurityConfig.java similarity index 98% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/SecurityConfig.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/SecurityConfig.java index 2c7b1196..20cdab88 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/SecurityConfig.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/SecurityConfig.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.security; +package io.openvidu.sample.app.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/UserRepositoryAuthProvider.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/UserRepositoryAuthProvider.java similarity index 90% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/UserRepositoryAuthProvider.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/UserRepositoryAuthProvider.java index 58c0ffa0..ab29e4bc 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/security/UserRepositoryAuthProvider.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/security/UserRepositoryAuthProvider.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.security; +package io.openvidu.sample.app.security; import java.util.ArrayList; import java.util.List; @@ -14,9 +14,9 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Component; -import openvidu.openvidu_sample_app.user.UserRepository; -import openvidu.openvidu_sample_app.user.UserComponent; -import openvidu.openvidu_sample_app.user.User; +import io.openvidu.sample.app.user.User; +import io.openvidu.sample.app.user.UserComponent; +import io.openvidu.sample.app.user.UserRepository; /** * This class is used to check http credentials against database data. Also it * is responsible to set database user info into userComponent, a session scoped diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/session_manager/SessionController.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/session_manager/SessionController.java similarity index 96% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/session_manager/SessionController.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/session_manager/SessionController.java index 11508e6f..5413f3ff 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/session_manager/SessionController.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/session_manager/SessionController.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.session_manager; +package io.openvidu.sample.app.session_manager; import java.util.Collection; import java.util.HashMap; @@ -18,13 +18,12 @@ import org.springframework.web.bind.annotation.RestController; import io.openvidu.java.client.OpenVidu; import io.openvidu.java.client.Session; import io.openvidu.java.client.TokenOptions; +import io.openvidu.sample.app.lesson.Lesson; +import io.openvidu.sample.app.lesson.LessonRepository; +import io.openvidu.sample.app.user.User; +import io.openvidu.sample.app.user.UserComponent; import io.openvidu.java.client.OpenViduRole; -import openvidu.openvidu_sample_app.lesson.Lesson; -import openvidu.openvidu_sample_app.lesson.LessonRepository; -import openvidu.openvidu_sample_app.user.User; -import openvidu.openvidu_sample_app.user.UserComponent; - @RestController @RequestMapping("/api-sessions") public class SessionController { diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/User.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/User.java similarity index 96% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/User.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/User.java index 6174df93..ad24772a 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/User.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/User.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.user; +package io.openvidu.sample.app.user; import java.util.List; import java.util.Set; @@ -18,7 +18,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import com.fasterxml.jackson.annotation.JsonIgnore; -import openvidu.openvidu_sample_app.lesson.Lesson; +import io.openvidu.sample.app.lesson.Lesson; @Entity public class User { diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserComponent.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserComponent.java similarity index 96% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserComponent.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserComponent.java index 893ea3a9..b96e948b 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserComponent.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserComponent.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.user; +package io.openvidu.sample.app.user; import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.ScopedProxyMode; diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserController.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserController.java similarity index 97% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserController.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserController.java index d6c30e3d..5de2568e 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserController.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserController.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app.user; +package io.openvidu.sample.app.user; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserRepository.java b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserRepository.java similarity index 78% rename from openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserRepository.java rename to openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserRepository.java index 362815a1..d66dcb46 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/user/UserRepository.java +++ b/openvidu-sample-app/src/main/java/io/openvidu/sample/app/user/UserRepository.java @@ -1,10 +1,10 @@ -package openvidu.openvidu_sample_app.user; +package io.openvidu.sample.app.user; import java.util.Collection; import org.springframework.data.jpa.repository.JpaRepository; -import openvidu.openvidu_sample_app.lesson.Lesson; +import io.openvidu.sample.app.lesson.Lesson; public interface UserRepository extends JpaRepository{ diff --git a/openvidu-sample-app/src/test/java/openvidu/openvidu_sample_app/AppTest.java b/openvidu-sample-app/src/test/java/io/openvidu/sample/app/test/AppTest.java similarity index 94% rename from openvidu-sample-app/src/test/java/openvidu/openvidu_sample_app/AppTest.java rename to openvidu-sample-app/src/test/java/io/openvidu/sample/app/test/AppTest.java index e1ceab17..bf3d5f60 100644 --- a/openvidu-sample-app/src/test/java/openvidu/openvidu_sample_app/AppTest.java +++ b/openvidu-sample-app/src/test/java/io/openvidu/sample/app/test/AppTest.java @@ -1,4 +1,4 @@ -package openvidu.openvidu_sample_app; +package io.openvidu.sample.app.test; import junit.framework.Test; import junit.framework.TestCase;