From a16e41c2c8dbb187f1820e8f69374720b42ff620 Mon Sep 17 00:00:00 2001 From: Li Shengzhao Date: Mon, 16 Nov 2015 22:09:12 +0800 Subject: [PATCH] 00064 Change package to org.monkeyk.sos --- pom.xml | 2 +- .../monkeyk/sos}/domain/AbstractDomain.java | 6 +++--- .../sos}/domain/dto/OauthClientDetailsDto.java | 6 +++--- .../monkeyk/sos}/domain/dto/UserJsonDto.java | 6 +++--- .../domain/oauth/CustomJdbcClientDetailsService.java | 2 +- .../sos}/domain/oauth/OauthClientDetails.java | 4 ++-- .../monkeyk/sos}/domain/oauth/OauthRepository.java | 4 ++-- .../monkeyk/sos}/domain/shared/GuidGenerator.java | 2 +- .../monkeyk/sos}/domain/shared/Repository.java | 2 +- .../sos}/domain/shared/security/WdcyUserDetails.java | 6 +++--- .../monkeyk/sos}/domain/user/Privilege.java | 2 +- .../wdcy => com/monkeyk/sos}/domain/user/User.java | 5 ++--- .../monkeyk/sos}/domain/user/UserRepository.java | 4 ++-- .../monkeyk/sos}/infrastructure/DateUtils.java | 2 +- .../jdbc/OauthClientDetailsRowMapper.java | 4 ++-- .../infrastructure/jdbc/OauthRepositoryJdbc.java | 8 +++----- .../sos}/infrastructure/jdbc/UserRepositoryJdbc.java | 8 ++++---- .../sos}/infrastructure/jdbc/UserRowMapper.java | 4 ++-- .../monkeyk/sos}/service/OauthService.java | 6 +++--- .../monkeyk/sos}/service/UserService.java | 4 ++-- .../monkeyk/sos}/service/impl/OauthServiceImpl.java | 10 +++++----- .../monkeyk/sos}/service/impl/UserServiceImpl.java | 12 ++++++------ .../{cc/wdcy => com/monkeyk/sos}/web/WebUtils.java | 2 +- .../sos}/web/controller/ClientDetailsController.java | 8 ++++---- .../monkeyk/sos}/web/controller/UserController.java | 2 +- .../sos}/web/controller/mobile/MobileController.java | 6 +++--- .../sos}/web/controller/unity/UnityController.java | 6 +++--- .../web/oauth/OauthClientDetailsDtoValidator.java | 6 +++--- .../sos}/web/oauth/OauthUserApprovalHandler.java | 6 +++--- src/main/resources/spring/context.xml | 2 +- src/main/resources/spring/security.xml | 4 ++-- src/main/resources/spring/transaction.xml | 2 +- src/main/webapp/WEB-INF/mkk-servlet.xml | 2 +- .../{cc/wdcy => com/monkeyk/sos}/ContextTest.java | 2 +- .../sos}/TestApplicationContextInitializer.java | 2 +- .../sos}/infrastructure/AbstractRepositoryTest.java | 4 ++-- .../infrastructure/jdbc/OauthRepositoryJdbcTest.java | 10 +++++----- .../infrastructure/jdbc/UserRepositoryJdbcTest.java | 9 ++++----- 38 files changed, 89 insertions(+), 93 deletions(-) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/AbstractDomain.java (93%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/dto/OauthClientDetailsDto.java (97%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/dto/UserJsonDto.java (93%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/oauth/CustomJdbcClientDetailsService.java (95%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/oauth/OauthClientDetails.java (98%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/oauth/OauthRepository.java (81%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/shared/GuidGenerator.java (87%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/shared/Repository.java (61%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/shared/security/WdcyUserDetails.java (95%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/user/Privilege.java (75%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/user/User.java (96%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/domain/user/UserRepository.java (72%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/DateUtils.java (95%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/jdbc/OauthClientDetailsRowMapper.java (95%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/jdbc/OauthRepositoryJdbc.java (93%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/jdbc/UserRepositoryJdbc.java (95%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/jdbc/UserRowMapper.java (93%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/service/OauthService.java (73%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/service/UserService.java (71%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/service/impl/OauthServiceImpl.java (84%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/service/impl/UserServiceImpl.java (88%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/web/WebUtils.java (96%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/web/controller/ClientDetailsController.java (92%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/web/controller/UserController.java (90%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/web/controller/mobile/MobileController.java (82%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/web/controller/unity/UnityController.java (82%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/web/oauth/OauthClientDetailsDtoValidator.java (94%) rename src/main/java/{cc/wdcy => com/monkeyk/sos}/web/oauth/OauthUserApprovalHandler.java (88%) rename src/test/java/{cc/wdcy => com/monkeyk/sos}/ContextTest.java (95%) rename src/test/java/{cc/wdcy => com/monkeyk/sos}/TestApplicationContextInitializer.java (96%) rename src/test/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/AbstractRepositoryTest.java (82%) rename src/test/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/jdbc/OauthRepositoryJdbcTest.java (88%) rename src/test/java/{cc/wdcy => com/monkeyk/sos}/infrastructure/jdbc/UserRepositoryJdbcTest.java (92%) diff --git a/pom.xml b/pom.xml index b617be4..f362562 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - wdcy.cc + monkeyk.com spring-oauth-server 0.4-beta spring-oauth-server diff --git a/src/main/java/cc/wdcy/domain/AbstractDomain.java b/src/main/java/com/monkeyk/sos/domain/AbstractDomain.java similarity index 93% rename from src/main/java/cc/wdcy/domain/AbstractDomain.java rename to src/main/java/com/monkeyk/sos/domain/AbstractDomain.java index 4b93f5e..b4e74c5 100644 --- a/src/main/java/cc/wdcy/domain/AbstractDomain.java +++ b/src/main/java/com/monkeyk/sos/domain/AbstractDomain.java @@ -1,7 +1,7 @@ -package cc.wdcy.domain; +package com.monkeyk.sos.domain; -import cc.wdcy.infrastructure.DateUtils; -import cc.wdcy.domain.shared.GuidGenerator; +import com.monkeyk.sos.infrastructure.DateUtils; +import com.monkeyk.sos.domain.shared.GuidGenerator; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/cc/wdcy/domain/dto/OauthClientDetailsDto.java b/src/main/java/com/monkeyk/sos/domain/dto/OauthClientDetailsDto.java similarity index 97% rename from src/main/java/cc/wdcy/domain/dto/OauthClientDetailsDto.java rename to src/main/java/com/monkeyk/sos/domain/dto/OauthClientDetailsDto.java index 1815032..137c0bd 100644 --- a/src/main/java/cc/wdcy/domain/dto/OauthClientDetailsDto.java +++ b/src/main/java/com/monkeyk/sos/domain/dto/OauthClientDetailsDto.java @@ -1,7 +1,7 @@ -package cc.wdcy.domain.dto; +package com.monkeyk.sos.domain.dto; -import cc.wdcy.domain.oauth.OauthClientDetails; -import cc.wdcy.infrastructure.DateUtils; +import com.monkeyk.sos.domain.oauth.OauthClientDetails; +import com.monkeyk.sos.infrastructure.DateUtils; import org.apache.commons.lang.StringUtils; import java.io.Serializable; diff --git a/src/main/java/cc/wdcy/domain/dto/UserJsonDto.java b/src/main/java/com/monkeyk/sos/domain/dto/UserJsonDto.java similarity index 93% rename from src/main/java/cc/wdcy/domain/dto/UserJsonDto.java rename to src/main/java/com/monkeyk/sos/domain/dto/UserJsonDto.java index ebfbeb2..c647908 100644 --- a/src/main/java/cc/wdcy/domain/dto/UserJsonDto.java +++ b/src/main/java/com/monkeyk/sos/domain/dto/UserJsonDto.java @@ -1,7 +1,7 @@ -package cc.wdcy.domain.dto; +package com.monkeyk.sos.domain.dto; -import cc.wdcy.domain.user.Privilege; -import cc.wdcy.domain.user.User; +import com.monkeyk.sos.domain.user.Privilege; +import com.monkeyk.sos.domain.user.User; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/cc/wdcy/domain/oauth/CustomJdbcClientDetailsService.java b/src/main/java/com/monkeyk/sos/domain/oauth/CustomJdbcClientDetailsService.java similarity index 95% rename from src/main/java/cc/wdcy/domain/oauth/CustomJdbcClientDetailsService.java rename to src/main/java/com/monkeyk/sos/domain/oauth/CustomJdbcClientDetailsService.java index 739d10b..9ccfca3 100644 --- a/src/main/java/cc/wdcy/domain/oauth/CustomJdbcClientDetailsService.java +++ b/src/main/java/com/monkeyk/sos/domain/oauth/CustomJdbcClientDetailsService.java @@ -1,4 +1,4 @@ -package cc.wdcy.domain.oauth; +package com.monkeyk.sos.domain.oauth; import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService; diff --git a/src/main/java/cc/wdcy/domain/oauth/OauthClientDetails.java b/src/main/java/com/monkeyk/sos/domain/oauth/OauthClientDetails.java similarity index 98% rename from src/main/java/cc/wdcy/domain/oauth/OauthClientDetails.java rename to src/main/java/com/monkeyk/sos/domain/oauth/OauthClientDetails.java index b5e6efb..a64ffae 100644 --- a/src/main/java/cc/wdcy/domain/oauth/OauthClientDetails.java +++ b/src/main/java/com/monkeyk/sos/domain/oauth/OauthClientDetails.java @@ -1,6 +1,6 @@ -package cc.wdcy.domain.oauth; +package com.monkeyk.sos.domain.oauth; -import cc.wdcy.infrastructure.DateUtils; +import com.monkeyk.sos.infrastructure.DateUtils; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/cc/wdcy/domain/oauth/OauthRepository.java b/src/main/java/com/monkeyk/sos/domain/oauth/OauthRepository.java similarity index 81% rename from src/main/java/cc/wdcy/domain/oauth/OauthRepository.java rename to src/main/java/com/monkeyk/sos/domain/oauth/OauthRepository.java index 4e20adb..ebdd100 100644 --- a/src/main/java/cc/wdcy/domain/oauth/OauthRepository.java +++ b/src/main/java/com/monkeyk/sos/domain/oauth/OauthRepository.java @@ -1,6 +1,6 @@ -package cc.wdcy.domain.oauth; +package com.monkeyk.sos.domain.oauth; -import cc.wdcy.domain.shared.Repository; +import com.monkeyk.sos.domain.shared.Repository; import java.util.List; diff --git a/src/main/java/cc/wdcy/domain/shared/GuidGenerator.java b/src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java similarity index 87% rename from src/main/java/cc/wdcy/domain/shared/GuidGenerator.java rename to src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java index 35307af..799ac54 100644 --- a/src/main/java/cc/wdcy/domain/shared/GuidGenerator.java +++ b/src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java @@ -1,4 +1,4 @@ -package cc.wdcy.domain.shared; +package com.monkeyk.sos.domain.shared; import java.util.UUID; diff --git a/src/main/java/cc/wdcy/domain/shared/Repository.java b/src/main/java/com/monkeyk/sos/domain/shared/Repository.java similarity index 61% rename from src/main/java/cc/wdcy/domain/shared/Repository.java rename to src/main/java/com/monkeyk/sos/domain/shared/Repository.java index 4270de1..6e49081 100644 --- a/src/main/java/cc/wdcy/domain/shared/Repository.java +++ b/src/main/java/com/monkeyk/sos/domain/shared/Repository.java @@ -1,4 +1,4 @@ -package cc.wdcy.domain.shared; +package com.monkeyk.sos.domain.shared; /** * @author Shengzhao Li diff --git a/src/main/java/cc/wdcy/domain/shared/security/WdcyUserDetails.java b/src/main/java/com/monkeyk/sos/domain/shared/security/WdcyUserDetails.java similarity index 95% rename from src/main/java/cc/wdcy/domain/shared/security/WdcyUserDetails.java rename to src/main/java/com/monkeyk/sos/domain/shared/security/WdcyUserDetails.java index 2ab5223..a22bbd3 100644 --- a/src/main/java/cc/wdcy/domain/shared/security/WdcyUserDetails.java +++ b/src/main/java/com/monkeyk/sos/domain/shared/security/WdcyUserDetails.java @@ -1,7 +1,7 @@ -package cc.wdcy.domain.shared.security; +package com.monkeyk.sos.domain.shared.security; -import cc.wdcy.domain.user.Privilege; -import cc.wdcy.domain.user.User; +import com.monkeyk.sos.domain.user.Privilege; +import com.monkeyk.sos.domain.user.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/cc/wdcy/domain/user/Privilege.java b/src/main/java/com/monkeyk/sos/domain/user/Privilege.java similarity index 75% rename from src/main/java/cc/wdcy/domain/user/Privilege.java rename to src/main/java/com/monkeyk/sos/domain/user/Privilege.java index 880d570..d11eab7 100644 --- a/src/main/java/cc/wdcy/domain/user/Privilege.java +++ b/src/main/java/com/monkeyk/sos/domain/user/Privilege.java @@ -1,4 +1,4 @@ -package cc.wdcy.domain.user; +package com.monkeyk.sos.domain.user; /** * @author Shengzhao Li diff --git a/src/main/java/cc/wdcy/domain/user/User.java b/src/main/java/com/monkeyk/sos/domain/user/User.java similarity index 96% rename from src/main/java/cc/wdcy/domain/user/User.java rename to src/main/java/com/monkeyk/sos/domain/user/User.java index deb20ba..d9641e0 100644 --- a/src/main/java/cc/wdcy/domain/user/User.java +++ b/src/main/java/com/monkeyk/sos/domain/user/User.java @@ -1,8 +1,7 @@ -package cc.wdcy.domain.user; +package com.monkeyk.sos.domain.user; -import cc.wdcy.domain.AbstractDomain; +import com.monkeyk.sos.domain.AbstractDomain; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/cc/wdcy/domain/user/UserRepository.java b/src/main/java/com/monkeyk/sos/domain/user/UserRepository.java similarity index 72% rename from src/main/java/cc/wdcy/domain/user/UserRepository.java rename to src/main/java/com/monkeyk/sos/domain/user/UserRepository.java index 237ad4a..80ea747 100644 --- a/src/main/java/cc/wdcy/domain/user/UserRepository.java +++ b/src/main/java/com/monkeyk/sos/domain/user/UserRepository.java @@ -1,6 +1,6 @@ -package cc.wdcy.domain.user; +package com.monkeyk.sos.domain.user; -import cc.wdcy.domain.shared.Repository; +import com.monkeyk.sos.domain.shared.Repository; /** * @author Shengzhao Li diff --git a/src/main/java/cc/wdcy/infrastructure/DateUtils.java b/src/main/java/com/monkeyk/sos/infrastructure/DateUtils.java similarity index 95% rename from src/main/java/cc/wdcy/infrastructure/DateUtils.java rename to src/main/java/com/monkeyk/sos/infrastructure/DateUtils.java index 96c0414..7f1f92f 100644 --- a/src/main/java/cc/wdcy/infrastructure/DateUtils.java +++ b/src/main/java/com/monkeyk/sos/infrastructure/DateUtils.java @@ -1,4 +1,4 @@ -package cc.wdcy.infrastructure; +package com.monkeyk.sos.infrastructure; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/cc/wdcy/infrastructure/jdbc/OauthClientDetailsRowMapper.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthClientDetailsRowMapper.java similarity index 95% rename from src/main/java/cc/wdcy/infrastructure/jdbc/OauthClientDetailsRowMapper.java rename to src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthClientDetailsRowMapper.java index 5134c3d..607e743 100644 --- a/src/main/java/cc/wdcy/infrastructure/jdbc/OauthClientDetailsRowMapper.java +++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthClientDetailsRowMapper.java @@ -9,9 +9,9 @@ * it only in accordance with the terms of the license agreement you * entered into with MONKEYK Information Technology Co. Ltd. */ -package cc.wdcy.infrastructure.jdbc; +package com.monkeyk.sos.infrastructure.jdbc; -import cc.wdcy.domain.oauth.OauthClientDetails; +import com.monkeyk.sos.domain.oauth.OauthClientDetails; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/src/main/java/cc/wdcy/infrastructure/jdbc/OauthRepositoryJdbc.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbc.java similarity index 93% rename from src/main/java/cc/wdcy/infrastructure/jdbc/OauthRepositoryJdbc.java rename to src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbc.java index 0ea06a0..aa61918 100644 --- a/src/main/java/cc/wdcy/infrastructure/jdbc/OauthRepositoryJdbc.java +++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbc.java @@ -9,14 +9,12 @@ * it only in accordance with the terms of the license agreement you * entered into with MONKEYK Information Technology Co. Ltd. */ -package cc.wdcy.infrastructure.jdbc; +package com.monkeyk.sos.infrastructure.jdbc; -import cc.wdcy.domain.oauth.OauthClientDetails; -import cc.wdcy.domain.oauth.OauthRepository; +import com.monkeyk.sos.domain.oauth.OauthClientDetails; +import com.monkeyk.sos.domain.oauth.OauthRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.PreparedStatementCallback; import org.springframework.jdbc.core.PreparedStatementSetter; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cc/wdcy/infrastructure/jdbc/UserRepositoryJdbc.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbc.java similarity index 95% rename from src/main/java/cc/wdcy/infrastructure/jdbc/UserRepositoryJdbc.java rename to src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbc.java index 6a7477e..f6b8c6e 100644 --- a/src/main/java/cc/wdcy/infrastructure/jdbc/UserRepositoryJdbc.java +++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbc.java @@ -9,11 +9,11 @@ * it only in accordance with the terms of the license agreement you * entered into with MONKEYK Information Technology Co. Ltd. */ -package cc.wdcy.infrastructure.jdbc; +package com.monkeyk.sos.infrastructure.jdbc; -import cc.wdcy.domain.user.Privilege; -import cc.wdcy.domain.user.User; -import cc.wdcy.domain.user.UserRepository; +import com.monkeyk.sos.domain.user.Privilege; +import com.monkeyk.sos.domain.user.User; +import com.monkeyk.sos.domain.user.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.PreparedStatementSetter; diff --git a/src/main/java/cc/wdcy/infrastructure/jdbc/UserRowMapper.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRowMapper.java similarity index 93% rename from src/main/java/cc/wdcy/infrastructure/jdbc/UserRowMapper.java rename to src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRowMapper.java index 43eeee4..9b98bbf 100644 --- a/src/main/java/cc/wdcy/infrastructure/jdbc/UserRowMapper.java +++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRowMapper.java @@ -9,9 +9,9 @@ * it only in accordance with the terms of the license agreement you * entered into with MONKEYK Information Technology Co. Ltd. */ -package cc.wdcy.infrastructure.jdbc; +package com.monkeyk.sos.infrastructure.jdbc; -import cc.wdcy.domain.user.User; +import com.monkeyk.sos.domain.user.User; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/src/main/java/cc/wdcy/service/OauthService.java b/src/main/java/com/monkeyk/sos/service/OauthService.java similarity index 73% rename from src/main/java/cc/wdcy/service/OauthService.java rename to src/main/java/com/monkeyk/sos/service/OauthService.java index 61e2d38..37fcb7d 100644 --- a/src/main/java/cc/wdcy/service/OauthService.java +++ b/src/main/java/com/monkeyk/sos/service/OauthService.java @@ -1,7 +1,7 @@ -package cc.wdcy.service; +package com.monkeyk.sos.service; -import cc.wdcy.domain.dto.OauthClientDetailsDto; -import cc.wdcy.domain.oauth.OauthClientDetails; +import com.monkeyk.sos.domain.dto.OauthClientDetailsDto; +import com.monkeyk.sos.domain.oauth.OauthClientDetails; import java.util.List; diff --git a/src/main/java/cc/wdcy/service/UserService.java b/src/main/java/com/monkeyk/sos/service/UserService.java similarity index 71% rename from src/main/java/cc/wdcy/service/UserService.java rename to src/main/java/com/monkeyk/sos/service/UserService.java index 1ea5f22..e27e6b6 100644 --- a/src/main/java/cc/wdcy/service/UserService.java +++ b/src/main/java/com/monkeyk/sos/service/UserService.java @@ -1,6 +1,6 @@ -package cc.wdcy.service; +package com.monkeyk.sos.service; -import cc.wdcy.domain.dto.UserJsonDto; +import com.monkeyk.sos.domain.dto.UserJsonDto; import org.springframework.security.core.userdetails.UserDetailsService; /** diff --git a/src/main/java/cc/wdcy/service/impl/OauthServiceImpl.java b/src/main/java/com/monkeyk/sos/service/impl/OauthServiceImpl.java similarity index 84% rename from src/main/java/cc/wdcy/service/impl/OauthServiceImpl.java rename to src/main/java/com/monkeyk/sos/service/impl/OauthServiceImpl.java index f81a9c4..ca5ad2d 100644 --- a/src/main/java/cc/wdcy/service/impl/OauthServiceImpl.java +++ b/src/main/java/com/monkeyk/sos/service/impl/OauthServiceImpl.java @@ -1,9 +1,9 @@ -package cc.wdcy.service.impl; +package com.monkeyk.sos.service.impl; -import cc.wdcy.domain.dto.OauthClientDetailsDto; -import cc.wdcy.domain.oauth.OauthClientDetails; -import cc.wdcy.domain.oauth.OauthRepository; -import cc.wdcy.service.OauthService; +import com.monkeyk.sos.domain.dto.OauthClientDetailsDto; +import com.monkeyk.sos.domain.oauth.OauthClientDetails; +import com.monkeyk.sos.domain.oauth.OauthRepository; +import com.monkeyk.sos.service.OauthService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cc/wdcy/service/impl/UserServiceImpl.java b/src/main/java/com/monkeyk/sos/service/impl/UserServiceImpl.java similarity index 88% rename from src/main/java/cc/wdcy/service/impl/UserServiceImpl.java rename to src/main/java/com/monkeyk/sos/service/impl/UserServiceImpl.java index 9b93364..6b9cf1f 100644 --- a/src/main/java/cc/wdcy/service/impl/UserServiceImpl.java +++ b/src/main/java/com/monkeyk/sos/service/impl/UserServiceImpl.java @@ -1,10 +1,10 @@ -package cc.wdcy.service.impl; +package com.monkeyk.sos.service.impl; -import cc.wdcy.domain.dto.UserJsonDto; -import cc.wdcy.domain.shared.security.WdcyUserDetails; -import cc.wdcy.domain.user.User; -import cc.wdcy.domain.user.UserRepository; -import cc.wdcy.service.UserService; +import com.monkeyk.sos.domain.dto.UserJsonDto; +import com.monkeyk.sos.domain.shared.security.WdcyUserDetails; +import com.monkeyk.sos.domain.user.User; +import com.monkeyk.sos.domain.user.UserRepository; +import com.monkeyk.sos.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/cc/wdcy/web/WebUtils.java b/src/main/java/com/monkeyk/sos/web/WebUtils.java similarity index 96% rename from src/main/java/cc/wdcy/web/WebUtils.java rename to src/main/java/com/monkeyk/sos/web/WebUtils.java index fc1150d..b35f9b6 100644 --- a/src/main/java/cc/wdcy/web/WebUtils.java +++ b/src/main/java/com/monkeyk/sos/web/WebUtils.java @@ -1,4 +1,4 @@ -package cc.wdcy.web; +package com.monkeyk.sos.web; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/cc/wdcy/web/controller/ClientDetailsController.java b/src/main/java/com/monkeyk/sos/web/controller/ClientDetailsController.java similarity index 92% rename from src/main/java/cc/wdcy/web/controller/ClientDetailsController.java rename to src/main/java/com/monkeyk/sos/web/controller/ClientDetailsController.java index 75f562f..e2b59a0 100644 --- a/src/main/java/cc/wdcy/web/controller/ClientDetailsController.java +++ b/src/main/java/com/monkeyk/sos/web/controller/ClientDetailsController.java @@ -1,8 +1,8 @@ -package cc.wdcy.web.controller; +package com.monkeyk.sos.web.controller; -import cc.wdcy.domain.dto.OauthClientDetailsDto; -import cc.wdcy.service.OauthService; -import cc.wdcy.web.oauth.OauthClientDetailsDtoValidator; +import com.monkeyk.sos.domain.dto.OauthClientDetailsDto; +import com.monkeyk.sos.service.OauthService; +import com.monkeyk.sos.web.oauth.OauthClientDetailsDtoValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/cc/wdcy/web/controller/UserController.java b/src/main/java/com/monkeyk/sos/web/controller/UserController.java similarity index 90% rename from src/main/java/cc/wdcy/web/controller/UserController.java rename to src/main/java/com/monkeyk/sos/web/controller/UserController.java index 07a65c1..f39fda8 100644 --- a/src/main/java/cc/wdcy/web/controller/UserController.java +++ b/src/main/java/com/monkeyk/sos/web/controller/UserController.java @@ -1,4 +1,4 @@ -package cc.wdcy.web.controller; +package com.monkeyk.sos.web.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/cc/wdcy/web/controller/mobile/MobileController.java b/src/main/java/com/monkeyk/sos/web/controller/mobile/MobileController.java similarity index 82% rename from src/main/java/cc/wdcy/web/controller/mobile/MobileController.java rename to src/main/java/com/monkeyk/sos/web/controller/mobile/MobileController.java index 4098a0d..ee4866c 100644 --- a/src/main/java/cc/wdcy/web/controller/mobile/MobileController.java +++ b/src/main/java/com/monkeyk/sos/web/controller/mobile/MobileController.java @@ -1,7 +1,7 @@ -package cc.wdcy.web.controller.mobile; +package com.monkeyk.sos.web.controller.mobile; -import cc.wdcy.domain.dto.UserJsonDto; -import cc.wdcy.service.UserService; +import com.monkeyk.sos.domain.dto.UserJsonDto; +import com.monkeyk.sos.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/cc/wdcy/web/controller/unity/UnityController.java b/src/main/java/com/monkeyk/sos/web/controller/unity/UnityController.java similarity index 82% rename from src/main/java/cc/wdcy/web/controller/unity/UnityController.java rename to src/main/java/com/monkeyk/sos/web/controller/unity/UnityController.java index 8a28393..e509747 100644 --- a/src/main/java/cc/wdcy/web/controller/unity/UnityController.java +++ b/src/main/java/com/monkeyk/sos/web/controller/unity/UnityController.java @@ -1,7 +1,7 @@ -package cc.wdcy.web.controller.unity; +package com.monkeyk.sos.web.controller.unity; -import cc.wdcy.domain.dto.UserJsonDto; -import cc.wdcy.service.UserService; +import com.monkeyk.sos.domain.dto.UserJsonDto; +import com.monkeyk.sos.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/cc/wdcy/web/oauth/OauthClientDetailsDtoValidator.java b/src/main/java/com/monkeyk/sos/web/oauth/OauthClientDetailsDtoValidator.java similarity index 94% rename from src/main/java/cc/wdcy/web/oauth/OauthClientDetailsDtoValidator.java rename to src/main/java/com/monkeyk/sos/web/oauth/OauthClientDetailsDtoValidator.java index 02433b2..37e7f8b 100644 --- a/src/main/java/cc/wdcy/web/oauth/OauthClientDetailsDtoValidator.java +++ b/src/main/java/com/monkeyk/sos/web/oauth/OauthClientDetailsDtoValidator.java @@ -1,7 +1,7 @@ -package cc.wdcy.web.oauth; +package com.monkeyk.sos.web.oauth; -import cc.wdcy.domain.dto.OauthClientDetailsDto; -import cc.wdcy.service.OauthService; +import com.monkeyk.sos.domain.dto.OauthClientDetailsDto; +import com.monkeyk.sos.service.OauthService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/cc/wdcy/web/oauth/OauthUserApprovalHandler.java b/src/main/java/com/monkeyk/sos/web/oauth/OauthUserApprovalHandler.java similarity index 88% rename from src/main/java/cc/wdcy/web/oauth/OauthUserApprovalHandler.java rename to src/main/java/com/monkeyk/sos/web/oauth/OauthUserApprovalHandler.java index 5946870..2b4e114 100644 --- a/src/main/java/cc/wdcy/web/oauth/OauthUserApprovalHandler.java +++ b/src/main/java/com/monkeyk/sos/web/oauth/OauthUserApprovalHandler.java @@ -1,7 +1,7 @@ -package cc.wdcy.web.oauth; +package com.monkeyk.sos.web.oauth; -import cc.wdcy.domain.oauth.OauthClientDetails; -import cc.wdcy.service.OauthService; +import com.monkeyk.sos.domain.oauth.OauthClientDetails; +import com.monkeyk.sos.service.OauthService; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.provider.AuthorizationRequest; import org.springframework.security.oauth2.provider.approval.TokenStoreUserApprovalHandler; diff --git a/src/main/resources/spring/context.xml b/src/main/resources/spring/context.xml index 65b850e..49acc1a 100644 --- a/src/main/resources/spring/context.xml +++ b/src/main/resources/spring/context.xml @@ -10,7 +10,7 @@ - + diff --git a/src/main/resources/spring/security.xml b/src/main/resources/spring/security.xml index 16744ba..7f245ad 100644 --- a/src/main/resources/spring/security.xml +++ b/src/main/resources/spring/security.xml @@ -83,7 +83,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/src/main/resources/spring/transaction.xml b/src/main/resources/spring/transaction.xml index f5a7100..7fe1d9e 100644 --- a/src/main/resources/spring/transaction.xml +++ b/src/main/resources/spring/transaction.xml @@ -7,7 +7,7 @@ - + diff --git a/src/main/webapp/WEB-INF/mkk-servlet.xml b/src/main/webapp/WEB-INF/mkk-servlet.xml index a9f0986..6247294 100644 --- a/src/main/webapp/WEB-INF/mkk-servlet.xml +++ b/src/main/webapp/WEB-INF/mkk-servlet.xml @@ -12,7 +12,7 @@ - + diff --git a/src/test/java/cc/wdcy/ContextTest.java b/src/test/java/com/monkeyk/sos/ContextTest.java similarity index 95% rename from src/test/java/cc/wdcy/ContextTest.java rename to src/test/java/com/monkeyk/sos/ContextTest.java index 12b5400..efc0438 100644 --- a/src/test/java/cc/wdcy/ContextTest.java +++ b/src/test/java/com/monkeyk/sos/ContextTest.java @@ -1,4 +1,4 @@ -package cc.wdcy; +package com.monkeyk.sos; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests; diff --git a/src/test/java/cc/wdcy/TestApplicationContextInitializer.java b/src/test/java/com/monkeyk/sos/TestApplicationContextInitializer.java similarity index 96% rename from src/test/java/cc/wdcy/TestApplicationContextInitializer.java rename to src/test/java/com/monkeyk/sos/TestApplicationContextInitializer.java index 6a6d11c..9f63aec 100644 --- a/src/test/java/cc/wdcy/TestApplicationContextInitializer.java +++ b/src/test/java/com/monkeyk/sos/TestApplicationContextInitializer.java @@ -1,4 +1,4 @@ -package cc.wdcy; +package com.monkeyk.sos; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.context.ApplicationContextInitializer; diff --git a/src/test/java/cc/wdcy/infrastructure/AbstractRepositoryTest.java b/src/test/java/com/monkeyk/sos/infrastructure/AbstractRepositoryTest.java similarity index 82% rename from src/test/java/cc/wdcy/infrastructure/AbstractRepositoryTest.java rename to src/test/java/com/monkeyk/sos/infrastructure/AbstractRepositoryTest.java index 91cb6da..9608b36 100644 --- a/src/test/java/cc/wdcy/infrastructure/AbstractRepositoryTest.java +++ b/src/test/java/com/monkeyk/sos/infrastructure/AbstractRepositoryTest.java @@ -1,6 +1,6 @@ -package cc.wdcy.infrastructure; +package com.monkeyk.sos.infrastructure; -import cc.wdcy.ContextTest; +import com.monkeyk.sos.ContextTest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/test/java/cc/wdcy/infrastructure/jdbc/OauthRepositoryJdbcTest.java b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java similarity index 88% rename from src/test/java/cc/wdcy/infrastructure/jdbc/OauthRepositoryJdbcTest.java rename to src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java index ae02cc7..b6a2f9f 100644 --- a/src/test/java/cc/wdcy/infrastructure/jdbc/OauthRepositoryJdbcTest.java +++ b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java @@ -9,12 +9,12 @@ * it only in accordance with the terms of the license agreement you * entered into with MONKEYK Information Technology Co. Ltd. */ -package cc.wdcy.infrastructure.jdbc; +package com.monkeyk.sos.infrastructure.jdbc; -import cc.wdcy.domain.oauth.OauthClientDetails; -import cc.wdcy.domain.oauth.OauthRepository; -import cc.wdcy.domain.shared.GuidGenerator; -import cc.wdcy.infrastructure.AbstractRepositoryTest; +import com.monkeyk.sos.domain.oauth.OauthClientDetails; +import com.monkeyk.sos.domain.oauth.OauthRepository; +import com.monkeyk.sos.domain.shared.GuidGenerator; +import com.monkeyk.sos.infrastructure.AbstractRepositoryTest; import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; diff --git a/src/test/java/cc/wdcy/infrastructure/jdbc/UserRepositoryJdbcTest.java b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java similarity index 92% rename from src/test/java/cc/wdcy/infrastructure/jdbc/UserRepositoryJdbcTest.java rename to src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java index e6690b7..45ecd4d 100644 --- a/src/test/java/cc/wdcy/infrastructure/jdbc/UserRepositoryJdbcTest.java +++ b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java @@ -9,15 +9,14 @@ * it only in accordance with the terms of the license agreement you * entered into with MONKEYK Information Technology Co. Ltd. */ -package cc.wdcy.infrastructure.jdbc; +package com.monkeyk.sos.infrastructure.jdbc; -import cc.wdcy.domain.user.User; -import cc.wdcy.domain.user.UserRepository; -import cc.wdcy.infrastructure.AbstractRepositoryTest; +import com.monkeyk.sos.domain.user.User; +import com.monkeyk.sos.domain.user.UserRepository; +import com.monkeyk.sos.infrastructure.AbstractRepositoryTest; import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; -import static org.testng.Assert.*; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertNull;