[shardingsphere] branch master updated (7f85abf -> dd5b105)

[lu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lujingshang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.


    from 7f85abf  Merge pull request #7098 from menghaoranss/issue6653-4
     new 2225ef4  Refactor the constructors for OrchestrationShardingSphereDataSource
     new 2be38f0  remove import
     new fc3fc36  change api for spring name space
     new dd5b105  Merge pull request #7097 from tristaZero/new1

The 26430 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ...chestrationShardingSphereDataSourceFactory.java |  7 +---
 ...chestrationShardingSphereDataSourceFactory.java | 16 ++++----
 .../OrchestrationShardingSphereDataSource.java     | 30 ++++++++------
 .../OrchestrationShardingSphereDataSourceTest.java | 23 ++++++-----
 .../OrchestrationSpringBootConfiguration.java      |  8 ++--
 .../constants/DataSourceBeanDefinitionTag.java     |  6 ++-
 .../parser/DataSourceBeanDefinitionParser.java     | 46 +++++++++++++++++++---
 .../resources/META-INF/namespace/orchestration.xsd |  6 ++-
 .../META-INF/rdb/encryptOrchestration.xml          |  7 +++-
 .../META-INF/rdb/masterSlaveOrchestration.xml      | 14 +++++--
 .../rdb/namespace/encryptDataSourceNamespace.xml   |  7 ----
 .../namespace/masterSlaveDataSourceNamespace.xml   | 13 ------
 .../rdb/namespace/shardingDataSourceNamespace.xml  | 23 -----------
 .../rdb/namespace/shardingMasterSlaveNamespace.xml |  4 --
 .../rdb/shardingMasterSlaveOrchestration.xml       |  4 +-
 .../META-INF/rdb/shardingOrchestration.xml         | 24 ++++++-----
 16 files changed, 129 insertions(+), 109 deletions(-)