This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 89207b8 Refactor example for spring namespace (#7651)
89207b8 is described below
commit 89207b8882d24fd6a3967adffb711526ac972c66
Author: Haoran Meng <[email protected]>
AuthorDate: Mon Sep 28 19:03:09 2020 +0800
Refactor example for spring namespace (#7651)
---
.../main/resources/META-INF/nacos/local/application-encrypt.xml | 9 ++-------
.../main/resources/META-INF/nacos/local/application-shadow.xml | 3 ---
.../nacos/local/application-sharding-databases-tables.xml | 3 +--
.../resources/META-INF/zookeeper/local/application-encrypt.xml | 3 ---
.../resources/META-INF/zookeeper/local/application-shadow.xml | 3 ---
.../zookeeper/local/application-sharding-databases-tables.xml | 3 ---
6 files changed, 3 insertions(+), 21 deletions(-)
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-encrypt.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-encrypt.xml
index 5c46c61..cc7c91b 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-encrypt.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-encrypt.xml
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
xmlns:tx="http://www.springframework.org/schema/tx";
-
xmlns:shardingsphere="http://shardingsphere.apache.org/schema/shardingsphere/datasource";
xmlns:encrypt="http://shardingsphere.apache.org/schema/shardingsphere/encrypt";
xmlns:governance="http://shardingsphere.apache.org/schema/shardingsphere/governance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -29,8 +28,6 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/encrypt
http://shardingsphere.apache.org/schema/shardingsphere/encrypt/encrypt.xsd
http://shardingsphere.apache.org/schema/shardingsphere/governance
@@ -60,13 +57,11 @@
</encrypt:table>
</encrypt:rule>
- <shardingsphere:data-source id="realEncryptDataSource"
data-source-names="dbtbl_0" rule-refs="encryptRule">
+ <governance:data-source id="encryptDataSource"
data-source-names="demo_ds_encrypt" reg-center-ref="regCenter"
config-center-ref="confCenter" rule-refs="encryptRule">
<props>
<prop key="query-with-cipher-column">true</prop>
</props>
- </shardingsphere:data-source>
-
- <governance:data-source id="encryptDataSource"
data-source-ref="realEncryptDataSource" reg-center-ref="regCenter"
config-center-ref="confCenter" />
+ </governance:data-source>
<bean id="transactionManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="encryptDataSource" />
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-shadow.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-shadow.xml
index 921afdc..5dfbfa3 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-shadow.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-shadow.xml
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
xmlns:tx="http://www.springframework.org/schema/tx";
-
xmlns:shardingsphere="http://shardingsphere.apache.org/schema/shardingsphere/datasource";
xmlns:shadow="http://shardingsphere.apache.org/schema/shardingsphere/shadow";
xmlns:governance="http://shardingsphere.apache.org/schema/shardingsphere/governance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -29,8 +28,6 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/shadow
http://shardingsphere.apache.org/schema/shardingsphere/shadow/shadow.xsd
http://shardingsphere.apache.org/schema/shardingsphere/governance
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-sharding-databases-tables.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-sharding-databases-tables.xml
index ac86c33..717feda 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-sharding-databases-tables.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-sharding-databases-tables.xml
@@ -95,8 +95,7 @@
</sharding:broadcast-table-rules>
</sharding:rule>
- <shardingsphere:data-source id="realShardingDatabasesTablesDataSource"
data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule" />
- <governance:data-source id="shardingDatabasesTablesDataSource"
data-source-names="realShardingDatabasesTablesDataSource"
reg-center-ref="regCenter" rule-refs="shardingRule"/>
+ <governance:data-source id="shardingDatabasesTablesDataSource"
data-source-names="demo_ds_0, demo_ds_1" reg-center-ref="regCenter"
rule-refs="shardingRule"/>
<bean id="transactionManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="shardingDatabasesTablesDataSource" />
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
index cd512b7..5c11a26 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
xmlns:tx="http://www.springframework.org/schema/tx";
-
xmlns:shardingsphere="http://shardingsphere.apache.org/schema/shardingsphere/datasource";
xmlns:encrypt="http://shardingsphere.apache.org/schema/shardingsphere/encrypt";
xmlns:governance="http://shardingsphere.apache.org/schema/shardingsphere/governance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -29,8 +28,6 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/encrypt
http://shardingsphere.apache.org/schema/shardingsphere/encrypt/encrypt.xsd
http://shardingsphere.apache.org/schema/shardingsphere/governance
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
index 2de4803..c506e52 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
xmlns:tx="http://www.springframework.org/schema/tx";
-
xmlns:shardingsphere="http://shardingsphere.apache.org/schema/shardingsphere/datasource";
xmlns:shadow="http://shardingsphere.apache.org/schema/shardingsphere/shadow";
xmlns:governance="http://shardingsphere.apache.org/schema/shardingsphere/governance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -29,8 +28,6 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/shadow
http://shardingsphere.apache.org/schema/shardingsphere/shadow/shadow.xsd
http://shardingsphere.apache.org/schema/shardingsphere/governance
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
index a9a7057..4e80852 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
xmlns:tx="http://www.springframework.org/schema/tx";
-
xmlns:shardingsphere="http://shardingsphere.apache.org/schema/shardingsphere/datasource";
xmlns:sharding="http://shardingsphere.apache.org/schema/shardingsphere/sharding";
xmlns:governance="http://shardingsphere.apache.org/schema/shardingsphere/governance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -29,8 +28,6 @@
http://www.springframework.org/schema/tx/spring-tx.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource
-
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/sharding
http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
http://shardingsphere.apache.org/schema/shardingsphere/governance
