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 6cdf5ef Fix #11861 (#11879)
6cdf5ef is described below
commit 6cdf5ef9e37f1e0f6ef0d15d0330ce3eeec6572e
Author: yx9o <[email protected]>
AuthorDate: Wed Aug 18 20:23:52 2021 +0800
Fix #11861 (#11879)
* Refactor government-spring-boot-example
* Refactor spring-namespace-governance-example
* Refactor transaction-2pc-xa-raw-jdbc-example
* Refactor encrypt-spring-boot-example
* Refactor encrypt-spring-namespace-example
* Refactor shadow-spring-boot-example
* Refactor shadow-spring-namespace-example
* Refactor directory tree
---
examples/README.md | 13 ++++++++++---
examples/README_ZH.md | 13 ++++++++++---
.../pom.xml | 2 +-
.../boot/mybatis/GovernanceSpringBootMybatisExample.java} | 6 +++---
.../src/main/resources/META-INF/mybatis-config.xml | 0
.../application-cloud-zookeeper-encrypt.properties | 0
...plication-cloud-zookeeper-readwrite-splitting.properties | 0
.../resources/application-cloud-zookeeper-shadow.properties | 0
...ion-cloud-zookeeper-sharding-databases-tables.properties | 0
.../application-local-zookeeper-encrypt.properties | 0
...plication-local-zookeeper-readwrite-splitting.properties | 0
.../resources/application-local-zookeeper-shadow.properties | 0
...ion-local-zookeeper-sharding-databases-tables.properties | 0
.../src/main/resources/application.properties | 0
.../pom.xml | 2 +-
.../mybatis/GovernanceSpringNamespaceMybatisExample.java} | 4 ++--
.../META-INF/zookeeper/cloud/application-encrypt.xml | 0
.../zookeeper/cloud/application-readwrite-splitting.xml | 0
.../META-INF/zookeeper/cloud/application-shadow.xml | 0
.../cloud/application-sharding-databases-tables.xml | 0
.../META-INF/zookeeper/local/application-encrypt.xml | 0
.../zookeeper/local/application-readwrite-splitting.xml | 0
.../META-INF/zookeeper/local/application-shadow.xml | 0
.../local/application-sharding-databases-tables.xml | 0
.../main/resources/META-INF/zookeeper/registry-center.xml | 0
.../src/main/resources/logback.xml | 0
.../shardingsphere-jdbc-example/governance-example/pom.xml | 4 ++--
.../pom.xml | 2 +-
.../boot/mybatis/EncryptSpringBootMybatisExample.java} | 6 +++---
.../src/main/resources/META-INF/mybatis-config.xml | 0
.../main/resources/application-encrypt-databases.properties | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/logback.xml | 0
.../pom.xml | 2 +-
.../mybatis/EncryptSpringNamespaceMybatisExample.java} | 4 ++--
.../resources/META-INF/application-encrypt-databases.xml | 0
.../src/main/resources/logback.xml | 0
.../other-feature-example/encrypt-example/pom.xml | 4 ++--
.../other-feature-example/shadow-example/pom.xml | 4 ++--
.../pom.xml | 2 +-
.../boot/mybatis/ShadowSpringBootMybatisExample.java} | 6 +++---
.../src/main/resources/META-INF/mybatis-config.xml | 0
.../application-encrypt-shadow-databases.properties | 0
...lication-readwrite-splitting-shadow-databases.properties | 0
.../main/resources/application-shadow-databases.properties | 0
.../application-sharding-shadow-databases.properties | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/logback.xml | 0
.../pom.xml | 2 +-
.../mybatis/ShadowSpringNamespaceMybatisExample.java} | 4 ++--
.../META-INF/application-encrypt-shadow-databases.xml | 0
.../application-readwrite-splitting-shadow-databases.xml | 0
.../resources/META-INF/application-shadow-databases.xml | 0
.../META-INF/application-sharding-shadow-databases.xml | 0
.../src/main/resources/logback.xml | 0
.../shardingsphere-jdbc-example/transaction-example/pom.xml | 2 +-
.../pom.xml | 2 +-
.../atomikos/raw/jdbc/TransactionXaAtomikosRawExample.java} | 4 ++--
.../transaction/xa/atomikos}/raw/jdbc/XAOrderService.java | 2 +-
.../META-INF/sharding-databases-tables-postgresql.yaml | 0
.../main/resources/META-INF/sharding-databases-tables.yaml | 0
.../src/main/resources/logback.xml | 0
.../xa/atomikos}/raw/jdbc/XAOrderServiceTest.java | 2 +-
.../META-INF/sharding-databases-tables-postgresql.yaml | 0
.../test/resources/META-INF/sharding-databases-tables.yaml | 0
65 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/examples/README.md b/examples/README.md
index 3356b99..ba872bc 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -49,20 +49,27 @@ shardingsphere-example
│ │ └── sharding-spring-namespace-mybatis-example
│ ├── governance-example
│ │ ├── governance-raw-jdbc-example
- │ │ ├── governance-spring-boot-example
- │ │ └── governance-spring-namespace-example
+ │ │ ├── governance-spring-boot-mybatis-example
+ │ │ └── governance-spring-namespace-mybatis-example
│ ├── transaction-example
│ │ ├── transaction-2pc-xa-bitronix-raw-jdbc-example
│ │ ├── transaction-2pc-xa-narayana-raw-jdbc-example
- │ │ ├── transaction-2pc-xa-raw-jdbc-example
+ │ │ ├── transaction-2pc-xa-atomikos-raw-jdbc-example
│ │ ├── transaction-2pc-xa-spring-boot-example
│ │ ├── transaction-2pc-xa-spring-namespace-example
│ │ ├── transaction-base-seata-raw-jdbc-example
│ │ └── transaction-base-seata-spring-boot-example
│ ├── other-feature-example
│ │ ├── encrypt-example
+ │ │ │ ├── encrypt-raw-jdbc-example
+ │ │ │ ├── encrypt-spring-boot-mybatis-example
+ │ │ │ └── encrypt-spring-namespace-mybatis-example
│ │ ├── hint-example
+ │ │ │ └── hint-raw-jdbc-example
│ │ └── shadow-example
+ │ │ │ ├── shadow-raw-jdbc-example
+ │ │ │ ├── shadow-spring-boot-mybatis-example
+ │ │ │ └── shadow-spring-namespace-mybatis-example
│ ├── extension-example
│ │ └── custom-sharding-algortihm-example
├── shardingsphere-parser-example
diff --git a/examples/README_ZH.md b/examples/README_ZH.md
index 3715dc1..bd353f0 100644
--- a/examples/README_ZH.md
+++ b/examples/README_ZH.md
@@ -49,20 +49,27 @@ shardingsphere-example
│ │ └── sharding-spring-namespace-mybatis-example
│ ├── governance-example
│ │ ├── governance-raw-jdbc-example
- │ │ ├── governance-spring-boot-example
- │ │ └── governance-spring-namespace-example
+ │ │ ├── governance-spring-boot-mybatis-example
+ │ │ └── governance-spring-namespace-mybatis-example
│ ├── transaction-example
│ │ ├── transaction-2pc-xa-bitronix-raw-jdbc-example
│ │ ├── transaction-2pc-xa-narayana-raw-jdbc-example
- │ │ ├── transaction-2pc-xa-raw-jdbc-example
+ │ │ ├── transaction-2pc-xa-atomikos-raw-jdbc-example
│ │ ├── transaction-2pc-xa-spring-boot-example
│ │ ├── transaction-2pc-xa-spring-namespace-example
│ │ ├── transaction-base-seata-raw-jdbc-example
│ │ └── transaction-base-seata-spring-boot-example
│ ├── other-feature-example
│ │ ├── encrypt-example
+ │ │ │ ├── encrypt-raw-jdbc-example
+ │ │ │ ├── encrypt-spring-boot-mybatis-example
+ │ │ │ └── encrypt-spring-namespace-mybatis-example
│ │ ├── hint-example
+ │ │ │ └── hint-raw-jdbc-example
│ │ └── shadow-example
+ │ │ │ ├── shadow-raw-jdbc-example
+ │ │ │ ├── shadow-spring-boot-mybatis-example
+ │ │ │ └── shadow-spring-namespace-mybatis-example
│ ├── extension-example
│ │ └── custom-sharding-algortihm-example
├── shardingsphere-parser-example
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/pom.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/pom.xml
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/pom.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/pom.xml
index b067ddf..3be6a40 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/pom.xml
@@ -25,7 +25,7 @@
<artifactId>governance-example</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>governance-spring-boot-example</artifactId>
+ <artifactId>governance-spring-boot-mybatis-example</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/java/org/apache/shardingsphere/example/governance/spring/boot/GovernanceSpringBootExample.java
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/governance/spring/boot/mybatis/GovernanceSpringBootMybatisExample.java
similarity index 93%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/java/org/apache/shardingsphere/example/governance/spring/boot/GovernanceSpringBootExample.java
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/governance/spring/boot/mybatis/GovernanceSpringBootMybatisExample.java
index d6ab71e..6993e81 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/java/org/apache/shardingsphere/example/governance/spring/boot/GovernanceSpringBootExample.java
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/governance/spring/boot/mybatis/GovernanceSpringBootMybatisExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.governance.spring.boot;
+package org.apache.shardingsphere.example.governance.spring.boot.mybatis;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -31,10 +31,10 @@ import java.sql.SQLException;
@ComponentScan("org.apache.shardingsphere.example.core.mybatis")
@MapperScan(basePackages =
"org.apache.shardingsphere.example.core.mybatis.repository")
@SpringBootApplication(exclude = JtaAutoConfiguration.class)
-public class GovernanceSpringBootExample {
+public class GovernanceSpringBootMybatisExample {
public static void main(final String[] args) throws SQLException {
- try (ConfigurableApplicationContext applicationContext =
SpringApplication.run(GovernanceSpringBootExample.class, args)) {
+ try (ConfigurableApplicationContext applicationContext =
SpringApplication.run(GovernanceSpringBootMybatisExample.class, args)) {
ExampleExecuteTemplate.run(applicationContext.getBean(ExampleService.class));
}
}
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/META-INF/mybatis-config.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/META-INF/mybatis-config.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-shadow.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-shadow.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-encrypt.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-encrypt.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-shadow.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-shadow.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application.properties
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-mybatis-example/src/main/resources/application.properties
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/pom.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/pom.xml
similarity index 97%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/pom.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/pom.xml
index 8ad5287..39973f9 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/pom.xml
@@ -25,7 +25,7 @@
<artifactId>governance-example</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>governance-spring-namespace-example</artifactId>
+ <artifactId>governance-spring-namespace-mybatis-example</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/GovernanceSpringNamespaceExample.java
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/mybatis/GovernanceSpringNamespaceMybatisExample.java
similarity index 97%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/GovernanceSpringNamespaceExample.java
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/mybatis/GovernanceSpringNamespaceMybatisExample.java
index ee944c3..659ec6f 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/GovernanceSpringNamespaceExample.java
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/mybatis/GovernanceSpringNamespaceMybatisExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.governance.spring.namespace;
+package org.apache.shardingsphere.example.governance.spring.namespace.mybatis;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -26,7 +26,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import java.sql.SQLException;
-public final class GovernanceSpringNamespaceExample {
+public final class GovernanceSpringNamespaceMybatisExample {
private static ShardingType shardingType =
ShardingType.SHARDING_DATABASES_AND_TABLES;
// private static ShardingType shardingType =
ShardingType.SHARDING_READWRITE_SPLITTING;
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-readwrite-splitting.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-readwrite-splitting.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-readwrite-splitting.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-readwrite-splitting.xml
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
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-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml
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-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
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-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/registry-center.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/registry-center.xml
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/logback.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/logback.xml
rename to
examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-mybatis-example/src/main/resources/logback.xml
diff --git a/examples/shardingsphere-jdbc-example/governance-example/pom.xml
b/examples/shardingsphere-jdbc-example/governance-example/pom.xml
index 6ac4b5d..37b9e0e 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/pom.xml
+++ b/examples/shardingsphere-jdbc-example/governance-example/pom.xml
@@ -31,7 +31,7 @@
<modules>
<module>governance-raw-jdbc-example</module>
- <module>governance-spring-boot-example</module>
- <module>governance-spring-namespace-example</module>
+ <module>governance-spring-boot-mybatis-example</module>
+ <module>governance-spring-namespace-mybatis-example</module>
</modules>
</project>
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/pom.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/pom.xml
similarity index 97%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/pom.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/pom.xml
index 5dadfc4..c3f896b 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/pom.xml
@@ -25,7 +25,7 @@
<artifactId>encrypt-example</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>encrypt-spring-boot-example</artifactId>
+ <artifactId>encrypt-spring-boot-mybatis-example</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/boot/EncryptSpringBootExample.java
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/boot/mybatis/EncryptSpringBootMybatisExample.java
similarity index 93%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/boot/EncryptSpringBootExample.java
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/boot/mybatis/EncryptSpringBootMybatisExample.java
index 19b5db0..8b3689d 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/boot/EncryptSpringBootExample.java
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/boot/mybatis/EncryptSpringBootMybatisExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.encrypt.table.spring.boot;
+package org.apache.shardingsphere.example.encrypt.table.spring.boot.mybatis;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -31,10 +31,10 @@ import java.sql.SQLException;
@ComponentScan("org.apache.shardingsphere.example.core.mybatis")
@MapperScan(basePackages =
"org.apache.shardingsphere.example.core.mybatis.repository")
@SpringBootApplication(exclude = JtaAutoConfiguration.class)
-public class EncryptSpringBootExample {
+public class EncryptSpringBootMybatisExample {
public static void main(final String[] args) throws SQLException {
- try (ConfigurableApplicationContext applicationContext =
SpringApplication.run(EncryptSpringBootExample.class, args)) {
+ try (ConfigurableApplicationContext applicationContext =
SpringApplication.run(EncryptSpringBootMybatisExample.class, args)) {
ExampleExecuteTemplate.run(applicationContext.getBean("encrypt",
ExampleService.class));
}
}
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/META-INF/mybatis-config.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/META-INF/mybatis-config.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application-encrypt-databases.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application-encrypt-databases.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application-encrypt-databases.properties
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application-encrypt-databases.properties
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application.properties
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application.properties
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/logback.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/logback.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/logback.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/pom.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/pom.xml
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/pom.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/pom.xml
index 005f9a3..2a51487 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/pom.xml
@@ -25,7 +25,7 @@
<artifactId>encrypt-example</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>encrypt-spring-namespace-example</artifactId>
+ <artifactId>encrypt-spring-namespace-mybatis-example</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/namespace/EncryptSpringNamespaceExample.java
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/namespace/mybatis/EncryptSpringNamespaceMybatisExample.java
similarity index 95%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/namespace/EncryptSpringNamespaceExample.java
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/namespace/mybatis/EncryptSpringNamespaceMybatisExample.java
index 29d12db..b2611da 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/namespace/EncryptSpringNamespaceExample.java
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/spring/namespace/mybatis/EncryptSpringNamespaceMybatisExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.encrypt.table.spring.namespace;
+package
org.apache.shardingsphere.example.encrypt.table.spring.namespace.mybatis;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -24,7 +24,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import java.sql.SQLException;
-public final class EncryptSpringNamespaceExample {
+public final class EncryptSpringNamespaceMybatisExample {
private static final String CONFIG_FILE =
"META-INF/application-encrypt-databases.xml";
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/src/main/resources/META-INF/application-encrypt-databases.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-databases.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/src/main/resources/META-INF/application-encrypt-databases.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-databases.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/logback.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-example/src/main/resources/logback.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/logback.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/pom.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/pom.xml
index 78d0c9f..74ab857 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/pom.xml
@@ -32,7 +32,7 @@
<modules>
<module>encrypt-raw-jdbc-example</module>
- <module>encrypt-spring-boot-example</module>
- <module>encrypt-spring-namespace-example</module>
+ <module>encrypt-spring-boot-mybatis-example</module>
+ <module>encrypt-spring-namespace-mybatis-example</module>
</modules>
</project>
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/pom.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/pom.xml
index 69a0904..17566bf 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/pom.xml
@@ -31,7 +31,7 @@
<modules>
<module>shadow-raw-jdbc-example</module>
- <module>shadow-spring-boot-example</module>
- <module>shadow-spring-namespace-example</module>
+ <module>shadow-spring-boot-mybatis-example</module>
+ <module>shadow-spring-namespace-mybatis-example</module>
</modules>
</project>
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/pom.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/pom.xml
similarity index 97%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/pom.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/pom.xml
index 19c3ac9..b7c227f 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/pom.xml
@@ -25,7 +25,7 @@
<artifactId>shadow-example</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shadow-spring-boot-example</artifactId>
+ <artifactId>shadow-spring-boot-mybatis-example</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/boot/ShadowSpringBootExample.java
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/boot/mybatis/ShadowSpringBootMybatisExample.java
similarity index 93%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/boot/ShadowSpringBootExample.java
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/boot/mybatis/ShadowSpringBootMybatisExample.java
index 4e83aee..2207b8a 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/boot/ShadowSpringBootExample.java
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/boot/mybatis/ShadowSpringBootMybatisExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.shadow.table.spring.boot;
+package org.apache.shardingsphere.example.shadow.table.spring.boot.mybatis;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -31,10 +31,10 @@ import java.sql.SQLException;
@ComponentScan("org.apache.shardingsphere.example.core.mybatis")
@MapperScan(basePackages =
"org.apache.shardingsphere.example.core.mybatis.repository")
@SpringBootApplication(exclude = JtaAutoConfiguration.class)
-public class ShadowSpringBootExample {
+public class ShadowSpringBootMybatisExample {
public static void main(final String[] args) throws SQLException {
- try (ConfigurableApplicationContext applicationContext =
SpringApplication.run(ShadowSpringBootExample.class, args)) {
+ try (ConfigurableApplicationContext applicationContext =
SpringApplication.run(ShadowSpringBootMybatisExample.class, args)) {
ExampleExecuteTemplate.run(applicationContext.getBean("shadow",
ExampleService.class));
}
}
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/META-INF/mybatis-config.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/META-INF/mybatis-config.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-encrypt-shadow-databases.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-encrypt-shadow-databases.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-encrypt-shadow-databases.properties
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-encrypt-shadow-databases.properties
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-readwrite-splitting-shadow-databases.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-readwrite-splitting-shadow-databases.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-readwrite-splitting-shadow-databases.properties
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-readwrite-splitting-shadow-databases.properties
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-shadow-databases.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-databases.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-shadow-databases.properties
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-databases.properties
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-sharding-shadow-databases.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-sharding-shadow-databases.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application-sharding-shadow-databases.properties
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-sharding-shadow-databases.properties
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application.properties
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-example/src/main/resources/application.properties
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application.properties
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/logback.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/logback.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/logback.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/pom.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/pom.xml
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/pom.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/pom.xml
index f48fbd3..459bbdd 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.shardingsphere.example</groupId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shadow-spring-namespace-example</artifactId>
+ <artifactId>shadow-spring-namespace-mybatis-example</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/ShadowSpringNamespaceExample.java
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/mybatis/ShadowSpringNamespaceMybatisExample.java
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/ShadowSpringNamespaceExample.java
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/mybatis/ShadowSpringNamespaceMybatisExample.java
index 1e822e2..6b982f6 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/ShadowSpringNamespaceExample.java
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/mybatis/ShadowSpringNamespaceMybatisExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.shadow.table.spring.namespace;
+package
org.apache.shardingsphere.example.shadow.table.spring.namespace.mybatis;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -24,7 +24,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import java.sql.SQLException;
-public final class ShadowSpringNamespaceExample {
+public final class ShadowSpringNamespaceMybatisExample {
private static final String CONFIG_FILE =
"META-INF/application-shadow-databases.xml";
// private static final String CONFIG_FILE =
"META-INF/application-sharding-shadow-databases.xml";
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-encrypt-shadow-databases.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-shadow-databases.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-encrypt-shadow-databases.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-shadow-databases.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-readwrite-splitting-shadow-databases.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-readwrite-splitting-shadow-databases.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-readwrite-splitting-shadow-databases.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-readwrite-splitting-shadow-databases.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-shadow-databases.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-databases.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-shadow-databases.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-databases.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-sharding-shadow-databases.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-shadow-databases.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-sharding-shadow-databases.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-shadow-databases.xml
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/logback.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/logback.xml
rename to
examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/logback.xml
diff --git a/examples/shardingsphere-jdbc-example/transaction-example/pom.xml
b/examples/shardingsphere-jdbc-example/transaction-example/pom.xml
index 5f88d78..de49f3b 100644
--- a/examples/shardingsphere-jdbc-example/transaction-example/pom.xml
+++ b/examples/shardingsphere-jdbc-example/transaction-example/pom.xml
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<modules>
- <module>transaction-2pc-xa-raw-jdbc-example</module>
+ <module>transaction-2pc-xa-atomikos-raw-jdbc-example</module>
<module>transaction-2pc-xa-bitronix-raw-jdbc-example</module>
<module>transaction-2pc-xa-narayana-raw-jdbc-example</module>
<module>transaction-2pc-xa-spring-boot-example</module>
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/pom.xml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/pom.xml
similarity index 95%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/pom.xml
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/pom.xml
index f5c7003..10f7bd2 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/pom.xml
@@ -25,7 +25,7 @@
<artifactId>transaction-example</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>transaction-2pc-xa-raw-jdbc-example</artifactId>
+ <artifactId>transaction-2pc-xa-atomikos-raw-jdbc-example</artifactId>
<name>Example::transaction::2pc-xa-raw-jdbc</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/TransactionXaRawExample.java
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/TransactionXaAtomikosRawExample.java
similarity index 89%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/TransactionXaRawExample.java
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/TransactionXaAtomikosRawExample.java
index b5818d3..ba95c35 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/TransactionXaRawExample.java
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/TransactionXaAtomikosRawExample.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.transaction.xa.raw.jdbc;
+package org.apache.shardingsphere.example.transaction.xa.atomikos.raw.jdbc;
import java.io.IOException;
import java.sql.SQLException;
-public final class TransactionXaRawExample {
+public final class TransactionXaAtomikosRawExample {
public static void main(final String[] args) throws IOException,
SQLException {
XAOrderService orderService = new
XAOrderService("/META-INF/sharding-databases-tables.yaml");
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/XAOrderService.java
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java
similarity index 98%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/XAOrderService.java
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java
index 3edcbb8..e78df5a 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/XAOrderService.java
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.transaction.xa.raw.jdbc;
+package org.apache.shardingsphere.example.transaction.xa.atomikos.raw.jdbc;
import
org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
import org.apache.shardingsphere.transaction.core.TransactionType;
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-postgresql.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-postgresql.yaml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-postgresql.yaml
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-postgresql.yaml
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/resources/logback.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/main/resources/logback.xml
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/resources/logback.xml
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/XAOrderServiceTest.java
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderServiceTest.java
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/XAOrderServiceTest.java
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderServiceTest.java
index 0afcfb3..a4c3c2f 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/raw/jdbc/XAOrderServiceTest.java
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.transaction.xa.raw.jdbc;
+package org.apache.shardingsphere.example.transaction.xa.atomikos.raw.jdbc;
import org.junit.After;
import org.junit.Before;
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables-postgresql.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables-postgresql.yaml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables-postgresql.yaml
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables-postgresql.yaml
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables.yaml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables.yaml
rename to
examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/test/resources/META-INF/sharding-databases-tables.yaml
