You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/09/27 08:12:45 UTC
[shardingsphere] branch master updated: Fixes spring namespace
examples (#7620)
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 71f57dd Fixes spring namespace examples (#7620)
71f57dd is described below
commit 71f57ddbb87a852dee374bce5887768f9130aa32
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Sun Sep 27 16:12:33 2020 +0800
Fixes spring namespace examples (#7620)
---
.../resources/META-INF/zookeeper/local/application-encrypt.xml | 8 +++-----
.../resources/META-INF/zookeeper/local/application-shadow.xml | 10 ++--------
.../zookeeper/local/application-sharding-databases-tables.xml | 3 +--
3 files changed, 6 insertions(+), 15 deletions(-)
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 2177bd8..cd512b7 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
@@ -39,7 +39,7 @@
<import resource="classpath*:META-INF/zookeeper/registry-center.xml" />
<context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
- <bean id="demo_ds_encrypt" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
+ <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
<property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds"/>
<property name="username" value="root"/>
@@ -60,13 +60,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" reg-center-ref="regCenter" 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" />
+ </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/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 96f1cbd..2de4803 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
@@ -53,15 +53,9 @@
<property name="password" value=""/>
</bean>
- <shadow:rule id="shadowRule" column="shadow">
- <shadow:mappings>
- <shadow:mapping product-data-source-name="demo_ds" shadow-data-source-name="shadow_demo_ds"/>
- </shadow:mappings>
- </shadow:rule>
+ <shadow:rule id="shadowRule" column="shadow" sourceDataSourceNames="demo_ds" shadowDataSourceNames="shadow_demo_ds"/>
- <shardingsphere:data-source id="realShadowDataSource" data-source-names="demo_ds,shadow_demo_ds" rule-refs="shadowRule" />
-
- <governance:data-source id="shadowDataSource" data-source-ref="realShadowDataSource" reg-center-ref="regCenter" />
+ <governance:data-source id="shadowDataSource" data-source-names="demo_ds,shadow_demo_ds" reg-center-ref="regCenter" rule-refs="shadowRule"/>
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="shadowDataSource" />
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 9305ec3..a9a7057 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
@@ -98,8 +98,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" />