This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from 90724a6 Scaling job Breakpoint resume ability. (#6460)
add 21c25f8 Move isOverwrite from prop to OrchestrationConfiguration's
attribute (#6467)
No new revisions were added by this update.
Summary of changes:
.../sharding-proxy/sharding/conf/server.yaml | 3 +-
.../raw/jdbc/JavaConfigurationExampleMain.java | 4 +-
.../OrchestrationRepositoryConfigurationUtil.java | 28 ++++++-------
.../resources/META-INF/nacos/cloud/encrypt.yaml | 6 +--
.../META-INF/nacos/cloud/master-slave.yaml | 4 +-
.../resources/META-INF/nacos/cloud/shadow.yaml | 3 +-
.../nacos/cloud/sharding-databases-tables.yaml | 4 +-
.../resources/META-INF/nacos/local/encrypt.yaml | 4 +-
.../META-INF/nacos/local/master-slave.yaml | 4 +-
.../resources/META-INF/nacos/local/shadow.yaml | 4 +-
.../nacos/local/sharding-databases-tables.yaml | 5 +--
.../META-INF/zookeeper/cloud/encrypt.yaml | 3 +-
.../META-INF/zookeeper/cloud/master-slave.yaml | 3 +-
.../resources/META-INF/zookeeper/cloud/shadow.yaml | 3 +-
.../zookeeper/cloud/sharding-databases-tables.yaml | 3 +-
.../META-INF/zookeeper/local/encrypt.yaml | 3 +-
.../META-INF/zookeeper/local/master-slave.yaml | 3 +-
.../resources/META-INF/zookeeper/local/shadow.yaml | 3 +-
.../zookeeper/local/sharding-databases-tables.yaml | 3 +-
.../application-cloud-nacos-encrypt.properties | 8 ++--
...application-cloud-nacos-master-slave.properties | 8 ++--
.../application-cloud-nacos-shadow.properties | 4 +-
...loud-nacos-sharding-databases-tables.properties | 8 ++--
.../application-cloud-zookeeper-encrypt.properties | 2 +-
...ication-cloud-zookeeper-master-slave.properties | 2 +-
.../application-cloud-zookeeper-shadow.properties | 2 +-
...-zookeeper-sharding-databases-tables.properties | 2 +-
.../application-local-nacos-encrypt.properties | 4 +-
...application-local-nacos-master-slave.properties | 4 +-
.../application-local-nacos-shadow.properties | 4 +-
...ocal-nacos-sharding-databases-tables.properties | 4 +-
.../application-local-zookeeper-encrypt.properties | 2 +-
...ication-local-zookeeper-master-slave.properties | 2 +-
.../application-local-zookeeper-shadow.properties | 2 +-
...-zookeeper-sharding-databases-tables.properties | 2 +-
.../resources/META-INF/nacos/registry-center.xml | 3 --
.../META-INF/zookeeper/registry-center.xml | 1 -
.../src/main/resources/conf/server.yaml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../core/facade/OrchestrationFacade.java | 10 ++---
.../facade/properties/OrchestrationProperties.java | 32 ---------------
.../properties/OrchestrationPropertyKey.java | 46 ----------------------
.../core/facade/OrchestrationFacadeTest.java | 2 +-
.../properties/OrchestrationPropertiesTest.java | 43 --------------------
.../api/config/OrchestrationConfiguration.java | 6 ++-
.../config/YamlOrchestrationConfiguration.java | 2 +
.../OrchestrationConfigurationYamlSwapper.java | 4 +-
.../OrchestrationConfigurationYamlSwapperTest.java | 2 +-
.../src/main/resources/conf/server.yaml | 4 +-
.../test/resources/docker/proxy/conf/server.yaml | 4 +-
...strationRepositoryConfigurationSwapperUtil.java | 4 +-
.../OrchestrationShardingSphereDataSourceTest.java | 2 +-
.../configWithMasterSlaveDataSourceWithProps.yaml | 3 +-
...onfigWithMasterSlaveDataSourceWithoutProps.yaml | 3 +-
.../sharding/configWithDataSourceWithProps.yaml | 3 +-
.../sharding/configWithDataSourceWithoutProps.yaml | 3 +-
.../sharding/configWithoutDataSourceWithProps.yaml | 3 +-
.../configWithoutDataSourceWithoutProps.yaml | 3 +-
.../sharding_ms/configWithDataSourceWithProps.yaml | 3 +-
.../configWithDataSourceWithoutProps.yaml | 3 +-
.../configWithDataSourceWithoutRules.yaml | 3 +-
.../configWithoutDataSourceWithProps.yaml | 3 +-
.../configWithoutDataSourceWithoutProps.yaml | 3 +-
.../yaml/unit/encryptWithRegistryCenter.yaml | 5 +--
.../src/test/resources/yaml/unit/noRule.yaml | 3 +-
.../OrchestrationSpringBootConfiguration.java | 4 +-
.../test/resources/application-encrypt.properties | 2 +-
.../resources/application-masterslave.properties | 2 +-
.../test/resources/application-registry.properties | 2 +-
.../test/resources/application-sharding.properties | 2 +-
.../constants/ClusterBeanDefinitionTag.java | 12 +++---
.../constants/DataSourceBeanDefinitionTag.java | 8 ++--
...ationCenterConfigurationBeanDefinitionTag.java} | 10 ++---
.../handler/OrchestrationNamespaceHandler.java | 6 +--
.../parser/ClusterBeanDefinitionParser.java | 12 +++---
.../parser/DataSourceBeanDefinitionParser.java | 8 ++--
...onCenterConfigurationBeanDefinitionParser.java} | 14 +++----
.../resources/META-INF/namespace/orchestration.xsd | 3 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../src/test/resources/conf/server.yaml | 3 +-
80 files changed, 144 insertions(+), 309 deletions(-)
delete mode 100644
shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/properties/OrchestrationProperties.java
delete mode 100644
shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/properties/OrchestrationPropertyKey.java
delete mode 100644
shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/properties/OrchestrationPropertiesTest.java
rename
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/constants/{InstanceBeanDefinitionTag.java
=> OrchestrationCenterConfigurationBeanDefinitionTag.java} (77%)
rename
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/parser/{InstanceBeanDefinitionParser.java
=> OrchestrationCenterConfigurationBeanDefinitionParser.java} (74%)
