Skip to content

Commit b186175

Browse files
authored
[SCB-2739]refactor project artifacts and groups ids (#42)
1 parent 2a4efde commit b186175

File tree

109 files changed

+207
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+207
-208
lines changed

api/authentication-server/endpoint/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<modelVersion>4.0.0</modelVersion>
2121

2222
<parent>
23-
<groupId>org.apache.servicecomb.authentication</groupId>
23+
<groupId>org.apache.servicecomb.fence</groupId>
2424
<artifactId>authentication-server-api</artifactId>
2525
<version>0.0.1-SNAPSHOT</version>
2626
</parent>
@@ -30,12 +30,12 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>org.apache.servicecomb.authentication</groupId>
33+
<groupId>org.apache.servicecomb.fence</groupId>
3434
<artifactId>authentication-server-api-service</artifactId>
3535
<version>${project.parent.version}</version>
3636
</dependency>
3737
<dependency>
38-
<groupId>org.apache.servicecomb.authentication</groupId>
38+
<groupId>org.apache.servicecomb.fence</groupId>
3939
<artifactId>authentication-common-api-service</artifactId>
4040
<version>${project.parent.version}</version>
4141
</dependency>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.servicecomb.authentication.server;
17+
package org.apache.servicecomb.fence.server;
1818

1919
// see: https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps/
2020
public class GithubAccessTokenResponse {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import org.apache.servicecomb.config.inject.InjectProperties;
2121
import org.apache.servicecomb.config.inject.InjectProperty;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.Map;
2121

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import javax.ws.rs.FormParam;
2121
import javax.ws.rs.POST;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import org.apache.servicecomb.provider.pojo.registry.ThirdServiceWithInvokerRegister;
2121
import org.springframework.stereotype.Component;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import org.apache.commons.lang3.StringUtils;
21-
import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
22-
import org.apache.servicecomb.authentication.token.OpenIDToken;
23-
import org.apache.servicecomb.authentication.util.CommonConstants;
21+
import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
22+
import org.apache.servicecomb.fence.token.OpenIDToken;
23+
import org.apache.servicecomb.fence.util.CommonConstants;
2424
import org.apache.servicecomb.provider.pojo.RpcReference;
2525
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
2626
import org.slf4j.Logger;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.Map;
2121

2222
import org.apache.commons.lang3.StringUtils;
23-
import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
24-
import org.apache.servicecomb.authentication.token.OpenIDToken;
25-
import org.apache.servicecomb.authentication.util.CommonConstants;
23+
import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
24+
import org.apache.servicecomb.fence.token.OpenIDToken;
25+
import org.apache.servicecomb.fence.util.CommonConstants;
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.beans.factory.annotation.Qualifier;
2828
import org.springframework.security.core.userdetails.UserDetails;
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.Map;
2121

2222
import org.apache.commons.lang3.StringUtils;
23-
import org.apache.servicecomb.authentication.token.AbstractOpenIDTokenStore;
24-
import org.apache.servicecomb.authentication.token.OpenIDToken;
25-
import org.apache.servicecomb.authentication.token.Token;
26-
import org.apache.servicecomb.authentication.util.CommonConstants;
23+
import org.apache.servicecomb.fence.token.AbstractOpenIDTokenStore;
24+
import org.apache.servicecomb.fence.token.OpenIDToken;
25+
import org.apache.servicecomb.fence.token.Token;
26+
import org.apache.servicecomb.fence.util.CommonConstants;
2727
import org.springframework.beans.factory.annotation.Autowired;
2828
import org.springframework.beans.factory.annotation.Qualifier;
2929
import org.springframework.security.core.userdetails.UserDetails;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.List;
2121

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.Map;
2121

2222
import org.apache.commons.lang3.StringUtils;
23-
import org.apache.servicecomb.authentication.token.OpenIDToken;
23+
import org.apache.servicecomb.fence.token.OpenIDToken;
2424

2525
public interface ThirdPartyTokenGranter extends TokenGranter {
2626

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.List;
2121
import java.util.Map;
@@ -24,9 +24,9 @@
2424
import javax.ws.rs.core.MediaType;
2525
import javax.ws.rs.core.Response.Status;
2626

27-
import org.apache.servicecomb.authentication.token.OpenIDToken;
28-
import org.apache.servicecomb.authentication.token.OpenIDTokenStore;
29-
import org.apache.servicecomb.authentication.util.CommonConstants;
27+
import org.apache.servicecomb.fence.token.OpenIDToken;
28+
import org.apache.servicecomb.fence.token.OpenIDTokenStore;
29+
import org.apache.servicecomb.fence.util.CommonConstants;
3030
import org.apache.servicecomb.provider.rest.common.RestSchema;
3131
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
3232
import org.springframework.beans.factory.annotation.Autowired;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.Map;
2121

22-
import org.apache.servicecomb.authentication.token.OpenIDToken;
22+
import org.apache.servicecomb.fence.token.OpenIDToken;
2323

2424
/**
2525
* Token granter is used to grant access tokens.

api/authentication-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<parent>
24-
<groupId>org.apache.servicecomb.authentication</groupId>
24+
<groupId>org.apache.servicecomb.fence</groupId>
2525
<artifactId>authentication-api</artifactId>
2626
<version>0.0.1-SNAPSHOT</version>
2727
</parent>

api/authentication-server/service/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<modelVersion>4.0.0</modelVersion>
2121

2222
<parent>
23-
<groupId>org.apache.servicecomb.authentication</groupId>
23+
<groupId>org.apache.servicecomb.fence</groupId>
2424
<artifactId>authentication-server-api</artifactId>
2525
<version>0.0.1-SNAPSHOT</version>
2626
</parent>
@@ -30,7 +30,7 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>org.apache.servicecomb.authentication</groupId>
33+
<groupId>org.apache.servicecomb.fence</groupId>
3434
<artifactId>authentication-common-api-service</artifactId>
3535
<version>${project.parent.version}</version>
3636
</dependency>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
public class AuthenticationServerConstants {
2121
public static final String PARAM_GRANT_TYPE = "grant_type";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
/**
2121
* Connecting third party oAuth providers
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.server;
18+
package org.apache.servicecomb.fence.server;
1919

2020
import java.util.Map;
2121

22-
import org.apache.servicecomb.authentication.token.OpenIDToken;
22+
import org.apache.servicecomb.fence.token.OpenIDToken;
2323

2424
public interface TokenService {
2525
OpenIDToken grantToken(Map<String, String> parameters);

api/common/endpoint/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<modelVersion>4.0.0</modelVersion>
2121

2222
<parent>
23-
<groupId>org.apache.servicecomb.authentication</groupId>
23+
<groupId>org.apache.servicecomb.fence</groupId>
2424
<artifactId>authentication-common-api</artifactId>
2525
<version>0.0.1-SNAPSHOT</version>
2626
</parent>
@@ -30,7 +30,7 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>org.apache.servicecomb.authentication</groupId>
33+
<groupId>org.apache.servicecomb.fence</groupId>
3434
<artifactId>authentication-common-api-service</artifactId>
3535
<version>${project.parent.version}</version>
3636
</dependency>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.token;
18+
package org.apache.servicecomb.fence.token;
1919

20-
import org.apache.servicecomb.authentication.util.CommonConstants;
20+
import org.apache.servicecomb.fence.util.CommonConstants;
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.beans.factory.annotation.Qualifier;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

api/common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<parent>
24-
<groupId>org.apache.servicecomb.authentication</groupId>
24+
<groupId>org.apache.servicecomb.fence</groupId>
2525
<artifactId>authentication-api</artifactId>
2626
<version>0.0.1-SNAPSHOT</version>
2727
</parent>

api/common/service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<modelVersion>4.0.0</modelVersion>
2121

2222
<parent>
23-
<groupId>org.apache.servicecomb.authentication</groupId>
23+
<groupId>org.apache.servicecomb.fence</groupId>
2424
<artifactId>authentication-common-api</artifactId>
2525
<version>0.0.1-SNAPSHOT</version>
2626
</parent>

api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTClaims.java renamed to api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.jwt;
18+
package org.apache.servicecomb.fence.jwt;
1919

2020
import java.util.HashMap;
2121
import java.util.HashSet;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.jwt;
18+
package org.apache.servicecomb.fence.jwt;
1919

2020
public class JWTClaimsCommon {
2121
// see: https://tools.ietf.org/html/rfc7519

api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JWTHeader.java renamed to api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.jwt;
18+
package org.apache.servicecomb.fence.jwt;
1919

2020
public class JWTHeader {
2121
//see: https://tools.ietf.org/html/rfc7519

api/common/service/src/main/java/org/apache/servicecomb/authentication/jwt/JsonParser.java renamed to api/common/service/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.jwt;
18+
package org.apache.servicecomb.fence.jwt;
1919

2020
import com.fasterxml.jackson.databind.ObjectMapper;
2121

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.token;
18+
package org.apache.servicecomb.fence.token;
1919

20-
import org.apache.servicecomb.authentication.util.CommonConstants;
20+
import org.apache.servicecomb.fence.util.CommonConstants;
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.beans.factory.annotation.Qualifier;
2323
import org.springframework.security.core.userdetails.UserDetails;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.token;
18+
package org.apache.servicecomb.fence.token;
1919

2020
import java.util.Map;
2121
import java.util.concurrent.CompletableFuture;

api/common/service/src/main/java/org/apache/servicecomb/authentication/token/JWTToken.java renamed to api/common/service/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.token;
18+
package org.apache.servicecomb.fence.token;
1919

2020
import java.util.Map;
2121

22-
import org.apache.servicecomb.authentication.jwt.JWTClaims;
23-
import org.apache.servicecomb.authentication.jwt.JsonParser;
22+
import org.apache.servicecomb.fence.jwt.JWTClaims;
23+
import org.apache.servicecomb.fence.jwt.JsonParser;
2424
import org.springframework.security.jwt.Jwt;
2525
import org.springframework.security.jwt.JwtHelper;
2626
import org.springframework.security.jwt.crypto.sign.Signer;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.token;
18+
package org.apache.servicecomb.fence.token;
1919

2020
public interface JWTTokenStore extends TokenStore<JWTToken> {
2121
public JWTToken createTokenByValue(String value);
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.token;
18+
package org.apache.servicecomb.fence.token;
1919

2020
import java.util.UUID;
2121

22-
import org.apache.servicecomb.authentication.jwt.JWTClaims;
23-
import org.apache.servicecomb.authentication.jwt.JsonParser;
22+
import org.apache.servicecomb.fence.jwt.JWTClaims;
23+
import org.apache.servicecomb.fence.jwt.JsonParser;
2424
import org.springframework.security.core.userdetails.UserDetails;
2525
import org.springframework.security.jwt.Jwt;
2626
import org.springframework.security.jwt.JwtHelper;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.servicecomb.authentication.token;
18+
package org.apache.servicecomb.fence.token;
1919

2020
import java.util.Map;
2121
import java.util.Set;

0 commit comments

Comments
 (0)