You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/11/30 08:41:28 UTC
[servicecomb-fence] branch master updated: [SCB-2739]refactor project artifacts and groups ids (#42)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-fence.git
The following commit(s) were added to refs/heads/master by this push:
new b186175 [SCB-2739]refactor project artifacts and groups ids (#42)
b186175 is described below
commit b1861757d5af3e01023bf14e6dac1e62d962c994
Author: liubao68 <bi...@qq.com>
AuthorDate: Wed Nov 30 16:41:23 2022 +0800
[SCB-2739]refactor project artifacts and groups ids (#42)
---
api/authentication-server/endpoint/pom.xml | 6 +++---
.../server/GithubAccessTokenResponse.java | 2 +-
.../server/GithubDynamicProperties.java | 2 +-
.../server/GithubDynamicPropertiesManager.java | 2 +-
.../{authentication => fence}/server/GithubOAuthService.java | 2 +-
.../server/GithubOAuthServiceRegister.java | 2 +-
.../{authentication => fence}/server/GithubTokenGranter.java | 8 ++++----
.../server/PasswordTokenGranter.java | 8 ++++----
.../server/RefreshTokenTokenGranter.java | 10 +++++-----
.../server/ThirdPartyProviderEndpoint.java | 2 +-
.../server/ThirdPartyTokenGranter.java | 4 ++--
.../{authentication => fence}/server/TokenEndpoint.java | 8 ++++----
.../{authentication => fence}/server/TokenGranter.java | 4 ++--
api/authentication-server/pom.xml | 2 +-
api/authentication-server/service/pom.xml | 4 ++--
.../server/AuthenticationServerConstants.java | 2 +-
.../server/ThirdPartyProviderService.java | 2 +-
.../{authentication => fence}/server/TokenService.java | 4 ++--
api/common/endpoint/pom.xml | 4 ++--
.../token/TokenStoreConfiguration.java | 4 ++--
api/common/pom.xml | 2 +-
api/common/service/pom.xml | 2 +-
.../servicecomb/{authentication => fence}/jwt/JWTClaims.java | 2 +-
.../{authentication => fence}/jwt/JWTClaimsCommon.java | 2 +-
.../servicecomb/{authentication => fence}/jwt/JWTHeader.java | 2 +-
.../{authentication => fence}/jwt/JsonParser.java | 2 +-
.../token/AbstractOpenIDTokenStore.java | 4 ++--
.../token/InMemoryOpenIDTokenStore.java | 2 +-
.../{authentication => fence}/token/JWTToken.java | 6 +++---
.../{authentication => fence}/token/JWTTokenStore.java | 2 +-
.../{authentication => fence}/token/JWTTokenStoreImpl.java | 6 +++---
.../{authentication => fence}/token/OpenIDToken.java | 2 +-
.../{authentication => fence}/token/OpenIDTokenStore.java | 2 +-
.../{authentication => fence}/token/SessionToken.java | 2 +-
.../{authentication => fence}/token/SessionTokenStore.java | 2 +-
.../servicecomb/{authentication => fence}/token/Token.java | 2 +-
.../token/TokenDynamicProperties.java | 2 +-
.../token/TokenDynamicPropertiesManager.java | 2 +-
.../{authentication => fence}/token/TokenStore.java | 2 +-
.../{authentication => fence}/util/CommonConstants.java | 2 +-
api/edge-service/endpoint/pom.xml | 8 ++++----
.../{authentication => fence}/edge/AuthHandler.java | 10 +++++-----
.../{authentication => fence}/edge/AuthenticationFilter.java | 4 ++--
.../edge/AuthenticationServerTokenEndpoint.java | 4 ++--
.../{authentication => fence}/edge/EdgeConfiguration.java | 2 +-
.../{authentication => fence}/edge/EdgeOpenIDTokenStore.java | 8 ++++----
.../edge/InternalAccessHandler.java | 2 +-
.../{authentication => fence}/edge/TokenEndpoint.java | 4 ++--
...rg.apache.servicecomb.common.rest.filter.HttpServerFilter | 2 +-
.../endpoint/src/main/resources/config/cse.handler.xml | 4 ++--
api/edge-service/pom.xml | 2 +-
api/edge-service/service/pom.xml | 6 +++---
.../{authentication => fence}/edge/TokenResponse.java | 4 ++--
.../{authentication => fence}/edge/TokenService.java | 2 +-
api/pom.xml | 4 ++--
api/resource-server/endpoint/pom.xml | 4 ++--
...sDeniedExceptionExceptionToProducerResponseConverter.java | 2 +-
.../resource/AccessDynamicProperties.java | 2 +-
.../resource/AccessDynamicPropertiesManager.java | 2 +-
.../{authentication => fence}/resource/AuthFilter.java | 2 +-
.../{authentication => fence}/resource/AuthFiltersBean.java | 2 +-
.../resource/AuthenticationAuthFilter.java | 8 ++++----
.../resource/ConfigBasedAuthoriaztionAuthFilter.java | 2 +-
.../resource/ResourceAuthHandler.java | 2 +-
.../resource/SimpleAuthentication.java | 2 +-
...invocation.exception.ExceptionToProducerResponseConverter | 2 +-
.../endpoint/src/main/resources/config/cse.handler.xml | 2 +-
api/resource-server/pom.xml | 2 +-
api/resource-server/service/pom.xml | 6 +++---
authentication-server/pom.xml | 12 ++++++------
.../AuthenticationServerApplication.java} | 6 +++---
.../authentication/AuthenticationConfiguration.java | 4 ++--
.../{ => fence}/authentication/JDBCOpenIDTokenStore.java | 12 ++++++------
.../{ => fence}/authentication/JDBCUserDetails.java | 4 ++--
.../{ => fence}/authentication/JDBCUserDetailsManager.java | 8 ++++----
.../{ => fence}/authentication/user/TokenMapper.java | 2 +-
.../{ => fence}/authentication/user/UserInfo.java | 2 +-
.../{ => fence}/authentication/user/UserMapper.java | 2 +-
.../resources/META-INF/spring/authentication.server.bean.xml | 4 ++--
.../src/main/resources/config/TokenMapper.xml | 2 +-
.../src/main/resources/config/UserMapper.xml | 4 ++--
build_and_run.bat | 2 +-
docs/zh_CN/developersGuide.md | 6 +++---
edge-service/pom.xml | 10 +++++-----
.../EdgeServiceApplication.java} | 6 +++---
.../gateway => fence/edge}/AuthenticationConfiguration.java | 8 ++++----
.../gateway => fence/edge}/EdgeSSLCustom.java | 2 +-
.../gateway => fence/edge}/StaticWebpageDispatcher.java | 2 +-
...ache.servicecomb.transport.rest.vertx.VertxHttpDispatcher | 2 +-
integration-tests/pom.xml | 11 +++++------
.../{authentication => fence}/AuthenticationClientMain.java | 4 ++--
.../tests}/AuthenticationTestCase.java | 6 +++---
.../{authentication => fence/tests}/BootEventListener.java | 2 +-
.../{authentication => fence/tests}/GateRestTemplate.java | 2 +-
.../tests}/ITUriTemplateHandler.java | 2 +-
.../{authentication => fence/tests}/TestCase.java | 2 +-
.../{authentication => fence/tests}/TestEndpoint.java | 2 +-
.../servicecomb/{authentication => fence/tests}/TestMgr.java | 2 +-
.../{authentication => fence/tests}/TokenExpireTestCase.java | 6 +++---
pom.xml | 4 ++--
resource-server/pom.xml | 8 ++++----
.../ResourceServerApplication.java} | 6 +++---
.../resource/AuthenticationConfiguration.java | 8 ++++----
.../{authentication => fence}/resource/FileEndpoint.java | 2 +-
.../{authentication => fence}/resource/FileStoreService.java | 2 +-
.../resource/HandlerAuthEndpoint.java | 2 +-
.../resource/LocalFileStoreService.java | 2 +-
.../resource/MethodSecurityConfiguration.java | 2 +-
.../resource/PreMethodAuthEndpoint.java | 2 +-
109 files changed, 207 insertions(+), 208 deletions(-)
diff --git a/api/authentication-server/endpoint/pom.xml b/api/authentication-server/endpoint/pom.xml
index a653462..a78e29f 100644
--- a/api/authentication-server/endpoint/pom.xml
+++ b/api/authentication-server/endpoint/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -30,12 +30,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubAccessTokenResponse.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubAccessTokenResponse.java
similarity index 96%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubAccessTokenResponse.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubAccessTokenResponse.java
index 03bb9c5..ce854f1 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubAccessTokenResponse.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubAccessTokenResponse.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
// see: https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps/
public class GithubAccessTokenResponse {
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubDynamicProperties.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubDynamicProperties.java
similarity index 97%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubDynamicProperties.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubDynamicProperties.java
index c61f0a7..25f4aab 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubDynamicProperties.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubDynamicProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import org.apache.servicecomb.config.inject.InjectProperties;
import org.apache.servicecomb.config.inject.InjectProperty;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubDynamicPropertiesManager.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubDynamicPropertiesManager.java
similarity index 96%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubDynamicPropertiesManager.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubDynamicPropertiesManager.java
index 2eccf3a..a8945a7 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubDynamicPropertiesManager.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubDynamicPropertiesManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.Map;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubOAuthService.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubOAuthService.java
similarity index 96%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubOAuthService.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubOAuthService.java
index 09734c9..6a82fa0 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubOAuthService.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubOAuthService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import javax.ws.rs.FormParam;
import javax.ws.rs.POST;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubOAuthServiceRegister.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubOAuthServiceRegister.java
similarity index 96%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubOAuthServiceRegister.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubOAuthServiceRegister.java
index 67573bc..cc30c12 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubOAuthServiceRegister.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubOAuthServiceRegister.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import org.apache.servicecomb.provider.pojo.registry.ThirdServiceWithInvokerRegister;
import org.springframework.stereotype.Component;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubTokenGranter.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubTokenGranter.java
similarity index 95%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubTokenGranter.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubTokenGranter.java
index 0358fe5..b59248e 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubTokenGranter.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/GithubTokenGranter.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import org.apache.commons.lang3.StringUtils;
-import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
+import org.apache.servicecomb.fence.token.OpenIDToken;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.apache.servicecomb.provider.pojo.RpcReference;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
import org.slf4j.Logger;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/PasswordTokenGranter.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/PasswordTokenGranter.java
similarity index 91%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/PasswordTokenGranter.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/PasswordTokenGranter.java
index 5740bc0..839054c 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/PasswordTokenGranter.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/PasswordTokenGranter.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
+import org.apache.servicecomb.fence.token.OpenIDToken;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/RefreshTokenTokenGranter.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/RefreshTokenTokenGranter.java
similarity index 88%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/RefreshTokenTokenGranter.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/RefreshTokenTokenGranter.java
index 998bb51..e4b4015 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/RefreshTokenTokenGranter.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/RefreshTokenTokenGranter.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
-import org.apache.servicecomb.authentication.token.Token;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
+import org.apache.servicecomb.fence.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.Token;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyProviderEndpoint.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyProviderEndpoint.java
similarity index 97%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyProviderEndpoint.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyProviderEndpoint.java
index f8196a3..27a6ef6 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyProviderEndpoint.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyProviderEndpoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.List;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyTokenGranter.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyTokenGranter.java
similarity index 94%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyTokenGranter.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyTokenGranter.java
index 788d31b..2060a4f 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyTokenGranter.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyTokenGranter.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDToken;
public interface ThirdPartyTokenGranter extends TokenGranter {
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/TokenEndpoint.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/TokenEndpoint.java
similarity index 91%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/TokenEndpoint.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/TokenEndpoint.java
index ee8bbb7..e6a36d1 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/TokenEndpoint.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/TokenEndpoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.List;
import java.util.Map;
@@ -24,9 +24,9 @@ import java.util.concurrent.CompletableFuture;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response.Status;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
-import org.apache.servicecomb.authentication.token.OpenIDTokenStore;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDTokenStore;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/TokenGranter.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/TokenGranter.java
similarity index 91%
rename from api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/TokenGranter.java
rename to api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/TokenGranter.java
index 701958c..5db979c 100644
--- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/TokenGranter.java
+++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/fence/server/TokenGranter.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.Map;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDToken;
/**
* Token granter is used to grant access tokens.
diff --git a/api/authentication-server/pom.xml b/api/authentication-server/pom.xml
index 946a2fb..14d128d 100644
--- a/api/authentication-server/pom.xml
+++ b/api/authentication-server/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/api/authentication-server/service/pom.xml b/api/authentication-server/service/pom.xml
index 8f9b5e2..1666029 100644
--- a/api/authentication-server/service/pom.xml
+++ b/api/authentication-server/service/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/AuthenticationServerConstants.java b/api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/AuthenticationServerConstants.java
similarity index 97%
rename from api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/AuthenticationServerConstants.java
rename to api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/AuthenticationServerConstants.java
index 7b6f219..02ac78b 100644
--- a/api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/AuthenticationServerConstants.java
+++ b/api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/AuthenticationServerConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
public class AuthenticationServerConstants {
public static final String PARAM_GRANT_TYPE = "grant_type";
diff --git a/api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyProviderService.java b/api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyProviderService.java
similarity index 94%
rename from api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyProviderService.java
rename to api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyProviderService.java
index 55dd29e..b278e94 100644
--- a/api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/ThirdPartyProviderService.java
+++ b/api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/ThirdPartyProviderService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
/**
* Connecting third party oAuth providers
diff --git a/api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/TokenService.java b/api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/TokenService.java
similarity index 89%
rename from api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/TokenService.java
rename to api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/TokenService.java
index 2ae3d0f..7827335 100644
--- a/api/authentication-server/service/src/main/java/org/apache/servicecomb/authentication/server/TokenService.java
+++ b/api/authentication-server/service/src/main/java/org/apache/servicecomb/fence/server/TokenService.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.server;
+package org.apache.servicecomb.fence.server;
import java.util.Map;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDToken;
public interface TokenService {
OpenIDToken grantToken(Map<String, String> parameters);
diff --git a/api/common/endpoint/pom.xml b/api/common/endpoint/pom.xml
index 0dbac98..f1b3aba 100644
--- a/api/common/endpoint/pom.xml
+++ b/api/common/endpoint/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/api/common/endpoint/src/main/java/org/apache/servicecomb/authentication/token/TokenStoreConfiguration.java b/api/common/endpoint/src/main/java/org/apache/servicecomb/fence/token/TokenStoreConfiguration.java
similarity index 94%
rename from api/common/endpoint/src/main/java/org/apache/servicecomb/authentication/token/TokenStoreConfiguration.java
rename to api/common/endpoint/src/main/java/org/apache/servicecomb/fence/token/TokenStoreConfiguration.java
index d98aa51..b5a1f79 100644
--- a/api/common/endpoint/src/main/java/org/apache/servicecomb/authentication/token/TokenStoreConfiguration.java
+++ b/api/common/endpoint/src/main/java/org/apache/servicecomb/fence/token/TokenStoreConfiguration.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/api/common/pom.xml b/api/common/pom.xml
index b4a9fbc..9584a88 100644
--- a/api/common/pom.xml
+++ b/api/common/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/api/common/service/pom.xml b/api/common/service/pom.xml
index 66c5f90..f1d134b 100644
--- a/api/common/service/pom.xml
+++ b/api/common/service/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTClaims.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java
similarity index 97%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTClaims.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java
index c62affc..592b5dc 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTClaims.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.jwt;
+package org.apache.servicecomb.fence.jwt;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTClaimsCommon.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaimsCommon.java
similarity index 97%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTClaimsCommon.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaimsCommon.java
index 54e26a5..91996f3 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTClaimsCommon.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaimsCommon.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.jwt;
+package org.apache.servicecomb.fence.jwt;
public class JWTClaimsCommon {
// see: https://tools.ietf.org/html/rfc7519
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTHeader.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java
similarity index 95%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTHeader.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java
index 615d968..d83cf1f 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTHeader.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.jwt;
+package org.apache.servicecomb.fence.jwt;
public class JWTHeader {
//see: https://tools.ietf.org/html/rfc7519
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JsonParser.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java
similarity index 96%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JsonParser.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java
index 2a4bcd1..c983d24 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JsonParser.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.jwt;
+package org.apache.servicecomb.fence.jwt;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/AbstractOpenIDTokenStore.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/AbstractOpenIDTokenStore.java
similarity index 94%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/AbstractOpenIDTokenStore.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/AbstractOpenIDTokenStore.java
index 52eaa74..493cd61 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/AbstractOpenIDTokenStore.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/AbstractOpenIDTokenStore.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/InMemoryOpenIDTokenStore.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/InMemoryOpenIDTokenStore.java
similarity index 97%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/InMemoryOpenIDTokenStore.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/InMemoryOpenIDTokenStore.java
index 0458f29..33a1769 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/InMemoryOpenIDTokenStore.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/InMemoryOpenIDTokenStore.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTToken.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java
similarity index 92%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTToken.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java
index 2ab1183..13721d1 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTToken.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.util.Map;
-import org.apache.servicecomb.authentication.jwt.JWTClaims;
-import org.apache.servicecomb.authentication.jwt.JsonParser;
+import org.apache.servicecomb.fence.jwt.JWTClaims;
+import org.apache.servicecomb.fence.jwt.JsonParser;
import org.springframework.security.jwt.Jwt;
import org.springframework.security.jwt.JwtHelper;
import org.springframework.security.jwt.crypto.sign.Signer;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTTokenStore.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStore.java
similarity index 94%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTTokenStore.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStore.java
index 67e51cc..2498b02 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTTokenStore.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStore.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
public interface JWTTokenStore extends TokenStore<JWTToken> {
public JWTToken createTokenByValue(String value);
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTTokenStoreImpl.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStoreImpl.java
similarity index 93%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTTokenStoreImpl.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStoreImpl.java
index 59dd6c7..bbd6f21 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTTokenStoreImpl.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStoreImpl.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.util.UUID;
-import org.apache.servicecomb.authentication.jwt.JWTClaims;
-import org.apache.servicecomb.authentication.jwt.JsonParser;
+import org.apache.servicecomb.fence.jwt.JWTClaims;
+import org.apache.servicecomb.fence.jwt.JsonParser;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.jwt.Jwt;
import org.springframework.security.jwt.JwtHelper;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/OpenIDToken.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/OpenIDToken.java
similarity index 98%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/OpenIDToken.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/OpenIDToken.java
index c6fc36f..ff6ad79 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/OpenIDToken.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/OpenIDToken.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.util.Map;
import java.util.Set;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/OpenIDTokenStore.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/OpenIDTokenStore.java
similarity index 95%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/OpenIDTokenStore.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/OpenIDTokenStore.java
index e767ddd..c39d2e9 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/OpenIDTokenStore.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/OpenIDTokenStore.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.util.concurrent.CompletableFuture;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/SessionToken.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/SessionToken.java
similarity index 97%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/SessionToken.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/SessionToken.java
index 7050843..8fe65ca 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/SessionToken.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/SessionToken.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.util.HashMap;
import java.util.Map;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/SessionTokenStore.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/SessionTokenStore.java
similarity index 95%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/SessionTokenStore.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/SessionTokenStore.java
index 631f3d7..33dedbd 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/SessionTokenStore.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/SessionTokenStore.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/Token.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/Token.java
similarity index 96%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/Token.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/Token.java
index 8f70398..5376e67 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/Token.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/Token.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.io.Serializable;
import java.util.Map;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenDynamicProperties.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicProperties.java
similarity index 96%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenDynamicProperties.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicProperties.java
index 43b7473..dab35b2 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenDynamicProperties.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import org.apache.servicecomb.config.inject.InjectProperties;
import org.apache.servicecomb.config.inject.InjectProperty;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenDynamicPropertiesManager.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicPropertiesManager.java
similarity index 96%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenDynamicPropertiesManager.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicPropertiesManager.java
index f85e686..6813595 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenDynamicPropertiesManager.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicPropertiesManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import java.util.Map;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenStore.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenStore.java
similarity index 94%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenStore.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenStore.java
index e4b6df1..0fe9169 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/token/TokenStore.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/token/TokenStore.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.token;
+package org.apache.servicecomb.fence.token;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/api/common/service/src/main/java/org/apache/servicecomb/authentication/util/CommonConstants.java b/api/common/service/src/main/java/org/apache/servicecomb/fence/util/CommonConstants.java
similarity index 97%
rename from api/common/service/src/main/java/org/apache/servicecomb/authentication/util/CommonConstants.java
rename to api/common/service/src/main/java/org/apache/servicecomb/fence/util/CommonConstants.java
index dad8891..c14b1ca 100644
--- a/api/common/service/src/main/java/org/apache/servicecomb/authentication/util/CommonConstants.java
+++ b/api/common/service/src/main/java/org/apache/servicecomb/fence/util/CommonConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.util;
+package org.apache.servicecomb.fence.util;
public final class CommonConstants {
public static final String ACCESS_CONTROL_INTERNAL = "INTERNAL";
diff --git a/api/edge-service/endpoint/pom.xml b/api/edge-service/endpoint/pom.xml
index 91691fb..c488b4f 100644
--- a/api/edge-service/endpoint/pom.xml
+++ b/api/edge-service/endpoint/pom.xml
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -25,17 +25,17 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-endpoint</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthHandler.java b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthHandler.java
similarity index 91%
rename from api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthHandler.java
rename to api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthHandler.java
index b91d75f..4ab93cd 100644
--- a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthHandler.java
+++ b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthHandler.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import java.util.concurrent.CompletableFuture;
-import org.apache.servicecomb.authentication.token.JWTToken;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
-import org.apache.servicecomb.authentication.token.OpenIDTokenStore;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.JWTToken;
+import org.apache.servicecomb.fence.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDTokenStore;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.apache.servicecomb.core.Handler;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
diff --git a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthenticationFilter.java b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationFilter.java
similarity index 94%
rename from api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthenticationFilter.java
rename to api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationFilter.java
index 56733c3..9d95200 100644
--- a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthenticationFilter.java
+++ b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationFilter.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.apache.servicecomb.common.rest.filter.HttpServerFilter;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
diff --git a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthenticationServerTokenEndpoint.java b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationServerTokenEndpoint.java
similarity index 92%
rename from api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthenticationServerTokenEndpoint.java
rename to api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationServerTokenEndpoint.java
index 9a29c34..0ce4881 100644
--- a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/AuthenticationServerTokenEndpoint.java
+++ b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationServerTokenEndpoint.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDToken;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/EdgeConfiguration.java b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/EdgeConfiguration.java
similarity index 94%
rename from api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/EdgeConfiguration.java
rename to api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/EdgeConfiguration.java
index bcb48a8..086919b 100644
--- a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/EdgeConfiguration.java
+++ b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/EdgeConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import org.springframework.context.annotation.Configuration;
diff --git a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/EdgeOpenIDTokenStore.java b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/EdgeOpenIDTokenStore.java
similarity index 87%
rename from api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/EdgeOpenIDTokenStore.java
rename to api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/EdgeOpenIDTokenStore.java
index 8d6348f..c73b659 100644
--- a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/EdgeOpenIDTokenStore.java
+++ b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/EdgeOpenIDTokenStore.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import java.util.concurrent.CompletableFuture;
-import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
+import org.apache.servicecomb.fence.token.OpenIDToken;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.apache.servicecomb.provider.pojo.RpcReference;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;
diff --git a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/InternalAccessHandler.java b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/InternalAccessHandler.java
similarity index 96%
rename from api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/InternalAccessHandler.java
rename to api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/InternalAccessHandler.java
index d01620f..db91ead 100644
--- a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/InternalAccessHandler.java
+++ b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/InternalAccessHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import org.apache.servicecomb.core.Handler;
import org.apache.servicecomb.core.Invocation;
diff --git a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/TokenEndpoint.java b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/TokenEndpoint.java
similarity index 94%
rename from api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/TokenEndpoint.java
rename to api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/TokenEndpoint.java
index c454f48..e03a214 100644
--- a/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/authentication/edge/TokenEndpoint.java
+++ b/api/edge-service/endpoint/src/main/java/org/apache/servicecomb/fence/edge/TokenEndpoint.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDToken;
import org.apache.servicecomb.provider.pojo.RpcReference;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.springframework.http.MediaType;
diff --git a/api/edge-service/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.filter.HttpServerFilter b/api/edge-service/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.filter.HttpServerFilter
index 75e40b9..8f706f4 100644
--- a/api/edge-service/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.filter.HttpServerFilter
+++ b/api/edge-service/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.filter.HttpServerFilter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.authentication.edge.AuthenticationFilter
\ No newline at end of file
+org.apache.servicecomb.fence.edge.AuthenticationFilter
\ No newline at end of file
diff --git a/api/edge-service/endpoint/src/main/resources/config/cse.handler.xml b/api/edge-service/endpoint/src/main/resources/config/cse.handler.xml
index 43a5258..dcf10f9 100644
--- a/api/edge-service/endpoint/src/main/resources/config/cse.handler.xml
+++ b/api/edge-service/endpoint/src/main/resources/config/cse.handler.xml
@@ -17,7 +17,7 @@
<config>
<handler id="auth"
- class="org.apache.servicecomb.authentication.edge.AuthHandler" />
+ class="org.apache.servicecomb.fence.edge.AuthHandler" />
<handler id="internalAccess"
- class="org.apache.servicecomb.authentication.edge.InternalAccessHandler" />
+ class="org.apache.servicecomb.fence.edge.InternalAccessHandler" />
</config>
diff --git a/api/edge-service/pom.xml b/api/edge-service/pom.xml
index 24d393b..534cd15 100644
--- a/api/edge-service/pom.xml
+++ b/api/edge-service/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/api/edge-service/service/pom.xml b/api/edge-service/service/pom.xml
index 487f146..7d4f451 100644
--- a/api/edge-service/service/pom.xml
+++ b/api/edge-service/service/pom.xml
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -26,7 +26,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-endpoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/api/edge-service/service/src/main/java/org/apache/servicecomb/authentication/edge/TokenResponse.java b/api/edge-service/service/src/main/java/org/apache/servicecomb/fence/edge/TokenResponse.java
similarity index 96%
rename from api/edge-service/service/src/main/java/org/apache/servicecomb/authentication/edge/TokenResponse.java
rename to api/edge-service/service/src/main/java/org/apache/servicecomb/fence/edge/TokenResponse.java
index 9fc7b67..83eeac0 100644
--- a/api/edge-service/service/src/main/java/org/apache/servicecomb/authentication/edge/TokenResponse.java
+++ b/api/edge-service/service/src/main/java/org/apache/servicecomb/fence/edge/TokenResponse.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import java.util.Map;
import java.util.Set;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
+import org.apache.servicecomb.fence.token.OpenIDToken;
public class TokenResponse {
// Naming conventions https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-00#section-3.1
diff --git a/api/edge-service/service/src/main/java/org/apache/servicecomb/authentication/edge/TokenService.java b/api/edge-service/service/src/main/java/org/apache/servicecomb/fence/edge/TokenService.java
similarity index 94%
rename from api/edge-service/service/src/main/java/org/apache/servicecomb/authentication/edge/TokenService.java
rename to api/edge-service/service/src/main/java/org/apache/servicecomb/fence/edge/TokenService.java
index e279986..68a957a 100644
--- a/api/edge-service/service/src/main/java/org/apache/servicecomb/authentication/edge/TokenService.java
+++ b/api/edge-service/service/src/main/java/org/apache/servicecomb/fence/edge/TokenService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.edge;
+package org.apache.servicecomb.fence.edge;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
diff --git a/api/pom.xml b/api/pom.xml
index 398b086..7b77e63 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
- <artifactId>authentication-parent</artifactId>
+ <groupId>org.apache.servicecomb.fence</groupId>
+ <artifactId>project-fence</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/api/resource-server/endpoint/pom.xml b/api/resource-server/endpoint/pom.xml
index dc5d549..543180c 100644
--- a/api/resource-server/endpoint/pom.xml
+++ b/api/resource-server/endpoint/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-resource-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-resource-api-service</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDeniedExceptionExceptionToProducerResponseConverter.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDeniedExceptionExceptionToProducerResponseConverter.java
similarity index 96%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDeniedExceptionExceptionToProducerResponseConverter.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDeniedExceptionExceptionToProducerResponseConverter.java
index c2decce..0439a39 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDeniedExceptionExceptionToProducerResponseConverter.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDeniedExceptionExceptionToProducerResponseConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDynamicProperties.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicProperties.java
similarity index 95%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDynamicProperties.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicProperties.java
index 87fa951..6424539 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDynamicProperties.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.apache.servicecomb.config.inject.InjectProperties;
import org.apache.servicecomb.config.inject.InjectProperty;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDynamicPropertiesManager.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicPropertiesManager.java
similarity index 96%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDynamicPropertiesManager.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicPropertiesManager.java
index 29b2d78..ae726c6 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AccessDynamicPropertiesManager.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicPropertiesManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import java.util.Map;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthFilter.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthFilter.java
similarity index 94%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthFilter.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthFilter.java
index 22b2436..0405501 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthFilter.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthFilter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthFiltersBean.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthFiltersBean.java
similarity index 96%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthFiltersBean.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthFiltersBean.java
index 6e01029..ae241c2 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthFiltersBean.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthFiltersBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import java.util.List;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthenticationAuthFilter.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
similarity index 92%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthenticationAuthFilter.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
index 951abc3..edad31c 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/AuthenticationAuthFilter.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import java.util.HashSet;
import java.util.Set;
-import org.apache.servicecomb.authentication.token.JWTToken;
-import org.apache.servicecomb.authentication.token.JWTTokenStore;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.JWTToken;
+import org.apache.servicecomb.fence.token.JWTTokenStore;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/ConfigBasedAuthoriaztionAuthFilter.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthoriaztionAuthFilter.java
similarity index 97%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/ConfigBasedAuthoriaztionAuthFilter.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthoriaztionAuthFilter.java
index 5e2e90d..ffd9174 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/ConfigBasedAuthoriaztionAuthFilter.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthoriaztionAuthFilter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import java.util.Collection;
import java.util.HashSet;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/ResourceAuthHandler.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/ResourceAuthHandler.java
similarity index 95%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/ResourceAuthHandler.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/ResourceAuthHandler.java
index c47ae33..096e2bc 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/ResourceAuthHandler.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/ResourceAuthHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.apache.servicecomb.core.Handler;
import org.apache.servicecomb.core.Invocation;
diff --git a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/SimpleAuthentication.java b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/SimpleAuthentication.java
similarity index 97%
rename from api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/SimpleAuthentication.java
rename to api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/SimpleAuthentication.java
index d1d192a..e4544aa 100644
--- a/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/authentication/resource/SimpleAuthentication.java
+++ b/api/resource-server/endpoint/src/main/java/org/apache/servicecomb/fence/resource/SimpleAuthentication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import java.util.Collection;
diff --git a/api/resource-server/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter b/api/resource-server/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
index e6ad477..edcff82 100644
--- a/api/resource-server/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
+++ b/api/resource-server/endpoint/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.authentication.resource.AccessDeniedExceptionExceptionToProducerResponseConverter
\ No newline at end of file
+org.apache.servicecomb.fence.resource.AccessDeniedExceptionExceptionToProducerResponseConverter
\ No newline at end of file
diff --git a/api/resource-server/endpoint/src/main/resources/config/cse.handler.xml b/api/resource-server/endpoint/src/main/resources/config/cse.handler.xml
index 0efe6d1..3e6533c 100644
--- a/api/resource-server/endpoint/src/main/resources/config/cse.handler.xml
+++ b/api/resource-server/endpoint/src/main/resources/config/cse.handler.xml
@@ -17,5 +17,5 @@
<config>
<handler id="resource-auth-provider"
- class="org.apache.servicecomb.authentication.resource.ResourceAuthHandler" />
+ class="org.apache.servicecomb.fence.resource.ResourceAuthHandler" />
</config>
diff --git a/api/resource-server/pom.xml b/api/resource-server/pom.xml
index 7c3f228..63f6ce3 100644
--- a/api/resource-server/pom.xml
+++ b/api/resource-server/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/api/resource-server/service/pom.xml b/api/resource-server/service/pom.xml
index cf045ce..cfc6a26 100644
--- a/api/resource-server/service/pom.xml
+++ b/api/resource-server/service/pom.xml
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-resource-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -26,7 +26,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-endpoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-endpoint</artifactId>
</dependency>
</dependencies>
diff --git a/authentication-server/pom.xml b/authentication-server/pom.xml
index c09b64b..cdf1c06 100644
--- a/authentication-server/pom.xml
+++ b/authentication-server/pom.xml
@@ -16,8 +16,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
- <artifactId>authentication-parent</artifactId>
+ <groupId>org.apache.servicecomb.fence</groupId>
+ <artifactId>project-fence</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -46,12 +46,12 @@
<version>5.1.46</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api-endpoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-endpoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
@@ -78,11 +78,11 @@
<artifactId>spring-security-jwt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-common-api-endpoint</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api-endpoint</artifactId>
</dependency>
<dependency>
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/AuthenticationServerMain.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/AuthenticationServerApplication.java
similarity index 86%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/AuthenticationServerMain.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/AuthenticationServerApplication.java
index 21088f0..c2cd1bc 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/AuthenticationServerMain.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/AuthenticationServerApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
import org.springframework.boot.WebApplicationType;
@@ -24,10 +24,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
@SpringBootApplication
@EnableServiceComb
-public class AuthenticationServerMain {
+public class AuthenticationServerApplication {
public static void main(String[] args) {
try {
- new SpringApplicationBuilder(AuthenticationServerMain.class).web(WebApplicationType.NONE).run(args);
+ new SpringApplicationBuilder(AuthenticationServerApplication.class).web(WebApplicationType.NONE).run(args);
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/AuthenticationConfiguration.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/AuthenticationConfiguration.java
similarity index 93%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/AuthenticationConfiguration.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/AuthenticationConfiguration.java
index 854c940..95d1159 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/AuthenticationConfiguration.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/AuthenticationConfiguration.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.authentication;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.crypto.password.PasswordEncoder;
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCOpenIDTokenStore.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCOpenIDTokenStore.java
similarity index 84%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCOpenIDTokenStore.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCOpenIDTokenStore.java
index 8382fb1..32fddc0 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCOpenIDTokenStore.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCOpenIDTokenStore.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.authentication;
import java.util.concurrent.CompletableFuture;
-import org.apache.servicecomb.authentication.jwt.JsonParser;
-import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
-import org.apache.servicecomb.authentication.token.OpenIDToken;
-import org.apache.servicecomb.authentication.user.TokenMapper;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.jwt.JsonParser;
+import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
+import org.apache.servicecomb.fence.token.OpenIDToken;
+import org.apache.servicecomb.fence.authentication.user.TokenMapper;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCUserDetails.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCUserDetails.java
similarity index 94%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCUserDetails.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCUserDetails.java
index d2f5caf..b525b67 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCUserDetails.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCUserDetails.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.authentication;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.apache.servicecomb.authentication.user.UserInfo;
+import org.apache.servicecomb.fence.authentication.user.UserInfo;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCUserDetailsManager.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCUserDetailsManager.java
similarity index 90%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCUserDetailsManager.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCUserDetailsManager.java
index 08ff3a7..c809a0d 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/JDBCUserDetailsManager.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/JDBCUserDetailsManager.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.authentication;
-import org.apache.servicecomb.authentication.user.UserInfo;
-import org.apache.servicecomb.authentication.user.UserMapper;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.authentication.user.UserInfo;
+import org.apache.servicecomb.fence.authentication.user.UserMapper;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/user/TokenMapper.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/TokenMapper.java
similarity index 95%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/user/TokenMapper.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/TokenMapper.java
index 7ef3f22..6a32f9c 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/user/TokenMapper.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/TokenMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.user;
+package org.apache.servicecomb.fence.authentication.user;
import org.apache.ibatis.annotations.Param;
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/user/UserInfo.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/UserInfo.java
similarity index 97%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/user/UserInfo.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/UserInfo.java
index 7ebb21d..274eb8b 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/user/UserInfo.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/UserInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.user;
+package org.apache.servicecomb.fence.authentication.user;
import java.util.Set;
diff --git a/authentication-server/src/main/java/org/apache/servicecomb/authentication/user/UserMapper.java b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/UserMapper.java
similarity index 94%
rename from authentication-server/src/main/java/org/apache/servicecomb/authentication/user/UserMapper.java
rename to authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/UserMapper.java
index f50cdf8..286a804 100644
--- a/authentication-server/src/main/java/org/apache/servicecomb/authentication/user/UserMapper.java
+++ b/authentication-server/src/main/java/org/apache/servicecomb/fence/authentication/user/UserMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.user;
+package org.apache.servicecomb.fence.authentication.user;
import java.util.Set;
diff --git a/authentication-server/src/main/resources/META-INF/spring/authentication.server.bean.xml b/authentication-server/src/main/resources/META-INF/spring/authentication.server.bean.xml
index 08ebeb0..2940c19 100644
--- a/authentication-server/src/main/resources/META-INF/spring/authentication.server.bean.xml
+++ b/authentication-server/src/main/resources/META-INF/spring/authentication.server.bean.xml
@@ -35,12 +35,12 @@
<bean id="userMapper" class="org.mybatis.spring.mapper.MapperFactoryBean">
<property name="mapperInterface"
- value="org.apache.servicecomb.authentication.user.UserMapper" />
+ value="org.apache.servicecomb.fence.authentication.user.UserMapper" />
<property name="sqlSessionFactory" ref="sqlSessionFactory" />
</bean>
<bean id="tokenMapper" class="org.mybatis.spring.mapper.MapperFactoryBean">
<property name="mapperInterface"
- value="org.apache.servicecomb.authentication.user.TokenMapper" />
+ value="org.apache.servicecomb.fence.authentication.user.TokenMapper" />
<property name="sqlSessionFactory" ref="sqlSessionFactory" />
</bean>
</beans>
\ No newline at end of file
diff --git a/authentication-server/src/main/resources/config/TokenMapper.xml b/authentication-server/src/main/resources/config/TokenMapper.xml
index 8d702f9..60fd00c 100644
--- a/authentication-server/src/main/resources/config/TokenMapper.xml
+++ b/authentication-server/src/main/resources/config/TokenMapper.xml
@@ -12,7 +12,7 @@
under the License. -->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.servicecomb.authentication.user.TokenMapper">
+<mapper namespace="org.apache.servicecomb.fence.authentication.user.TokenMapper">
<insert id="insertNewToken">
insert into
T_TOKENS(ACCESS_TOKEN_VALUE,REFRESH_TOKEN_VALUE,TOKEN)
diff --git a/authentication-server/src/main/resources/config/UserMapper.xml b/authentication-server/src/main/resources/config/UserMapper.xml
index 5261d02..7312662 100644
--- a/authentication-server/src/main/resources/config/UserMapper.xml
+++ b/authentication-server/src/main/resources/config/UserMapper.xml
@@ -12,9 +12,9 @@
under the License. -->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.servicecomb.authentication.user.UserMapper">
+<mapper namespace="org.apache.servicecomb.fence.authentication.user.UserMapper">
<resultMap id="userInfo"
- type="org.apache.servicecomb.authentication.user.UserInfo">
+ type="org.apache.servicecomb.fence.authentication.user.UserInfo">
<result column="ID" property="id" />
<result column="USER_NAME" property="username" />
<result column="PASSWORD" property="password" />
diff --git a/build_and_run.bat b/build_and_run.bat
index 53e5696..2ce3a2a 100644
--- a/build_and_run.bat
+++ b/build_and_run.bat
@@ -15,6 +15,6 @@ cd %HOME%\resource-server\target
start java -jar resource-server-0.0.1-SNAPSHOT.jar
cd %HOME%\integration-tests\target
-start java -jar client-0.0.1-SNAPSHOT.jar
+start java -jar integration-tests-0.0.1-SNAPSHOT.jar
cd %HOME%
diff --git a/docs/zh_CN/developersGuide.md b/docs/zh_CN/developersGuide.md
index b06d223..8acc131 100644
--- a/docs/zh_CN/developersGuide.md
+++ b/docs/zh_CN/developersGuide.md
@@ -54,7 +54,7 @@ Authentication Server 主要提供认证和授权等接口。
```
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api-endpoint</artifactId>
</dependency>
```
@@ -121,7 +121,7 @@ Resource Server 对 Client 的访问进行认证， 并进行权限控制。
```
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-resource-api-endpoint</artifactId>
</dependency>
```
@@ -227,7 +227,7 @@ Edge Service 是微服务接入层。 在[单体应用微服务改造](https://b
```
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api-endpoint</artifactId>
</dependency>
```
diff --git a/edge-service/pom.xml b/edge-service/pom.xml
index fc09357..00fc3ca 100644
--- a/edge-service/pom.xml
+++ b/edge-service/pom.xml
@@ -16,8 +16,8 @@
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
- <artifactId>authentication-samples</artifactId>
+ <groupId>org.apache.servicecomb.fence</groupId>
+ <artifactId>project-fence</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -31,12 +31,12 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api-endpoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-server-api-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
@@ -45,7 +45,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api-endpoint</artifactId>
</dependency>
<dependency>
diff --git a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/AuthenticationEdgeMain.java b/edge-service/src/main/java/org/apache/servicecomb/fence/EdgeServiceApplication.java
similarity index 88%
rename from edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/AuthenticationEdgeMain.java
rename to edge-service/src/main/java/org/apache/servicecomb/fence/EdgeServiceApplication.java
index 8191792..f194014 100644
--- a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/AuthenticationEdgeMain.java
+++ b/edge-service/src/main/java/org/apache/servicecomb/fence/EdgeServiceApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.gateway;
+package org.apache.servicecomb.fence;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
import org.springframework.boot.WebApplicationType;
@@ -24,10 +24,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
@SpringBootApplication
@EnableServiceComb
-public class AuthenticationEdgeMain {
+public class EdgeServiceApplication {
public static void main(String[] args) {
try {
- new SpringApplicationBuilder(AuthenticationEdgeMain.class).web(WebApplicationType.NONE).run(args);
+ new SpringApplicationBuilder(EdgeServiceApplication.class).web(WebApplicationType.NONE).run(args);
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/AuthenticationConfiguration.java b/edge-service/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationConfiguration.java
similarity index 88%
rename from edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/AuthenticationConfiguration.java
rename to edge-service/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationConfiguration.java
index bd0b588..3ebd4b8 100644
--- a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/AuthenticationConfiguration.java
+++ b/edge-service/src/main/java/org/apache/servicecomb/fence/edge/AuthenticationConfiguration.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.gateway;
+package org.apache.servicecomb.fence.edge;
-import org.apache.servicecomb.authentication.token.JWTTokenStore;
-import org.apache.servicecomb.authentication.token.JWTTokenStoreImpl;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.JWTTokenStore;
+import org.apache.servicecomb.fence.token.JWTTokenStoreImpl;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
diff --git a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/EdgeSSLCustom.java b/edge-service/src/main/java/org/apache/servicecomb/fence/edge/EdgeSSLCustom.java
similarity index 95%
rename from edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/EdgeSSLCustom.java
rename to edge-service/src/main/java/org/apache/servicecomb/fence/edge/EdgeSSLCustom.java
index 0fb1268..6314ab7 100644
--- a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/EdgeSSLCustom.java
+++ b/edge-service/src/main/java/org/apache/servicecomb/fence/edge/EdgeSSLCustom.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.gateway;
+package org.apache.servicecomb.fence.edge;
import java.io.File;
diff --git a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/StaticWebpageDispatcher.java b/edge-service/src/main/java/org/apache/servicecomb/fence/edge/StaticWebpageDispatcher.java
similarity index 97%
rename from edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/StaticWebpageDispatcher.java
rename to edge-service/src/main/java/org/apache/servicecomb/fence/edge/StaticWebpageDispatcher.java
index d6f61b6..09da3d0 100644
--- a/edge-service/src/main/java/org/apache/servicecomb/authentication/gateway/StaticWebpageDispatcher.java
+++ b/edge-service/src/main/java/org/apache/servicecomb/fence/edge/StaticWebpageDispatcher.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.gateway;
+package org.apache.servicecomb.fence.edge;
import org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher;
import org.slf4j.Logger;
diff --git a/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher b/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
index d3f7adc..7174550 100644
--- a/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
+++ b/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.authentication.gateway.StaticWebpageDispatcher
\ No newline at end of file
+org.apache.servicecomb.fence.edge.StaticWebpageDispatcher
\ No newline at end of file
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1f3b5aa..fea7475 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -15,14 +15,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
- <artifactId>authentication-samples</artifactId>
+ <groupId>org.apache.servicecomb.fence</groupId>
+ <artifactId>project-fence</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>client</artifactId>
+ <artifactId>integration-tests</artifactId>
<packaging>jar</packaging>
<properties>
@@ -32,7 +31,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
@@ -56,7 +55,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-edge-api-service</artifactId>
</dependency>
<dependency>
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/AuthenticationClientMain.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/AuthenticationClientMain.java
similarity index 96%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/AuthenticationClientMain.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/AuthenticationClientMain.java
index 4505100..b81f052 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/AuthenticationClientMain.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/AuthenticationClientMain.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
import org.springframework.boot.WebApplicationType;
@@ -32,4 +32,4 @@ public class AuthenticationClientMain {
e.printStackTrace();
}
}
-}
\ No newline at end of file
+}
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/AuthenticationTestCase.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/AuthenticationTestCase.java
similarity index 97%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/AuthenticationTestCase.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/AuthenticationTestCase.java
index 357e3c1..e3cbfed 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/AuthenticationTestCase.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/AuthenticationTestCase.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
-import org.apache.servicecomb.authentication.edge.TokenResponse;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.edge.TokenResponse;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/BootEventListener.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/BootEventListener.java
similarity index 97%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/BootEventListener.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/BootEventListener.java
index 74db45a..fbf5f71 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/BootEventListener.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/BootEventListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
import org.apache.servicecomb.core.BootListener;
import org.springframework.stereotype.Component;
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/GateRestTemplate.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/GateRestTemplate.java
similarity index 98%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/GateRestTemplate.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/GateRestTemplate.java
index 4516502..30170ce 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/GateRestTemplate.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/GateRestTemplate.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
import java.util.Arrays;
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/ITUriTemplateHandler.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/ITUriTemplateHandler.java
similarity index 97%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/ITUriTemplateHandler.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/ITUriTemplateHandler.java
index 198bc8d..24325ec 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/ITUriTemplateHandler.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/ITUriTemplateHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
import java.net.URI;
import java.util.Map;
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TestCase.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestCase.java
similarity index 94%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/TestCase.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestCase.java
index 1c511d2..7c18580 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TestCase.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
public interface TestCase {
void run();
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TestEndpoint.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestEndpoint.java
similarity index 97%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/TestEndpoint.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestEndpoint.java
index 3ebad16..299ea6b 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TestEndpoint.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestEndpoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
import java.util.List;
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TestMgr.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestMgr.java
similarity index 98%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/TestMgr.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestMgr.java
index bb12177..10bb84f 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TestMgr.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TestMgr.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
import java.util.ArrayList;
import java.util.List;
diff --git a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TokenExpireTestCase.java b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TokenExpireTestCase.java
similarity index 95%
rename from integration-tests/src/main/java/org/apache/servicecomb/authentication/TokenExpireTestCase.java
rename to integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TokenExpireTestCase.java
index 2a95b1e..fddcefa 100644
--- a/integration-tests/src/main/java/org/apache/servicecomb/authentication/TokenExpireTestCase.java
+++ b/integration-tests/src/main/java/org/apache/servicecomb/fence/tests/TokenExpireTestCase.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication;
+package org.apache.servicecomb.fence.tests;
-import org.apache.servicecomb.authentication.edge.TokenResponse;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.edge.TokenResponse;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
diff --git a/pom.xml b/pom.xml
index e528290..717128e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.servicecomb.authentication</groupId>
- <artifactId>authentication-parent</artifactId>
+ <groupId>org.apache.servicecomb.fence</groupId>
+ <artifactId>project-fence</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/resource-server/pom.xml b/resource-server/pom.xml
index 2a48220..b6b430a 100644
--- a/resource-server/pom.xml
+++ b/resource-server/pom.xml
@@ -17,8 +17,8 @@
<parent>
- <groupId>org.apache.servicecomb.authentication</groupId>
- <artifactId>authentication-samples</artifactId>
+ <groupId>org.apache.servicecomb.fence</groupId>
+ <artifactId>project-fence</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -32,7 +32,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-resource-api-endpoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
@@ -56,7 +56,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.authentication</groupId>
+ <groupId>org.apache.servicecomb.fence</groupId>
<artifactId>authentication-resource-api-endpoint</artifactId>
</dependency>
<dependency>
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/ResourceServerMain.java b/resource-server/src/main/java/org/apache/servicecomb/fence/ResourceServerApplication.java
similarity index 86%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/ResourceServerMain.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/ResourceServerApplication.java
index f43f724..37041fc 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/ResourceServerMain.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/ResourceServerApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
import org.springframework.boot.WebApplicationType;
@@ -24,10 +24,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
@SpringBootApplication
@EnableServiceComb
-public class ResourceServerMain {
+public class ResourceServerApplication {
public static void main(String[] args) {
try {
- new SpringApplicationBuilder(ResourceServerMain.class).web(WebApplicationType.NONE).run(args);
+ new SpringApplicationBuilder(ResourceServerApplication.class).web(WebApplicationType.NONE).run(args);
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/AuthenticationConfiguration.java b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
similarity index 88%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/AuthenticationConfiguration.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
index 77d857e..c917643 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/AuthenticationConfiguration.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
-import org.apache.servicecomb.authentication.token.JWTTokenStore;
-import org.apache.servicecomb.authentication.token.JWTTokenStoreImpl;
-import org.apache.servicecomb.authentication.util.CommonConstants;
+import org.apache.servicecomb.fence.token.JWTTokenStore;
+import org.apache.servicecomb.fence.token.JWTTokenStoreImpl;
+import org.apache.servicecomb.fence.util.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/FileEndpoint.java b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/FileEndpoint.java
similarity index 97%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/FileEndpoint.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/resource/FileEndpoint.java
index 4b6a5b6..04c1db3 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/FileEndpoint.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/FileEndpoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/FileStoreService.java b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/FileStoreService.java
similarity index 95%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/FileStoreService.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/resource/FileStoreService.java
index ed03665..5321201 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/FileStoreService.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/FileStoreService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.springframework.web.multipart.MultipartFile;
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/HandlerAuthEndpoint.java b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/HandlerAuthEndpoint.java
similarity index 96%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/HandlerAuthEndpoint.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/resource/HandlerAuthEndpoint.java
index 347db46..f922025 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/HandlerAuthEndpoint.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/HandlerAuthEndpoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/LocalFileStoreService.java b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/LocalFileStoreService.java
similarity index 97%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/LocalFileStoreService.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/resource/LocalFileStoreService.java
index d487144..729c88b 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/LocalFileStoreService.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/LocalFileStoreService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/MethodSecurityConfiguration.java b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/MethodSecurityConfiguration.java
similarity index 96%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/MethodSecurityConfiguration.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/resource/MethodSecurityConfiguration.java
index 58df6a9..4fc2316 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/MethodSecurityConfiguration.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/MethodSecurityConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
diff --git a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/PreMethodAuthEndpoint.java b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/PreMethodAuthEndpoint.java
similarity index 96%
rename from resource-server/src/main/java/org/apache/servicecomb/authentication/resource/PreMethodAuthEndpoint.java
rename to resource-server/src/main/java/org/apache/servicecomb/fence/resource/PreMethodAuthEndpoint.java
index 668f774..9243d53 100644
--- a/resource-server/src/main/java/org/apache/servicecomb/authentication/resource/PreMethodAuthEndpoint.java
+++ b/resource-server/src/main/java/org/apache/servicecomb/fence/resource/PreMethodAuthEndpoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.authentication.resource;
+package org.apache.servicecomb.fence.resource;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.springframework.security.access.prepost.PreAuthorize;