[SCB-1556]updagrad fence of java-chassis dependency to 1.3.0 and fix old pom problems
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/authentication/server/GithubDynamicPropertiesManager.java
index 69e5f6f..2eccf3a 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/authentication/server/GithubDynamicPropertiesManager.java
@@ -19,17 +19,15 @@
import java.util.Map;
-import org.apache.servicecomb.config.inject.ConfigObjectFactory;
+import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
public class GithubDynamicPropertiesManager {
private static final Map<String, GithubDynamicProperties> CONFIGURATIONS = new ConcurrentHashMapEx<>();
- private static final ConfigObjectFactory FACTORY = new ConfigObjectFactory();
-
public static GithubDynamicProperties getGithubConfiguration() {
return CONFIGURATIONS.computeIfAbsent("key", key -> {
- return FACTORY.create(GithubDynamicProperties.class);
+ return SCBEngine.getInstance().getPriorityPropertyManager().createConfigObject(GithubDynamicProperties.class);
});
}
}
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/authentication/token/TokenDynamicPropertiesManager.java
index b04617a..f85e686 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/authentication/token/TokenDynamicPropertiesManager.java
@@ -19,17 +19,16 @@
import java.util.Map;
-import org.apache.servicecomb.config.inject.ConfigObjectFactory;
+import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
public class TokenDynamicPropertiesManager {
private static final Map<String, TokenDynamicProperties> CONFIGURATIONS = new ConcurrentHashMapEx<>();
- private static final ConfigObjectFactory FACTORY = new ConfigObjectFactory();
-
public static TokenDynamicProperties getTokenConfiguration(String username) {
return CONFIGURATIONS.computeIfAbsent(username, key -> {
- return FACTORY.create(TokenDynamicProperties.class, "username", username);
+ return SCBEngine.getInstance().getPriorityPropertyManager()
+ .createConfigObject(TokenDynamicProperties.class, "username", username);
});
}
}
diff --git a/api/edge-service/endpoint/pom.xml b/api/edge-service/endpoint/pom.xml
index 553a17c..91691fb 100644
--- a/api/edge-service/endpoint/pom.xml
+++ b/api/edge-service/endpoint/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.servicecomb.authentication</groupId>
- <artifactId>authentication-server-api</artifactId>
+ <artifactId>authentication-edge-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
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/authentication/edge/AuthenticationFilter.java
index 56733c3..fa69552 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/authentication/edge/AuthenticationFilter.java
@@ -40,7 +40,7 @@
if (tokens[0].equals(CommonConstants.TOKEN_TYPE_BEARER)) {
invocation.addContext(CommonConstants.CONTEXT_HEADER_AUTHORIZATION, tokens[1]);
invocation.addContext(CommonConstants.CONTEXT_HEADER_AUTHORIZATION_TYPE,
- type == null ? CommonConstants.AUTHORIZATION_TYPE_ACCESS_TOKEN : type);
+ type == null ? CommonConstants.AUTHORIZATION_TYPE_ID_TOKEN : type);
}
}
}
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/authentication/resource/AccessDynamicPropertiesManager.java
index 1910836..29b2d78 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/authentication/resource/AccessDynamicPropertiesManager.java
@@ -19,18 +19,19 @@
import java.util.Map;
-import org.apache.servicecomb.config.inject.ConfigObjectFactory;
import org.apache.servicecomb.core.Invocation;
+import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
public class AccessDynamicPropertiesManager {
private static final Map<String, AccessDynamicProperties> CONFIGURATIONS = new ConcurrentHashMapEx<>();
- private static final ConfigObjectFactory FACTORY = new ConfigObjectFactory();
-
public static AccessDynamicProperties getAccessConfiguration(Invocation invocation) {
return CONFIGURATIONS.computeIfAbsent(invocation.getOperationMeta().getSchemaQualifiedName(), key -> {
- return FACTORY.create(AccessDynamicProperties.class, "schemaId", invocation.getSchemaId(), "operationId", invocation.getOperationName());
+ return SCBEngine
+ .getInstance().getPriorityPropertyManager()
+ .createConfigObject(AccessDynamicProperties.class, "schemaId", invocation.getSchemaId(), "operationId",
+ invocation.getOperationName());
});
}
}
diff --git a/authentication-server/pom.xml b/authentication-server/pom.xml
index 285d9eb..0717bc7 100644
--- a/authentication-server/pom.xml
+++ b/authentication-server/pom.xml
@@ -56,13 +56,6 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>2.3.2.RELEASE</version>
diff --git a/build_and_run.bat b/build_and_run.bat
index 751fac3..7d8ff86 100644
--- a/build_and_run.bat
+++ b/build_and_run.bat
@@ -1,7 +1,7 @@
REM compile the code
set HOME=%cd%
-mvn clean install
+call mvn clean install
REM run the application locally
diff --git a/pom.xml b/pom.xml
index 70cea20..ad944a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java-chassis-version>1.3.0</java-chassis-version>
</properties>
<modules>
@@ -40,7 +41,7 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>java-chassis-dependencies</artifactId>
- <version>1.2.0</version>
+ <version>${java-chassis-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/samples/Client/pom.xml b/samples/Client/pom.xml
index 4f45034..8b63d32 100644
--- a/samples/Client/pom.xml
+++ b/samples/Client/pom.xml
@@ -51,13 +51,6 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.46</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/samples/EdgeService/pom.xml b/samples/EdgeService/pom.xml
index c0e5918..30a52c7 100644
--- a/samples/EdgeService/pom.xml
+++ b/samples/EdgeService/pom.xml
@@ -31,13 +31,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>org.apache.servicecomb.authentication</groupId>
<artifactId>authentication-edge-api-endpoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/samples/ResourceServer/pom.xml b/samples/ResourceServer/pom.xml
index dd2416b..ada348c 100644
--- a/samples/ResourceServer/pom.xml
+++ b/samples/ResourceServer/pom.xml
@@ -51,13 +51,6 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.46</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
</dependencies>
</dependencyManagement>
