From 9d200ad127234da3047cdbe05da07256c22221f1 Mon Sep 17 00:00:00 2001
From: terrymanu
Date: Wed, 26 Sep 2018 17:34:04 +0800
Subject: [PATCH] for #1302, Rename sharding-jdbc-spring's base package to
io.shardingsphere.shardingjdbc
---
.../spring/boot/SpringBootConfiguration.java | 10 +++++-----
...asterSlaveRuleConfigurationProperties.java | 2 +-
...otShardingRuleConfigurationProperties.java | 2 +-
.../spring/boot/util/PropertyUtil.java | 2 +-
...itional-spring-configuration-metadata.json | 4 ++--
.../main/resources/META-INF/spring.factories | 2 +-
.../spring/boot/AllTests.java | 6 +++---
.../boot/type/SpringBootMasterSlaveTest.java | 2 +-
.../boot/type/SpringBootShardingTest.java | 2 +-
.../SpringMasterSlaveDataSource.java | 2 +-
.../datasource/SpringShardingDataSource.java | 2 +-
...laveDataSourceBeanDefinitionParserTag.java | 2 +-
...dingDataSourceBeanDefinitionParserTag.java | 2 +-
...ardingStrategyBeanDefinitionParserTag.java | 2 +-
.../handler/MasterSlaveNamespaceHandler.java | 6 +++---
.../handler/ShardingNamespaceHandler.java | 10 +++++-----
...erSlaveDataSourceBeanDefinitionParser.java | 8 ++++----
...hardingDataSourceBeanDefinitionParser.java | 8 ++++----
.../ShardingStrategyBeanDefinition.java | 4 ++--
.../ShardingStrategyBeanDefinitionParser.java | 2 +-
.../main/resources/META-INF/spring.handlers | 4 ++--
...ardingBothDataBasesAndTablesJUnitTest.java | 2 +-
.../spring/AbstractSpringJUnitTest.java | 2 +-
.../spring/AllTests.java | 18 ++++++++---------
.../spring/GenerateKeyJUnitTest.java | 10 +++++-----
.../spring/MasterSlaveNamespaceTest.java | 6 +++---
.../spring/ShardingNamespaceTest.java | 20 +++++++++----------
.../DefaultComplexKeysShardingAlgorithm.java | 2 +-
.../DefaultHintShardingAlgorithm.java | 2 +-
...reciseModuloDatabaseShardingAlgorithm.java | 2 +-
.../PreciseModuloTableShardingAlgorithm.java | 2 +-
.../RangeModuloDatabaseShardingAlgorithm.java | 2 +-
.../RangeModuloTableShardingAlgorithm.java | 2 +-
.../WithNamespaceAlgorithmClassTest.java | 4 ++--
.../WithNamespaceAlgorithmExpressionTest.java | 4 ++--
.../cases/WithNamespaceBindingTablesTest.java | 4 ++--
.../WithNamespaceDefaultStrategyTest.java | 4 ++--
.../WithNamespaceDifferentTablesTest.java | 4 ++--
...ForMasterSlaveWithDefaultStrategyTest.java | 4 ++--
...paceForMasterSlaveWithStrategyRefTest.java | 4 ++--
...aceForMasterSlaveWithStrategyTypeTest.java | 4 ++--
.../cases/WithNamespaceLogicIndexTest.java | 4 ++--
.../spring/fixture/DecrementKeyGenerator.java | 2 +-
.../spring/fixture/IncrementKeyGenerator.java | 2 +-
.../spring/util/FieldValueUtil.java | 2 +-
.../META-INF/rdb/shardingNamespace.xml | 12 +++++------
.../rdb/withNamespaceAlgorithmClass.xml | 4 ++--
.../withNamespaceAlgorithmClassAndProps.xml | 4 ++--
.../rdb/withNamespaceBindingTables.xml | 4 ++--
.../rdb/withNamespaceDefaultStrategy.xml | 4 ++--
.../rdb/withNamespaceGenerateKeyColumns.xml | 8 ++++----
.../META-INF/rdb/withNamespaceLogicIndex.xml | 4 ++--
.../spring/boot/AllTests.java | 6 +++---
...rchestrationSpringBootMasterSlaveTest.java | 6 +++---
.../OrchestrationSpringBootShardingTest.java | 6 +++---
.../spring/boot/util/EmbedTestingServer.java | 2 +-
56 files changed, 128 insertions(+), 128 deletions(-)
rename sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/SpringBootConfiguration.java (91%)
rename sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java (94%)
rename sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java (94%)
rename sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/util/PropertyUtil.java (98%)
rename sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/AllTests.java (80%)
rename sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/type/SpringBootMasterSlaveTest.java (97%)
rename sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/type/SpringBootShardingTest.java (98%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/datasource/SpringMasterSlaveDataSource.java (98%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/datasource/SpringShardingDataSource.java (96%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java (95%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java (97%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/constants/ShardingStrategyBeanDefinitionParserTag.java (96%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/handler/MasterSlaveNamespaceHandler.java (78%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/handler/ShardingNamespaceHandler.java (78%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java (93%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java (97%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/parser/ShardingStrategyBeanDefinition.java (96%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/namespace/parser/ShardingStrategyBeanDefinitionParser.java (95%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java (98%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/AbstractSpringJUnitTest.java (98%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/AllTests.java (64%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/GenerateKeyJUnitTest.java (93%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/MasterSlaveNamespaceTest.java (97%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/ShardingNamespaceTest.java (95%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java (95%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/algorithm/DefaultHintShardingAlgorithm.java (94%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java (95%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/algorithm/PreciseModuloTableShardingAlgorithm.java (95%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java (96%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/algorithm/RangeModuloTableShardingAlgorithm.java (96%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceAlgorithmClassTest.java (85%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceAlgorithmExpressionTest.java (85%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceBindingTablesTest.java (85%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceDefaultStrategyTest.java (85%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceDifferentTablesTest.java (85%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java (89%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java (89%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java (89%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/cases/WithNamespaceLogicIndexTest.java (91%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/fixture/DecrementKeyGenerator.java (94%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/fixture/IncrementKeyGenerator.java (94%)
rename sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/util/FieldValueUtil.java (97%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/AllTests.java (79%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java (95%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/type/OrchestrationSpringBootShardingTest.java (96%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/{jdbc => shardingjdbc}/spring/boot/util/EmbedTestingServer.java (97%)
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/SpringBootConfiguration.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/SpringBootConfiguration.java
similarity index 91%
rename from sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/SpringBootConfiguration.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/SpringBootConfiguration.java
index 71475caf3b709..627020604720d 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/SpringBootConfiguration.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/SpringBootConfiguration.java
@@ -15,16 +15,16 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot;
+package io.shardingsphere.shardingjdbc.spring.boot;
import com.google.common.base.Preconditions;
+import io.shardingsphere.core.exception.ShardingException;
import io.shardingsphere.shardingjdbc.api.MasterSlaveDataSourceFactory;
import io.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory;
-import io.shardingsphere.core.exception.ShardingException;
+import io.shardingsphere.shardingjdbc.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
+import io.shardingsphere.shardingjdbc.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
+import io.shardingsphere.shardingjdbc.spring.boot.util.PropertyUtil;
import io.shardingsphere.shardingjdbc.util.DataSourceUtil;
-import io.shardingsphere.jdbc.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
-import io.shardingsphere.jdbc.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
-import io.shardingsphere.jdbc.spring.boot.util.PropertyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.EnvironmentAware;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
similarity index 94%
rename from sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
index d954a62756ad5..92a5dcfc9e2d4 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.masterslave;
+package io.shardingsphere.shardingjdbc.spring.boot.masterslave;
import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
similarity index 94%
rename from sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
index 28e6e7bbe60da..26bd6a624d0be 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.sharding;
+package io.shardingsphere.shardingjdbc.spring.boot.sharding;
import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/util/PropertyUtil.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java
similarity index 98%
rename from sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/util/PropertyUtil.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java
index 9daf835153a9b..8f36ce82ff04a 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/util/PropertyUtil.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.util;
+package io.shardingsphere.shardingjdbc.spring.boot.util;
import io.shardingsphere.core.exception.ShardingException;
import lombok.AccessLevel;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index b39189b47be4e..7bfb63222b09c 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -2,7 +2,7 @@
"groups": [
{
"name": "sharding.jdbc.datasource",
- "type": "io.shardingsphere.jdbc.spring.boot.SpringBootConfiguration"
+ "type": "io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration"
},
{
"sourceType": "io.shardingsphere.core.yaml.sharding.YamlShardingStrategyConfiguration",
@@ -59,7 +59,7 @@
{
"name": "sharding.jdbc.datasource.names",
"type": "java.lang.String",
- "sourceType": "io.shardingsphere.jdbc.spring.boot.SpringBootConfiguration"
+ "sourceType": "io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration"
},
{
"name": "sharding.jdbc.datasource",
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/spring.factories b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/spring.factories
index 1aab7035200bc..63410411b79fa 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/spring.factories
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-io.shardingsphere.jdbc.spring.boot.SpringBootConfiguration
+io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/AllTests.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/AllTests.java
similarity index 80%
rename from sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/AllTests.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/AllTests.java
index c62fba9e54b17..5e8664c75cf9c 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/AllTests.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/AllTests.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot;
+package io.shardingsphere.shardingjdbc.spring.boot;
-import io.shardingsphere.jdbc.spring.boot.type.SpringBootMasterSlaveTest;
-import io.shardingsphere.jdbc.spring.boot.type.SpringBootShardingTest;
+import io.shardingsphere.shardingjdbc.spring.boot.type.SpringBootMasterSlaveTest;
+import io.shardingsphere.shardingjdbc.spring.boot.type.SpringBootShardingTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootMasterSlaveTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/SpringBootMasterSlaveTest.java
similarity index 97%
rename from sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootMasterSlaveTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/SpringBootMasterSlaveTest.java
index aa8e1d81ed8ea..d007089b1f8d0 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootMasterSlaveTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/SpringBootMasterSlaveTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.type;
+package io.shardingsphere.shardingjdbc.spring.boot.type;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootShardingTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/SpringBootShardingTest.java
similarity index 98%
rename from sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootShardingTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/SpringBootShardingTest.java
index 41a07afe24353..207e387718330 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootShardingTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/SpringBootShardingTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.type;
+package io.shardingsphere.shardingjdbc.spring.boot.type;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.constant.properties.ShardingProperties;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringMasterSlaveDataSource.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/datasource/SpringMasterSlaveDataSource.java
similarity index 98%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringMasterSlaveDataSource.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/datasource/SpringMasterSlaveDataSource.java
index 848911f84487b..755b52659a8a9 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringMasterSlaveDataSource.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/datasource/SpringMasterSlaveDataSource.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.datasource;
+package io.shardingsphere.shardingjdbc.spring.datasource;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringShardingDataSource.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/datasource/SpringShardingDataSource.java
similarity index 96%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringShardingDataSource.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/datasource/SpringShardingDataSource.java
index 7cb05a2df3ec8..0ec21665151a7 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringShardingDataSource.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/datasource/SpringShardingDataSource.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.datasource;
+package io.shardingsphere.shardingjdbc.spring.datasource;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
similarity index 95%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
index e41f20864ab31..efe7fdf621fc5 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.constants;
+package io.shardingsphere.shardingjdbc.spring.namespace.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
similarity index 97%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
index 3c79c58296a97..796bd92d914ff 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.constants;
+package io.shardingsphere.shardingjdbc.spring.namespace.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/ShardingStrategyBeanDefinitionParserTag.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/ShardingStrategyBeanDefinitionParserTag.java
similarity index 96%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/ShardingStrategyBeanDefinitionParserTag.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/ShardingStrategyBeanDefinitionParserTag.java
index 3af669b02955c..ca281999c8ba1 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/constants/ShardingStrategyBeanDefinitionParserTag.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/constants/ShardingStrategyBeanDefinitionParserTag.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.constants;
+package io.shardingsphere.shardingjdbc.spring.namespace.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/handler/MasterSlaveNamespaceHandler.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/handler/MasterSlaveNamespaceHandler.java
similarity index 78%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/handler/MasterSlaveNamespaceHandler.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/handler/MasterSlaveNamespaceHandler.java
index 8b20949eb13a7..ab84068ac2a34 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/handler/MasterSlaveNamespaceHandler.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/handler/MasterSlaveNamespaceHandler.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.handler;
+package io.shardingsphere.shardingjdbc.spring.namespace.handler;
-import io.shardingsphere.jdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.spring.namespace.parser.MasterSlaveDataSourceBeanDefinitionParser;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.namespace.parser.MasterSlaveDataSourceBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
/**
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/handler/ShardingNamespaceHandler.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/handler/ShardingNamespaceHandler.java
similarity index 78%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/handler/ShardingNamespaceHandler.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/handler/ShardingNamespaceHandler.java
index a301b58307912..a76a766b2508e 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/handler/ShardingNamespaceHandler.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/handler/ShardingNamespaceHandler.java
@@ -15,12 +15,12 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.handler;
+package io.shardingsphere.shardingjdbc.spring.namespace.handler;
-import io.shardingsphere.jdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.spring.namespace.parser.ShardingDataSourceBeanDefinitionParser;
-import io.shardingsphere.jdbc.spring.namespace.parser.ShardingStrategyBeanDefinitionParser;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.namespace.parser.ShardingDataSourceBeanDefinitionParser;
+import io.shardingsphere.shardingjdbc.spring.namespace.parser.ShardingStrategyBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
/**
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java
similarity index 93%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java
index 850dc5a4d3710..d9809536767c9 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java
@@ -15,14 +15,14 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.parser;
+package io.shardingsphere.shardingjdbc.spring.namespace.parser;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType;
-import io.shardingsphere.jdbc.spring.datasource.SpringMasterSlaveDataSource;
-import io.shardingsphere.jdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.datasource.SpringMasterSlaveDataSource;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java
similarity index 97%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java
index 0d8394b1cfdb1..af4bcaa65d4e5 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.parser;
+package io.shardingsphere.shardingjdbc.spring.namespace.parser;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -23,9 +23,9 @@
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
import io.shardingsphere.core.api.config.TableRuleConfiguration;
-import io.shardingsphere.jdbc.spring.datasource.SpringShardingDataSource;
-import io.shardingsphere.jdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.datasource.SpringShardingDataSource;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingStrategyBeanDefinition.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingStrategyBeanDefinition.java
similarity index 96%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingStrategyBeanDefinition.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingStrategyBeanDefinition.java
index d73409870080a..af02986336c62 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingStrategyBeanDefinition.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingStrategyBeanDefinition.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.parser;
+package io.shardingsphere.shardingjdbc.spring.namespace.parser;
import com.google.common.base.Strings;
import io.shardingsphere.core.api.config.strategy.ComplexShardingStrategyConfiguration;
@@ -24,7 +24,7 @@
import io.shardingsphere.core.api.config.strategy.NoneShardingStrategyConfiguration;
import io.shardingsphere.core.api.config.strategy.StandardShardingStrategyConfiguration;
import io.shardingsphere.core.exception.ShardingException;
-import io.shardingsphere.jdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
+import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingStrategyBeanDefinitionParser.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingStrategyBeanDefinitionParser.java
similarity index 95%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingStrategyBeanDefinitionParser.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingStrategyBeanDefinitionParser.java
index ed1db84f49a9a..9cf4ff539dea1 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/namespace/parser/ShardingStrategyBeanDefinitionParser.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/spring/namespace/parser/ShardingStrategyBeanDefinitionParser.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.namespace.parser;
+package io.shardingsphere.shardingjdbc.spring.namespace.parser;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/spring.handlers b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/spring.handlers
index 0168df73329b3..812445ec03d0c 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/spring.handlers
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/spring.handlers
@@ -1,2 +1,2 @@
-http\://shardingsphere.io/schema/shardingsphere/sharding=io.shardingsphere.jdbc.spring.namespace.handler.ShardingNamespaceHandler
-http\://shardingsphere.io/schema/shardingsphere/masterslave=io.shardingsphere.jdbc.spring.namespace.handler.MasterSlaveNamespaceHandler
+http\://shardingsphere.io/schema/shardingsphere/sharding=io.shardingsphere.shardingjdbc.spring.namespace.handler.ShardingNamespaceHandler
+http\://shardingsphere.io/schema/shardingsphere/masterslave=io.shardingsphere.shardingjdbc.spring.namespace.handler.MasterSlaveNamespaceHandler
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java
similarity index 98%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java
index 8789de8943214..46c5aa0850dd5 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring;
+package io.shardingsphere.shardingjdbc.spring;
import org.junit.Test;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractSpringJUnitTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AbstractSpringJUnitTest.java
similarity index 98%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractSpringJUnitTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AbstractSpringJUnitTest.java
index c598944694ba4..477ecb936aa8a 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractSpringJUnitTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AbstractSpringJUnitTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring;
+package io.shardingsphere.shardingjdbc.spring;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import lombok.Getter;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AllTests.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AllTests.java
similarity index 64%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AllTests.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AllTests.java
index 4ed6f7f1b141d..9a8922bc33111 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AllTests.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/AllTests.java
@@ -15,16 +15,16 @@
*
*/
-package io.shardingsphere.jdbc.spring;
+package io.shardingsphere.shardingjdbc.spring;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceAlgorithmClassTest;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceAlgorithmExpressionTest;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceBindingTablesTest;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceDefaultStrategyTest;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceDifferentTablesTest;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceForMasterSlaveWithDefaultStrategyTest;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyRefTest;
-import io.shardingsphere.jdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyTypeTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceAlgorithmClassTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceAlgorithmExpressionTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceBindingTablesTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceDefaultStrategyTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceDifferentTablesTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceForMasterSlaveWithDefaultStrategyTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyRefTest;
+import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyTypeTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/GenerateKeyJUnitTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/GenerateKeyJUnitTest.java
similarity index 93%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/GenerateKeyJUnitTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/GenerateKeyJUnitTest.java
index e750c11aea076..e898c4e5b5464 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/GenerateKeyJUnitTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/GenerateKeyJUnitTest.java
@@ -15,13 +15,13 @@
*
*/
-package io.shardingsphere.jdbc.spring;
+package io.shardingsphere.shardingjdbc.spring;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.TableRule;
-import io.shardingsphere.jdbc.spring.fixture.DecrementKeyGenerator;
-import io.shardingsphere.jdbc.spring.fixture.IncrementKeyGenerator;
-import io.shardingsphere.jdbc.spring.util.FieldValueUtil;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
+import io.shardingsphere.shardingjdbc.spring.fixture.DecrementKeyGenerator;
+import io.shardingsphere.shardingjdbc.spring.fixture.IncrementKeyGenerator;
+import io.shardingsphere.shardingjdbc.spring.util.FieldValueUtil;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/MasterSlaveNamespaceTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/MasterSlaveNamespaceTest.java
similarity index 97%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/MasterSlaveNamespaceTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/MasterSlaveNamespaceTest.java
index ad313daecec5e..b203f1cd44b0d 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/MasterSlaveNamespaceTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/MasterSlaveNamespaceTest.java
@@ -15,15 +15,15 @@
*
*/
-package io.shardingsphere.jdbc.spring;
+package io.shardingsphere.shardingjdbc.spring;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.core.api.algorithm.masterslave.RandomMasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.core.api.algorithm.masterslave.RoundRobinMasterSlaveLoadBalanceAlgorithm;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.core.rule.MasterSlaveRule;
-import io.shardingsphere.jdbc.spring.util.FieldValueUtil;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
+import io.shardingsphere.shardingjdbc.spring.util.FieldValueUtil;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/ShardingNamespaceTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/ShardingNamespaceTest.java
similarity index 95%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/ShardingNamespaceTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/ShardingNamespaceTest.java
index 5c13931ce596e..da612477bf88d 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/ShardingNamespaceTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/ShardingNamespaceTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring;
+package io.shardingsphere.shardingjdbc.spring;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.algorithm.masterslave.RandomMasterSlaveLoadBalanceAlgorithm;
@@ -27,19 +27,19 @@
import io.shardingsphere.core.api.config.strategy.StandardShardingStrategyConfiguration;
import io.shardingsphere.core.constant.properties.ShardingProperties;
import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.BindingTableRule;
import io.shardingsphere.core.rule.DataNode;
import io.shardingsphere.core.rule.ShardingRule;
import io.shardingsphere.core.rule.TableRule;
-import io.shardingsphere.jdbc.spring.algorithm.DefaultComplexKeysShardingAlgorithm;
-import io.shardingsphere.jdbc.spring.algorithm.DefaultHintShardingAlgorithm;
-import io.shardingsphere.jdbc.spring.algorithm.PreciseModuloDatabaseShardingAlgorithm;
-import io.shardingsphere.jdbc.spring.algorithm.PreciseModuloTableShardingAlgorithm;
-import io.shardingsphere.jdbc.spring.algorithm.RangeModuloTableShardingAlgorithm;
-import io.shardingsphere.jdbc.spring.datasource.SpringShardingDataSource;
-import io.shardingsphere.jdbc.spring.fixture.IncrementKeyGenerator;
-import io.shardingsphere.jdbc.spring.util.FieldValueUtil;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
+import io.shardingsphere.shardingjdbc.spring.algorithm.DefaultComplexKeysShardingAlgorithm;
+import io.shardingsphere.shardingjdbc.spring.algorithm.DefaultHintShardingAlgorithm;
+import io.shardingsphere.shardingjdbc.spring.algorithm.PreciseModuloDatabaseShardingAlgorithm;
+import io.shardingsphere.shardingjdbc.spring.algorithm.PreciseModuloTableShardingAlgorithm;
+import io.shardingsphere.shardingjdbc.spring.algorithm.RangeModuloTableShardingAlgorithm;
+import io.shardingsphere.shardingjdbc.spring.datasource.SpringShardingDataSource;
+import io.shardingsphere.shardingjdbc.spring.fixture.IncrementKeyGenerator;
+import io.shardingsphere.shardingjdbc.spring.util.FieldValueUtil;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
similarity index 95%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
index e6eb74294d3f5..671e453dbdb75 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.algorithm;
+package io.shardingsphere.shardingjdbc.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.complex.ComplexKeysShardingAlgorithm;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/DefaultHintShardingAlgorithm.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/DefaultHintShardingAlgorithm.java
similarity index 94%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/DefaultHintShardingAlgorithm.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/DefaultHintShardingAlgorithm.java
index 67b14503d9069..a5060afac6a76 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/DefaultHintShardingAlgorithm.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/DefaultHintShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.algorithm;
+package io.shardingsphere.shardingjdbc.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.hint.HintShardingAlgorithm;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
similarity index 95%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
index a209509f4e5fc..0a75774ef1a7a 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.algorithm;
+package io.shardingsphere.shardingjdbc.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/PreciseModuloTableShardingAlgorithm.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
similarity index 95%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
index 4d99eb4ffc065..872f98fcfd9e2 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.algorithm;
+package io.shardingsphere.shardingjdbc.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
similarity index 96%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
index b11b727334705..dcf5285a4ddda 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.algorithm;
+package io.shardingsphere.shardingjdbc.spring.algorithm;
import com.google.common.collect.Range;
import io.shardingsphere.core.api.algorithm.sharding.RangeShardingValue;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/RangeModuloTableShardingAlgorithm.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/RangeModuloTableShardingAlgorithm.java
similarity index 96%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/RangeModuloTableShardingAlgorithm.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/RangeModuloTableShardingAlgorithm.java
index e26bd6d9acf1d..657273599757e 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/algorithm/RangeModuloTableShardingAlgorithm.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/algorithm/RangeModuloTableShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.algorithm;
+package io.shardingsphere.shardingjdbc.spring.algorithm;
import com.google.common.collect.Range;
import io.shardingsphere.core.api.algorithm.sharding.RangeShardingValue;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceAlgorithmClassTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceAlgorithmClassTest.java
similarity index 85%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceAlgorithmClassTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceAlgorithmClassTest.java
index f4879316a89e8..d0a2ce9eda2d6 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceAlgorithmClassTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceAlgorithmClassTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration(locations = "classpath:META-INF/rdb/withNamespaceAlgorithmClass.xml")
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceAlgorithmExpressionTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceAlgorithmExpressionTest.java
similarity index 85%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceAlgorithmExpressionTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceAlgorithmExpressionTest.java
index 529f5c450c704..e625c3716d19f 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceAlgorithmExpressionTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceAlgorithmExpressionTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration(locations = "classpath:META-INF/rdb/withNamespaceAlgorithmExpression.xml")
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceBindingTablesTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceBindingTablesTest.java
similarity index 85%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceBindingTablesTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceBindingTablesTest.java
index f0963d08fccc1..6400be8edde1e 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceBindingTablesTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceBindingTablesTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration(locations = "classpath:META-INF/rdb/withNamespaceBindingTables.xml")
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceDefaultStrategyTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceDefaultStrategyTest.java
similarity index 85%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceDefaultStrategyTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceDefaultStrategyTest.java
index 09fb47f6879b7..d2f0c30268604 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceDefaultStrategyTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceDefaultStrategyTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration(locations = "classpath:META-INF/rdb/withNamespaceDefaultStrategy.xml")
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceDifferentTablesTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceDifferentTablesTest.java
similarity index 85%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceDifferentTablesTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceDifferentTablesTest.java
index dd69a83f3ccd6..7f81efcca7d4d 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceDifferentTablesTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceDifferentTablesTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration(locations = "classpath:META-INF/rdb/withNamespaceDifferentTables.xml")
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java
similarity index 89%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java
index 911f7ab9d9e5d..0d54365f68a4a 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
import java.util.Arrays;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java
similarity index 89%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java
index 4416ac669e43c..49178b16de3d8 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
import java.util.Arrays;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java
similarity index 89%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java
index f50863330d7da..f40488b82c4dd 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.springframework.test.context.ContextConfiguration;
import java.util.Arrays;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceLogicIndexTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceLogicIndexTest.java
similarity index 91%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceLogicIndexTest.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceLogicIndexTest.java
index d4911b70d294d..51bf83fb32ed5 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/cases/WithNamespaceLogicIndexTest.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/cases/WithNamespaceLogicIndexTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.spring.cases;
+package io.shardingsphere.shardingjdbc.spring.cases;
-import io.shardingsphere.jdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
+import io.shardingsphere.shardingjdbc.spring.AbstractShardingBothDataBasesAndTablesJUnitTest;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/fixture/DecrementKeyGenerator.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/fixture/DecrementKeyGenerator.java
similarity index 94%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/fixture/DecrementKeyGenerator.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/fixture/DecrementKeyGenerator.java
index efebfdc04b8a8..2ca854ecfdbbc 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/fixture/DecrementKeyGenerator.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/fixture/DecrementKeyGenerator.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.fixture;
+package io.shardingsphere.shardingjdbc.spring.fixture;
import io.shardingsphere.core.keygen.KeyGenerator;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/fixture/IncrementKeyGenerator.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/fixture/IncrementKeyGenerator.java
similarity index 94%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/fixture/IncrementKeyGenerator.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/fixture/IncrementKeyGenerator.java
index 7dd53f84ad6cc..635bc7ff3c86e 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/fixture/IncrementKeyGenerator.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/fixture/IncrementKeyGenerator.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.fixture;
+package io.shardingsphere.shardingjdbc.spring.fixture;
import io.shardingsphere.core.keygen.KeyGenerator;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/util/FieldValueUtil.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/util/FieldValueUtil.java
similarity index 97%
rename from sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/util/FieldValueUtil.java
rename to sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/util/FieldValueUtil.java
index c3b785c4dff2c..32bff56aa6493 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/util/FieldValueUtil.java
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/shardingjdbc/spring/util/FieldValueUtil.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.util;
+package io.shardingsphere.shardingjdbc.spring.util;
import com.google.common.base.Strings;
import lombok.AccessLevel;
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/shardingNamespace.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/shardingNamespace.xml
index 0b3960d1062eb..1d857ea45260c 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/shardingNamespace.xml
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/shardingNamespace.xml
@@ -10,12 +10,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml
index 67459a25614c2..819e1bd7751cf 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml
@@ -9,8 +9,8 @@
">
-
-
+
+
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml
index a82f9d204f2ee..b31555de970f2 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml
@@ -9,8 +9,8 @@
">
-
-
+
+
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml
index b8b017e07fa82..fc83294c5fc3e 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml
@@ -9,8 +9,8 @@
">
-
-
+
+
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml
index cfb35565e9ead..2742a79524839 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml
@@ -9,8 +9,8 @@
">
-
-
+
+
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml
index 57f85667a3e73..9e40986033c50 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml
@@ -9,14 +9,14 @@
">
-
-
+
+
-
-
+
+
diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceLogicIndex.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceLogicIndex.xml
index 7b235b3e8daab..692092f6421da 100644
--- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceLogicIndex.xml
+++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceLogicIndex.xml
@@ -9,8 +9,8 @@
">
-
-
+
+
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/AllTests.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/AllTests.java
similarity index 79%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/AllTests.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/AllTests.java
index 36bf5b3bbe5db..b2808e6b92456 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/AllTests.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/AllTests.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot;
+package io.shardingsphere.shardingjdbc.spring.boot;
-import io.shardingsphere.jdbc.spring.boot.type.OrchestrationSpringBootMasterSlaveTest;
-import io.shardingsphere.jdbc.spring.boot.type.OrchestrationSpringBootShardingTest;
+import io.shardingsphere.shardingjdbc.spring.boot.type.OrchestrationSpringBootMasterSlaveTest;
+import io.shardingsphere.shardingjdbc.spring.boot.type.OrchestrationSpringBootShardingTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java
similarity index 95%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java
index 5418abbf51d34..bb916483738d1 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java
@@ -15,12 +15,12 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.type;
+package io.shardingsphere.shardingjdbc.spring.boot.type;
import io.shardingsphere.core.api.ConfigMapContext;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
-import io.shardingsphere.jdbc.spring.boot.util.EmbedTestingServer;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
+import io.shardingsphere.shardingjdbc.spring.boot.util.EmbedTestingServer;
import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java
similarity index 96%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java
index 8a7f53a2bb338..44cfb18b55a21 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java
@@ -15,15 +15,15 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.type;
+package io.shardingsphere.shardingjdbc.spring.boot.type;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.constant.properties.ShardingProperties;
import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant;
+import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
-import io.shardingsphere.jdbc.spring.boot.util.EmbedTestingServer;
+import io.shardingsphere.shardingjdbc.spring.boot.util.EmbedTestingServer;
import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/util/EmbedTestingServer.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/util/EmbedTestingServer.java
similarity index 97%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/util/EmbedTestingServer.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/util/EmbedTestingServer.java
index 79c2fecb4eb73..b002c11770ddf 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/util/EmbedTestingServer.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/spring/boot/util/EmbedTestingServer.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.spring.boot.util;
+package io.shardingsphere.shardingjdbc.spring.boot.util;
import io.shardingsphere.orchestration.reg.exception.RegExceptionHandler;
import lombok.AccessLevel;