From a4bdcc32b30254411d4d0c4a3fc238132013bb68 Mon Sep 17 00:00:00 2001
From: terrymanu
Date: Wed, 26 Sep 2018 18:04:00 +0800
Subject: [PATCH] for #1302, Rename sharding-orchestration's base package to
io.shardingsphere.orchestration
---
.../OrchestrationSpringBootConfiguration.java | 18 +++++++++---------
...MasterSlaveRuleConfigurationProperties.java | 2 +-
...otOrchestrationConfigurationProperties.java | 4 ++--
...ootShardingRuleConfigurationProperties.java | 2 +-
.../spring/boot/util/PropertyUtil.java | 2 +-
...ditional-spring-configuration-metadata.json | 4 ++--
.../main/resources/META-INF/spring.factories | 2 +-
...OrchestrationSpringBootMasterSlaveTest.java | 2 +-
.../OrchestrationSpringBootShardingTest.java | 2 +-
...chestrationSpringMasterSlaveDataSource.java | 6 +++---
.../OrchestrationSpringShardingDataSource.java | 6 +++---
...dRegistryCenterBeanDefinitionParserTag.java | 2 +-
...SlaveDataSourceBeanDefinitionParserTag.java | 2 +-
...rdingDataSourceBeanDefinitionParserTag.java | 2 +-
...rRegistryCenterBeanDefinitionParserTag.java | 2 +-
.../handler/OrchestrationNamespaceHandler.java | 14 +++++++-------
.../parser/DataSourceBeanDefinitionParser.java | 12 ++++++------
.../parser/RegBeanDefinitionParser.java | 6 +++---
.../main/resources/META-INF/spring.handlers | 2 +-
.../orchestration/spring/AllTests.java | 2 +-
.../OrchestrationMasterSlaveNamespaceTest.java | 12 ++++++------
...rationShardingMasterSlaveNamespaceTest.java | 12 ++++++------
.../OrchestrationShardingNamespaceTest.java | 12 ++++++------
.../DefaultComplexKeysShardingAlgorithm.java | 2 +-
.../DefaultHintShardingAlgorithm.java | 2 +-
...PreciseModuloDatabaseShardingAlgorithm.java | 2 +-
.../PreciseModuloTableShardingAlgorithm.java | 2 +-
.../RangeModuloDatabaseShardingAlgorithm.java | 2 +-
.../RangeModuloTableShardingAlgorithm.java | 2 +-
.../spring/fixture/DecrementKeyGenerator.java | 2 +-
.../spring/fixture/IncrementKeyGenerator.java | 2 +-
.../spring/util/EmbedTestingServer.java | 2 +-
.../spring/util/FieldValueUtil.java | 2 +-
.../namespace/shardingDataSourceNamespace.xml | 12 ++++++------
.../namespace/shardingMasterSlaveNamespace.xml | 12 ++++++------
...hestrationMasterSlaveDataSourceFactory.java | 6 +++---
...OrchestrationShardingDataSourceFactory.java | 8 ++++----
...hestrationMasterSlaveDataSourceFactory.java | 10 +++++-----
...OrchestrationShardingDataSourceFactory.java | 10 +++++-----
.../connection/CircuitBreakerConnection.java | 8 ++++----
.../datasource/CircuitBreakerDataSource.java | 4 ++--
.../CircuitBreakerDatabaseMetaData.java | 2 +-
.../resultset/CircuitBreakerResultSet.java | 2 +-
.../CircuitBreakerResultSetMetaData.java | 2 +-
.../CircuitBreakerPreparedStatement.java | 6 +++---
.../statement/CircuitBreakerStatement.java | 4 ++--
.../AbstractOrchestrationDataSource.java | 6 +++---
.../OrchestrationMasterSlaveDataSource.java | 16 ++++++++--------
.../OrchestrationShardingDataSource.java | 16 ++++++++--------
...hestrationMasterSlaveRuleConfiguration.java | 4 ++--
...OrchestrationShardingRuleConfiguration.java | 4 ++--
.../{jdbc => }/orchestration/AllTests.java | 6 +++---
.../orchestration/api/AllApiTests.java | 4 ++--
.../api/yaml/AbstractYamlDataSourceTest.java | 4 ++--
.../orchestration/api/yaml/AllYamlTests.java | 8 ++++----
.../yaml/fixture/DecrementKeyGenerator.java | 2 +-
.../yaml/fixture/IncrementKeyGenerator.java | 2 +-
.../api/yaml/fixture/MultiAlgorithm.java | 2 +-
.../api/yaml/fixture/SingleAlgorithm.java | 2 +-
...lOrchestrationMasterSlaveIntegrateTest.java | 8 ++++----
...YamlOrchestrationShardingIntegrateTest.java | 8 ++++----
...onShardingWithMasterSlaveIntegrateTest.java | 8 ++++----
.../api/yaml/util/EmbedTestingServer.java | 2 +-
.../internal/AllInternalTests.java | 4 ++--
.../internal/circuit/AllCircuitTests.java | 8 ++++----
.../CircuitBreakerConnectionTest.java | 8 ++++----
.../CircuitBreakerDataSourceTest.java | 4 ++--
.../CircuitBreakerDatabaseMetaDataTest.java | 2 +-
.../configWithDataSourceWithProps.yaml | 8 ++++----
.../configWithDataSourceWithoutProps.yaml | 8 ++++----
.../configWithoutDataSourceWithProps.yaml | 8 ++++----
.../configWithoutDataSourceWithoutProps.yaml | 8 ++++----
.../configWithDataSourceWithProps.yaml | 8 ++++----
.../configWithDataSourceWithoutProps.yaml | 8 ++++----
.../configWithoutDataSourceWithProps.yaml | 8 ++++----
.../configWithoutDataSourceWithoutProps.yaml | 8 ++++----
.../sharding-orchestration-core/pom.xml | 3 +--
.../config/OrchestrationConfiguration.java | 2 +-
.../config/OrchestrationType.java | 2 +-
.../internal/OrchestrationFacade.java | 14 +++++++-------
.../config/ConfigMapListenerManager.java | 4 ++--
.../config/ConfigurationListenerManager.java | 12 ++++++------
.../internal/config/ConfigurationNode.java | 2 +-
.../internal/config/ConfigurationService.java | 12 ++++++------
.../MasterSlaveConfigurationEventBusEvent.java | 2 +-
.../ProxyConfigurationEventBusEvent.java | 2 +-
.../ShardingConfigurationEventBusEvent.java | 2 +-
.../event/state/CircuitStateEventBusEvent.java | 2 +-
.../state/DisabledStateEventBusEvent.java | 2 +-
.../state/ProxyDisabledStateEventBusEvent.java | 2 +-
.../internal/listener/ListenerFactory.java | 10 +++++-----
.../internal/listener/ListenerManager.java | 2 +-
.../internal/state/StateNode.java | 2 +-
.../internal/state/StateNodeStatus.java | 2 +-
.../datasource/DataSourceListenerManager.java | 10 +++++-----
.../state/datasource/DataSourceService.java | 10 +++++-----
.../instance/InstanceListenerManager.java | 10 +++++-----
.../state/instance/InstanceStateService.java | 4 ++--
.../state/instance/OrchestrationInstance.java | 4 ++--
.../orchestration/internal/util/IpUtils.java | 2 +-
.../yaml/converter/DataSourceConverter.java | 4 ++--
.../DataSourceParameterConverter.java | 4 ++--
.../MasterSlaveConfigurationConverter.java | 6 +++---
.../converter/ProxyConfigurationConverter.java | 6 +++---
.../ShardingConfigurationConverter.java | 6 +++---
.../representer/DataSourceRepresenter.java | 2 +-
.../DefaultConfigurationRepresenter.java | 2 +-
.../MasterSlaveConfigurationRepresenter.java | 2 +-
.../ProxyConfigurationRepresenter.java | 2 +-
.../ShardingConfigurationRepresenter.java | 2 +-
.../yaml/YamlOrchestrationConfiguration.java | 6 +++---
.../{jdbc => }/orchestration/AllTests.java | 4 ++--
.../internal/AllInternalTests.java | 4 ++--
.../internal/config/ConfigurationNodeTest.java | 2 +-
.../src/test/resources/logback-test.xml | 2 +-
.../io/shardingsphere/proxy/Bootstrap.java | 2 +-
.../proxy/config/ProxyContext.java | 6 +++---
.../yaml/ProxyYamlServerConfiguration.java | 2 +-
118 files changed, 305 insertions(+), 306 deletions(-)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java (86%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java (93%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/boot/orchestration/SpringBootOrchestrationConfigurationProperties.java (86%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java (93%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/boot/util/PropertyUtil.java (98%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java (85%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java (84%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/namespace/constants/EtcdRegistryCenterBeanDefinitionParserTag.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java (92%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/namespace/constants/ZookeeperRegistryCenterBeanDefinitionParserTag.java (95%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/namespace/handler/OrchestrationNamespaceHandler.java (66%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java (85%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/{jdbc => }/orchestration/spring/namespace/parser/RegBeanDefinitionParser.java (93%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/AllTests.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java (92%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java (92%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/OrchestrationShardingNamespaceTest.java (96%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/algorithm/DefaultHintShardingAlgorithm.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java (95%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/algorithm/PreciseModuloTableShardingAlgorithm.java (95%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java (96%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/algorithm/RangeModuloTableShardingAlgorithm.java (96%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/fixture/DecrementKeyGenerator.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/fixture/IncrementKeyGenerator.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/util/EmbedTestingServer.java (97%)
rename sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/{jdbc => }/orchestration/spring/util/FieldValueUtil.java (97%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java (92%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/api/OrchestrationShardingDataSourceFactory.java (92%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/connection/CircuitBreakerConnection.java (91%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java (90%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java (99%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java (99%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java (97%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java (96%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/statement/CircuitBreakerStatement.java (95%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/datasource/AbstractOrchestrationDataSource.java (92%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java (88%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/datasource/OrchestrationShardingDataSource.java (87%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/YamlOrchestrationMasterSlaveRuleConfiguration.java (87%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/YamlOrchestrationShardingRuleConfiguration.java (87%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/AllTests.java (82%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/AllApiTests.java (87%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/AbstractYamlDataSourceTest.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/AllYamlTests.java (72%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/fixture/DecrementKeyGenerator.java (93%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/fixture/IncrementKeyGenerator.java (93%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/fixture/MultiAlgorithm.java (94%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/fixture/SingleAlgorithm.java (95%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java (89%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java (90%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java (91%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/api/yaml/util/EmbedTestingServer.java (96%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/internal/AllInternalTests.java (86%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/AllCircuitTests.java (71%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/connection/CircuitBreakerConnectionTest.java (91%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/datasource/CircuitBreakerDataSourceTest.java (90%)
rename sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/{jdbc => }/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java (99%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/config/OrchestrationConfiguration.java (95%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/config/OrchestrationType.java (93%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/OrchestrationFacade.java (94%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/config/ConfigMapListenerManager.java (95%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/config/ConfigurationListenerManager.java (89%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/config/ConfigurationNode.java (97%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/config/ConfigurationService.java (97%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/event/config/MasterSlaveConfigurationEventBusEvent.java (94%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/event/config/ProxyConfigurationEventBusEvent.java (94%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/event/config/ShardingConfigurationEventBusEvent.java (94%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/event/state/CircuitStateEventBusEvent.java (92%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/event/state/DisabledStateEventBusEvent.java (93%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/event/state/ProxyDisabledStateEventBusEvent.java (93%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/listener/ListenerFactory.java (85%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/listener/ListenerManager.java (94%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/state/StateNode.java (96%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/state/StateNodeStatus.java (92%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/state/datasource/DataSourceListenerManager.java (88%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/state/datasource/DataSourceService.java (95%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/state/instance/InstanceListenerManager.java (90%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/state/instance/InstanceStateService.java (92%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/state/instance/OrchestrationInstance.java (91%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/util/IpUtils.java (98%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/converter/DataSourceConverter.java (91%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/converter/DataSourceParameterConverter.java (91%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/converter/MasterSlaveConfigurationConverter.java (92%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/converter/ProxyConfigurationConverter.java (93%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/converter/ShardingConfigurationConverter.java (92%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/representer/DataSourceRepresenter.java (98%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/representer/DefaultConfigurationRepresenter.java (94%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/representer/MasterSlaveConfigurationRepresenter.java (96%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/representer/ProxyConfigurationRepresenter.java (96%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/internal/yaml/representer/ShardingConfigurationRepresenter.java (96%)
rename sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/{jdbc => }/orchestration/yaml/YamlOrchestrationConfiguration.java (89%)
rename sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/{jdbc => }/orchestration/AllTests.java (87%)
rename sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/{jdbc => }/orchestration/internal/AllInternalTests.java (85%)
rename sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/{jdbc => }/orchestration/internal/config/ConfigurationNodeTest.java (94%)
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
similarity index 86%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
index 452b5efec29a6..694cacafb4c55 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
@@ -15,21 +15,21 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.boot;
+package io.shardingsphere.orchestration.spring.boot;
import com.google.common.base.Preconditions;
import io.shardingsphere.core.exception.ShardingException;
+import io.shardingsphere.core.rule.ShardingRule;
+import io.shardingsphere.orchestration.config.OrchestrationType;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationShardingDataSource;
+import io.shardingsphere.orchestration.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
+import io.shardingsphere.orchestration.spring.boot.orchestration.SpringBootOrchestrationConfigurationProperties;
+import io.shardingsphere.orchestration.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
+import io.shardingsphere.orchestration.spring.boot.util.PropertyUtil;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
-import io.shardingsphere.core.rule.ShardingRule;
import io.shardingsphere.shardingjdbc.util.DataSourceUtil;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationType;
-import io.shardingsphere.jdbc.orchestration.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
-import io.shardingsphere.jdbc.orchestration.spring.boot.orchestration.SpringBootOrchestrationConfigurationProperties;
-import io.shardingsphere.jdbc.orchestration.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
-import io.shardingsphere.jdbc.orchestration.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-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
similarity index 93%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
index 8b39d2c58c5b6..93442dc9580d7 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.boot.masterslave;
+package io.shardingsphere.orchestration.spring.boot.masterslave;
import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/orchestration/SpringBootOrchestrationConfigurationProperties.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/orchestration/SpringBootOrchestrationConfigurationProperties.java
similarity index 86%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/orchestration/SpringBootOrchestrationConfigurationProperties.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/orchestration/SpringBootOrchestrationConfigurationProperties.java
index 27f304ffcb0f3..54ed0e66caac8 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/orchestration/SpringBootOrchestrationConfigurationProperties.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/orchestration/SpringBootOrchestrationConfigurationProperties.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.boot.orchestration;
+package io.shardingsphere.orchestration.spring.boot.orchestration;
-import io.shardingsphere.jdbc.orchestration.yaml.YamlOrchestrationConfiguration;
+import io.shardingsphere.orchestration.yaml.YamlOrchestrationConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
similarity index 93%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
index 0d4fd6dbbaf83..b76b882057b4d 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.boot.sharding;
+package io.shardingsphere.orchestration.spring.boot.sharding;
import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/util/PropertyUtil.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/util/PropertyUtil.java
similarity index 98%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/util/PropertyUtil.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/util/PropertyUtil.java
index 1359b41618c4a..cd61ff7a17ce4 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/util/PropertyUtil.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/orchestration/spring/boot/util/PropertyUtil.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.boot.util;
+package io.shardingsphere.orchestration.spring.boot.util;
import io.shardingsphere.core.exception.ShardingException;
import lombok.AccessLevel;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index ad59676ae8cf0..a55df513d079d 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-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.orchestration.spring.boot.OrchestrationSpringBootConfiguration"
+ "type": "io.shardingsphere.orchestration.spring.boot.OrchestrationSpringBootConfiguration"
},
{
"sourceType": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration",
@@ -69,7 +69,7 @@
{
"name": "sharding.jdbc.datasource.names",
"type": "java.lang.String",
- "sourceType": "io.shardingsphere.jdbc.orchestration.spring.boot.OrchestrationSpringBootConfiguration"
+ "sourceType": "io.shardingsphere.orchestration.spring.boot.OrchestrationSpringBootConfiguration"
},
{
"name": "sharding.jdbc.datasource",
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/spring.factories b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/spring.factories
index 8b98703e33fd0..7f8c7a6369cb3 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/spring.factories
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-io.shardingsphere.jdbc.orchestration.spring.boot.OrchestrationSpringBootConfiguration
+io.shardingsphere.orchestration.spring.boot.OrchestrationSpringBootConfiguration
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/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
index bb916483738d1..728e38be9737e 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/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
@@ -18,7 +18,7 @@
package io.shardingsphere.shardingjdbc.spring.boot.type;
import io.shardingsphere.core.api.ConfigMapContext;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.shardingjdbc.spring.boot.util.EmbedTestingServer;
import org.apache.commons.dbcp2.BasicDataSource;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/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
index 44cfb18b55a21..f2d626c6dfc7b 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/shardingjdbc/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
@@ -20,7 +20,7 @@
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.orchestration.internal.datasource.OrchestrationShardingDataSource;
import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.shardingjdbc.spring.boot.util.EmbedTestingServer;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java
similarity index 85%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java
index f97ee4de07372..3ba0c1475b620 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.datasource;
+package io.shardingsphere.orchestration.spring.datasource;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
import javax.sql.DataSource;
import java.sql.SQLException;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java
similarity index 84%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java
index bc86fb0ad8090..7e1929c67c12b 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.datasource;
+package io.shardingsphere.orchestration.spring.datasource;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationShardingDataSource;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
import javax.sql.DataSource;
import java.sql.SQLException;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/EtcdRegistryCenterBeanDefinitionParserTag.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/EtcdRegistryCenterBeanDefinitionParserTag.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/EtcdRegistryCenterBeanDefinitionParserTag.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/EtcdRegistryCenterBeanDefinitionParserTag.java
index 5b1b48948e999..ed5def4df5bba 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/EtcdRegistryCenterBeanDefinitionParserTag.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/EtcdRegistryCenterBeanDefinitionParserTag.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.namespace.constants;
+package io.shardingsphere.orchestration.spring.namespace.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
similarity index 92%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
index 446e04e17a924..da01c57527f05 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/MasterSlaveDataSourceBeanDefinitionParserTag.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.namespace.constants;
+package io.shardingsphere.orchestration.spring.namespace.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
index 821a8a524a154..ea169f0d2b592 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.namespace.constants;
+package io.shardingsphere.orchestration.spring.namespace.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/ZookeeperRegistryCenterBeanDefinitionParserTag.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/ZookeeperRegistryCenterBeanDefinitionParserTag.java
similarity index 95%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/ZookeeperRegistryCenterBeanDefinitionParserTag.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/ZookeeperRegistryCenterBeanDefinitionParserTag.java
index 09db98c58fb3f..8e2cf4fd5ed44 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/constants/ZookeeperRegistryCenterBeanDefinitionParserTag.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/constants/ZookeeperRegistryCenterBeanDefinitionParserTag.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.namespace.constants;
+package io.shardingsphere.orchestration.spring.namespace.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/handler/OrchestrationNamespaceHandler.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/handler/OrchestrationNamespaceHandler.java
similarity index 66%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/handler/OrchestrationNamespaceHandler.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/handler/OrchestrationNamespaceHandler.java
index 0e8eece93408d..5a21f71289754 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/handler/OrchestrationNamespaceHandler.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/handler/OrchestrationNamespaceHandler.java
@@ -15,14 +15,14 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.namespace.handler;
+package io.shardingsphere.orchestration.spring.namespace.handler;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.constants.EtcdRegistryCenterBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.constants.ZookeeperRegistryCenterBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.parser.DataSourceBeanDefinitionParser;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.parser.RegBeanDefinitionParser;
+import io.shardingsphere.orchestration.spring.namespace.constants.EtcdRegistryCenterBeanDefinitionParserTag;
+import io.shardingsphere.orchestration.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.orchestration.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.orchestration.spring.namespace.constants.ZookeeperRegistryCenterBeanDefinitionParserTag;
+import io.shardingsphere.orchestration.spring.namespace.parser.DataSourceBeanDefinitionParser;
+import io.shardingsphere.orchestration.spring.namespace.parser.RegBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
/**
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java
similarity index 85%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java
index 178403ba3a96c..f1d427d1ddd5c 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java
@@ -15,14 +15,14 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.namespace.parser;
+package io.shardingsphere.orchestration.spring.namespace.parser;
import com.google.common.base.Strings;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationType;
-import io.shardingsphere.jdbc.orchestration.spring.datasource.OrchestrationSpringMasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.spring.datasource.OrchestrationSpringShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationType;
+import io.shardingsphere.orchestration.spring.datasource.OrchestrationSpringMasterSlaveDataSource;
+import io.shardingsphere.orchestration.spring.datasource.OrchestrationSpringShardingDataSource;
+import io.shardingsphere.orchestration.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/parser/RegBeanDefinitionParser.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/parser/RegBeanDefinitionParser.java
similarity index 93%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/parser/RegBeanDefinitionParser.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/parser/RegBeanDefinitionParser.java
index 9a8053dcaf27a..722a3625c35c5 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/namespace/parser/RegBeanDefinitionParser.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/orchestration/spring/namespace/parser/RegBeanDefinitionParser.java
@@ -15,13 +15,13 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.namespace.parser;
+package io.shardingsphere.orchestration.spring.namespace.parser;
import com.google.common.base.Strings;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.constants.EtcdRegistryCenterBeanDefinitionParserTag;
-import io.shardingsphere.jdbc.orchestration.spring.namespace.constants.ZookeeperRegistryCenterBeanDefinitionParserTag;
import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;
import io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration;
+import io.shardingsphere.orchestration.spring.namespace.constants.EtcdRegistryCenterBeanDefinitionParserTag;
+import io.shardingsphere.orchestration.spring.namespace.constants.ZookeeperRegistryCenterBeanDefinitionParserTag;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/spring.handlers b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/spring.handlers
index 4dd49abb51639..ba2a96c199ebe 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/spring.handlers
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://shardingsphere.io/schema/shardingsphere/orchestration=io.shardingsphere.jdbc.orchestration.spring.namespace.handler.OrchestrationNamespaceHandler
+http\://shardingsphere.io/schema/shardingsphere/orchestration=io.shardingsphere.orchestration.spring.namespace.handler.OrchestrationNamespaceHandler
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/AllTests.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/AllTests.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/AllTests.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/AllTests.java
index 4dc103e791370..a93c3e60e9867 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/AllTests.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/AllTests.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring;
+package io.shardingsphere.orchestration.spring;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java
similarity index 92%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java
index 97b6698ab3982..ecabd971b46c1 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring;
+package io.shardingsphere.orchestration.spring;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
@@ -23,12 +23,12 @@
import io.shardingsphere.core.api.algorithm.masterslave.RoundRobinMasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.core.constant.properties.ShardingProperties;
import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.core.rule.MasterSlaveRule;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.spring.datasource.OrchestrationSpringMasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.spring.util.EmbedTestingServer;
-import io.shardingsphere.jdbc.orchestration.spring.util.FieldValueUtil;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
+import io.shardingsphere.orchestration.spring.datasource.OrchestrationSpringMasterSlaveDataSource;
+import io.shardingsphere.orchestration.spring.util.EmbedTestingServer;
+import io.shardingsphere.orchestration.spring.util.FieldValueUtil;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java
similarity index 92%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java
index a0de2bc476caf..55f5845d80976 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java
@@ -15,15 +15,15 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring;
+package io.shardingsphere.orchestration.spring;
import io.shardingsphere.core.api.algorithm.masterslave.RoundRobinMasterSlaveLoadBalanceAlgorithm;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.ShardingRule;
-import io.shardingsphere.jdbc.orchestration.spring.datasource.OrchestrationSpringShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.spring.fixture.IncrementKeyGenerator;
-import io.shardingsphere.jdbc.orchestration.spring.util.EmbedTestingServer;
-import io.shardingsphere.jdbc.orchestration.spring.util.FieldValueUtil;
+import io.shardingsphere.orchestration.spring.datasource.OrchestrationSpringShardingDataSource;
+import io.shardingsphere.orchestration.spring.fixture.IncrementKeyGenerator;
+import io.shardingsphere.orchestration.spring.util.EmbedTestingServer;
+import io.shardingsphere.orchestration.spring.util.FieldValueUtil;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationShardingNamespaceTest.java
similarity index 96%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationShardingNamespaceTest.java
index 555a5254aaf8f..31542035da0b3 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/OrchestrationShardingNamespaceTest.java
@@ -15,22 +15,22 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring;
+package io.shardingsphere.orchestration.spring;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.config.strategy.InlineShardingStrategyConfiguration;
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.orchestration.spring.datasource.OrchestrationSpringShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.spring.fixture.IncrementKeyGenerator;
-import io.shardingsphere.jdbc.orchestration.spring.util.EmbedTestingServer;
-import io.shardingsphere.jdbc.orchestration.spring.util.FieldValueUtil;
+import io.shardingsphere.orchestration.spring.datasource.OrchestrationSpringShardingDataSource;
+import io.shardingsphere.orchestration.spring.fixture.IncrementKeyGenerator;
+import io.shardingsphere.orchestration.spring.util.EmbedTestingServer;
+import io.shardingsphere.orchestration.spring.util.FieldValueUtil;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
index 924ca94023d8f..b19389a0d8430 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/DefaultComplexKeysShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.algorithm;
+package io.shardingsphere.orchestration.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.complex.ComplexKeysShardingAlgorithm;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/DefaultHintShardingAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/DefaultHintShardingAlgorithm.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/DefaultHintShardingAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/DefaultHintShardingAlgorithm.java
index 3f001493040bf..d922f2c095894 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/DefaultHintShardingAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/DefaultHintShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.algorithm;
+package io.shardingsphere.orchestration.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.hint.HintShardingAlgorithm;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
similarity index 95%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
index fba073419f555..f04b44d95349f 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/PreciseModuloDatabaseShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.algorithm;
+package io.shardingsphere.orchestration.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/PreciseModuloTableShardingAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
similarity index 95%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
index 00cb113be3cb2..ed5081614f24f 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/PreciseModuloTableShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.algorithm;
+package io.shardingsphere.orchestration.spring.algorithm;
import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
similarity index 96%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
index 4591ffec5c683..510ed124f70b8 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/RangeModuloDatabaseShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.algorithm;
+package io.shardingsphere.orchestration.spring.algorithm;
import com.google.common.collect.Range;
import io.shardingsphere.core.api.algorithm.sharding.RangeShardingValue;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/RangeModuloTableShardingAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/RangeModuloTableShardingAlgorithm.java
similarity index 96%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/RangeModuloTableShardingAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/RangeModuloTableShardingAlgorithm.java
index 7459896cce821..f07d14a7e2af9 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/algorithm/RangeModuloTableShardingAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/algorithm/RangeModuloTableShardingAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.algorithm;
+package io.shardingsphere.orchestration.spring.algorithm;
import com.google.common.collect.Range;
import io.shardingsphere.core.api.algorithm.sharding.RangeShardingValue;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/fixture/DecrementKeyGenerator.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/fixture/DecrementKeyGenerator.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/fixture/DecrementKeyGenerator.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/fixture/DecrementKeyGenerator.java
index 876600405c7fa..d0f731d1d14b6 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/fixture/DecrementKeyGenerator.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/fixture/DecrementKeyGenerator.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.fixture;
+package io.shardingsphere.orchestration.spring.fixture;
import io.shardingsphere.core.keygen.KeyGenerator;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/fixture/IncrementKeyGenerator.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/fixture/IncrementKeyGenerator.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/fixture/IncrementKeyGenerator.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/fixture/IncrementKeyGenerator.java
index 4c79b55bfaa7d..8cc2e48b3788c 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/fixture/IncrementKeyGenerator.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/fixture/IncrementKeyGenerator.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.fixture;
+package io.shardingsphere.orchestration.spring.fixture;
import io.shardingsphere.core.keygen.KeyGenerator;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/util/EmbedTestingServer.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/util/EmbedTestingServer.java
similarity index 97%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/util/EmbedTestingServer.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/util/EmbedTestingServer.java
index 24d41f7dbf16c..9bd25b928fb41 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/util/EmbedTestingServer.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/util/EmbedTestingServer.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.util;
+package io.shardingsphere.orchestration.spring.util;
import io.shardingsphere.orchestration.reg.exception.RegExceptionHandler;
import lombok.AccessLevel;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/util/FieldValueUtil.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/util/FieldValueUtil.java
similarity index 97%
rename from sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/util/FieldValueUtil.java
rename to sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/util/FieldValueUtil.java
index f0bb5691e6533..7fa46c65b4b2d 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/util/FieldValueUtil.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/orchestration/spring/util/FieldValueUtil.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.spring.util;
+package io.shardingsphere.orchestration.spring.util;
import com.google.common.base.Strings;
import lombok.AccessLevel;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingDataSourceNamespace.xml b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingDataSourceNamespace.xml
index 39f7660d021d4..1a7c153ebb457 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingDataSourceNamespace.xml
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingDataSourceNamespace.xml
@@ -9,13 +9,13 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingMasterSlaveNamespace.xml b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingMasterSlaveNamespace.xml
index 38e90f9688f8b..26e9c5e4c9909 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingMasterSlaveNamespace.xml
+++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingMasterSlaveNamespace.xml
@@ -9,14 +9,14 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
similarity index 92%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
index 91d2c93edf94d..26138b84332cc 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
@@ -15,12 +15,12 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api;
+package io.shardingsphere.orchestration.api;
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/OrchestrationShardingDataSourceFactory.java
similarity index 92%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/OrchestrationShardingDataSourceFactory.java
index 9b448f4f96003..8cf93fede8a97 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/OrchestrationShardingDataSourceFactory.java
@@ -15,13 +15,13 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api;
+package io.shardingsphere.orchestration.api;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.ShardingRule;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationShardingDataSource;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java
index 4d0c183bc2db1..a07f444e95193 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java
@@ -15,13 +15,13 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml;
+package io.shardingsphere.orchestration.api.yaml;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.YamlOrchestrationMasterSlaveRuleConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
+import io.shardingsphere.orchestration.internal.yaml.YamlOrchestrationMasterSlaveRuleConfiguration;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.Yaml;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java
index 01242702ea685..66ae7f939c4e1 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java
@@ -15,14 +15,14 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml;
+package io.shardingsphere.orchestration.api.yaml;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.ShardingRule;
import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.YamlOrchestrationShardingRuleConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationShardingDataSource;
+import io.shardingsphere.orchestration.internal.yaml.YamlOrchestrationShardingRuleConfiguration;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.Yaml;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnection.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/connection/CircuitBreakerConnection.java
similarity index 91%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnection.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/connection/CircuitBreakerConnection.java
index e6d04a78289da..7c4e49971c1da 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnection.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/connection/CircuitBreakerConnection.java
@@ -15,12 +15,12 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.connection;
+package io.shardingsphere.orchestration.internal.circuit.connection;
+import io.shardingsphere.orchestration.internal.circuit.metadata.CircuitBreakerDatabaseMetaData;
+import io.shardingsphere.orchestration.internal.circuit.statement.CircuitBreakerPreparedStatement;
+import io.shardingsphere.orchestration.internal.circuit.statement.CircuitBreakerStatement;
import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationConnection;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.metadata.CircuitBreakerDatabaseMetaData;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.statement.CircuitBreakerPreparedStatement;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.statement.CircuitBreakerStatement;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java
similarity index 90%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java
index 84a6007524e3c..7b9f7220f491b 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.datasource;
+package io.shardingsphere.orchestration.internal.circuit.datasource;
+import io.shardingsphere.orchestration.internal.circuit.connection.CircuitBreakerConnection;
import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationDataSource;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnection;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
similarity index 99%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
index 7674c8fc6375d..18c9f4bc22fa3 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.metadata;
+package io.shardingsphere.orchestration.internal.circuit.metadata;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
similarity index 99%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
index 1c0c68e52d205..8fddfc1f68256 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.resultset;
+package io.shardingsphere.orchestration.internal.circuit.resultset;
import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationResultSet;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
similarity index 97%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
index 7982080127cba..0b469fabeaf64 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.resultset;
+package io.shardingsphere.orchestration.internal.circuit.resultset;
import java.sql.ResultSetMetaData;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
similarity index 96%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
index f37cbf47e6568..dcbb106978dfb 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.statement;
+package io.shardingsphere.orchestration.internal.circuit.statement;
+import io.shardingsphere.orchestration.internal.circuit.connection.CircuitBreakerConnection;
+import io.shardingsphere.orchestration.internal.circuit.resultset.CircuitBreakerResultSet;
import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnection;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.resultset.CircuitBreakerResultSet;
import lombok.Getter;
import java.io.InputStream;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerStatement.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/statement/CircuitBreakerStatement.java
similarity index 95%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerStatement.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/statement/CircuitBreakerStatement.java
index 428a749d7dcc4..c6c5bfdd21b94 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerStatement.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/circuit/statement/CircuitBreakerStatement.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.statement;
+package io.shardingsphere.orchestration.internal.circuit.statement;
+import io.shardingsphere.orchestration.internal.circuit.connection.CircuitBreakerConnection;
import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationStatement;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnection;
import lombok.Getter;
import java.sql.Connection;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/AbstractOrchestrationDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/AbstractOrchestrationDataSource.java
similarity index 92%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/AbstractOrchestrationDataSource.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/AbstractOrchestrationDataSource.java
index fd70553d30cfe..38922f3373890 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/AbstractOrchestrationDataSource.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/AbstractOrchestrationDataSource.java
@@ -15,13 +15,13 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.datasource;
+package io.shardingsphere.orchestration.internal.datasource;
import com.google.common.eventbus.Subscribe;
import io.shardingsphere.core.event.ShardingEventBusInstance;
+import io.shardingsphere.orchestration.internal.OrchestrationFacade;
+import io.shardingsphere.orchestration.internal.event.state.CircuitStateEventBusEvent;
import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractDataSourceAdapter;
-import io.shardingsphere.jdbc.orchestration.internal.OrchestrationFacade;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.CircuitStateEventBusEvent;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
similarity index 88%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
index f62e605417da5..db620224a97f6 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
@@ -15,20 +15,20 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.datasource;
+package io.shardingsphere.orchestration.internal.datasource;
import com.google.common.base.Preconditions;
import com.google.common.eventbus.Subscribe;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.core.rule.MasterSlaveRule;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.OrchestrationFacade;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.datasource.CircuitBreakerDataSource;
-import io.shardingsphere.jdbc.orchestration.internal.config.ConfigurationService;
-import io.shardingsphere.jdbc.orchestration.internal.event.config.MasterSlaveConfigurationEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.DisabledStateEventBusEvent;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.OrchestrationFacade;
+import io.shardingsphere.orchestration.internal.circuit.datasource.CircuitBreakerDataSource;
+import io.shardingsphere.orchestration.internal.config.ConfigurationService;
+import io.shardingsphere.orchestration.internal.event.config.MasterSlaveConfigurationEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.state.DisabledStateEventBusEvent;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/OrchestrationShardingDataSource.java
similarity index 87%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/OrchestrationShardingDataSource.java
index d66299545fe66..c89aeb459d13d 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/datasource/OrchestrationShardingDataSource.java
@@ -15,20 +15,20 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.datasource;
+package io.shardingsphere.orchestration.internal.datasource;
import com.google.common.base.Preconditions;
import com.google.common.eventbus.Subscribe;
import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.ShardingRule;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.OrchestrationFacade;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.datasource.CircuitBreakerDataSource;
-import io.shardingsphere.jdbc.orchestration.internal.config.ConfigurationService;
-import io.shardingsphere.jdbc.orchestration.internal.event.config.ShardingConfigurationEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.DisabledStateEventBusEvent;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.OrchestrationFacade;
+import io.shardingsphere.orchestration.internal.circuit.datasource.CircuitBreakerDataSource;
+import io.shardingsphere.orchestration.internal.config.ConfigurationService;
+import io.shardingsphere.orchestration.internal.event.config.ShardingConfigurationEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.state.DisabledStateEventBusEvent;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/YamlOrchestrationMasterSlaveRuleConfiguration.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/yaml/YamlOrchestrationMasterSlaveRuleConfiguration.java
similarity index 87%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/YamlOrchestrationMasterSlaveRuleConfiguration.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/yaml/YamlOrchestrationMasterSlaveRuleConfiguration.java
index 5674991dd818f..b47da4e9ca24e 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/YamlOrchestrationMasterSlaveRuleConfiguration.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/yaml/YamlOrchestrationMasterSlaveRuleConfiguration.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml;
+package io.shardingsphere.orchestration.internal.yaml;
import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveConfiguration;
-import io.shardingsphere.jdbc.orchestration.yaml.YamlOrchestrationConfiguration;
+import io.shardingsphere.orchestration.yaml.YamlOrchestrationConfiguration;
import lombok.Getter;
import lombok.Setter;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/YamlOrchestrationShardingRuleConfiguration.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/yaml/YamlOrchestrationShardingRuleConfiguration.java
similarity index 87%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/YamlOrchestrationShardingRuleConfiguration.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/yaml/YamlOrchestrationShardingRuleConfiguration.java
index 956b252d3aef9..1aebafe80d6d9 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/YamlOrchestrationShardingRuleConfiguration.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/orchestration/internal/yaml/YamlOrchestrationShardingRuleConfiguration.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml;
+package io.shardingsphere.orchestration.internal.yaml;
import io.shardingsphere.core.yaml.sharding.YamlShardingConfiguration;
-import io.shardingsphere.jdbc.orchestration.yaml.YamlOrchestrationConfiguration;
+import io.shardingsphere.orchestration.yaml.YamlOrchestrationConfiguration;
import lombok.Getter;
import lombok.Setter;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/AllTests.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/AllTests.java
similarity index 82%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/AllTests.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/AllTests.java
index 0c7a478eda541..e7dbb6d4945e7 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/AllTests.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/AllTests.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.orchestration;
+package io.shardingsphere.orchestration;
-import io.shardingsphere.jdbc.orchestration.api.AllApiTests;
-import io.shardingsphere.jdbc.orchestration.internal.AllInternalTests;
+import io.shardingsphere.orchestration.api.AllApiTests;
+import io.shardingsphere.orchestration.internal.AllInternalTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/AllApiTests.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/AllApiTests.java
similarity index 87%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/AllApiTests.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/AllApiTests.java
index c37031ee03109..cbabf31b7bee6 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/AllApiTests.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/AllApiTests.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api;
+package io.shardingsphere.orchestration.api;
-import io.shardingsphere.jdbc.orchestration.api.yaml.AllYamlTests;
+import io.shardingsphere.orchestration.api.yaml.AllYamlTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/AbstractYamlDataSourceTest.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/AbstractYamlDataSourceTest.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/AbstractYamlDataSourceTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/AbstractYamlDataSourceTest.java
index 208ed14536fc1..a197d70dfefc7 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/AbstractYamlDataSourceTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/AbstractYamlDataSourceTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml;
+package io.shardingsphere.orchestration.api.yaml;
-import io.shardingsphere.jdbc.orchestration.api.yaml.util.EmbedTestingServer;
+import io.shardingsphere.orchestration.api.yaml.util.EmbedTestingServer;
import org.apache.commons.dbcp2.BasicDataSource;
import org.h2.tools.RunScript;
import org.junit.BeforeClass;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/AllYamlTests.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/AllYamlTests.java
similarity index 72%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/AllYamlTests.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/AllYamlTests.java
index c2b8ae28e6147..ed2010d4ccadb 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/AllYamlTests.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/AllYamlTests.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml;
+package io.shardingsphere.orchestration.api.yaml;
-import io.shardingsphere.jdbc.orchestration.api.yaml.masterslave.YamlOrchestrationMasterSlaveIntegrateTest;
-import io.shardingsphere.jdbc.orchestration.api.yaml.sharding.YamlOrchestrationShardingIntegrateTest;
-import io.shardingsphere.jdbc.orchestration.api.yaml.sharding.YamlOrchestrationShardingWithMasterSlaveIntegrateTest;
+import io.shardingsphere.orchestration.api.yaml.masterslave.YamlOrchestrationMasterSlaveIntegrateTest;
+import io.shardingsphere.orchestration.api.yaml.sharding.YamlOrchestrationShardingIntegrateTest;
+import io.shardingsphere.orchestration.api.yaml.sharding.YamlOrchestrationShardingWithMasterSlaveIntegrateTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/DecrementKeyGenerator.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/DecrementKeyGenerator.java
similarity index 93%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/DecrementKeyGenerator.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/DecrementKeyGenerator.java
index 0132a1b716fbf..af538e42e5eb8 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/DecrementKeyGenerator.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/DecrementKeyGenerator.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.fixture;
+package io.shardingsphere.orchestration.api.yaml.fixture;
import io.shardingsphere.core.keygen.KeyGenerator;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/IncrementKeyGenerator.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/IncrementKeyGenerator.java
similarity index 93%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/IncrementKeyGenerator.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/IncrementKeyGenerator.java
index 71249203bf757..7be0504590066 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/IncrementKeyGenerator.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/IncrementKeyGenerator.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.fixture;
+package io.shardingsphere.orchestration.api.yaml.fixture;
import io.shardingsphere.core.keygen.KeyGenerator;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/MultiAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/MultiAlgorithm.java
similarity index 94%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/MultiAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/MultiAlgorithm.java
index 8a3217ec0880b..47c6cab798958 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/MultiAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/MultiAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.fixture;
+package io.shardingsphere.orchestration.api.yaml.fixture;
import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.complex.ComplexKeysShardingAlgorithm;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/SingleAlgorithm.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/SingleAlgorithm.java
similarity index 95%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/SingleAlgorithm.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/SingleAlgorithm.java
index f0cf4ab7a0956..d140f9c71efe9 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/SingleAlgorithm.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/fixture/SingleAlgorithm.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.fixture;
+package io.shardingsphere.orchestration.api.yaml.fixture;
import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java
similarity index 89%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java
index efbf398b6b236..1b852ccec33f1 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java
@@ -15,14 +15,14 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.masterslave;
+package io.shardingsphere.orchestration.api.yaml.masterslave;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import io.shardingsphere.jdbc.orchestration.api.yaml.AbstractYamlDataSourceTest;
-import io.shardingsphere.jdbc.orchestration.api.yaml.YamlOrchestrationMasterSlaveDataSourceFactory;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
+import io.shardingsphere.orchestration.api.yaml.AbstractYamlDataSourceTest;
+import io.shardingsphere.orchestration.api.yaml.YamlOrchestrationMasterSlaveDataSourceFactory;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
import lombok.RequiredArgsConstructor;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java
similarity index 90%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java
index a366c460215b9..296b3d51d91b5 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java
@@ -15,14 +15,14 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.sharding;
+package io.shardingsphere.orchestration.api.yaml.sharding;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import io.shardingsphere.jdbc.orchestration.api.yaml.AbstractYamlDataSourceTest;
-import io.shardingsphere.jdbc.orchestration.api.yaml.YamlOrchestrationShardingDataSourceFactory;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
+import io.shardingsphere.orchestration.api.yaml.AbstractYamlDataSourceTest;
+import io.shardingsphere.orchestration.api.yaml.YamlOrchestrationShardingDataSourceFactory;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationShardingDataSource;
import lombok.RequiredArgsConstructor;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java
similarity index 91%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java
index 77a4cda452ccd..e47ad7c80a01e 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java
@@ -15,14 +15,14 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.sharding;
+package io.shardingsphere.orchestration.api.yaml.sharding;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import io.shardingsphere.jdbc.orchestration.api.yaml.AbstractYamlDataSourceTest;
-import io.shardingsphere.jdbc.orchestration.api.yaml.YamlOrchestrationShardingDataSourceFactory;
-import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
+import io.shardingsphere.orchestration.api.yaml.AbstractYamlDataSourceTest;
+import io.shardingsphere.orchestration.api.yaml.YamlOrchestrationShardingDataSourceFactory;
+import io.shardingsphere.orchestration.internal.datasource.OrchestrationShardingDataSource;
import lombok.RequiredArgsConstructor;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/util/EmbedTestingServer.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/util/EmbedTestingServer.java
similarity index 96%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/util/EmbedTestingServer.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/util/EmbedTestingServer.java
index 51ac974067de0..21ff9ec6167ca 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/util/EmbedTestingServer.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/api/yaml/util/EmbedTestingServer.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.api.yaml.util;
+package io.shardingsphere.orchestration.api.yaml.util;
import io.shardingsphere.orchestration.reg.exception.RegExceptionHandler;
import lombok.AccessLevel;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/AllInternalTests.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/AllInternalTests.java
similarity index 86%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/AllInternalTests.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/AllInternalTests.java
index 5d1f81c31ee02..7d6dd5338b6f4 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/AllInternalTests.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/AllInternalTests.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal;
+package io.shardingsphere.orchestration.internal;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.AllCircuitTests;
+import io.shardingsphere.orchestration.internal.circuit.AllCircuitTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/AllCircuitTests.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/AllCircuitTests.java
similarity index 71%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/AllCircuitTests.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/AllCircuitTests.java
index 812c4d0d50e53..4d296cf6c5bfd 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/AllCircuitTests.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/AllCircuitTests.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit;
+package io.shardingsphere.orchestration.internal.circuit;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnectionTest;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.datasource.CircuitBreakerDataSourceTest;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.metadata.CircuitBreakerDatabaseMetaDataTest;
+import io.shardingsphere.orchestration.internal.circuit.connection.CircuitBreakerConnectionTest;
+import io.shardingsphere.orchestration.internal.circuit.datasource.CircuitBreakerDataSourceTest;
+import io.shardingsphere.orchestration.internal.circuit.metadata.CircuitBreakerDatabaseMetaDataTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnectionTest.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/connection/CircuitBreakerConnectionTest.java
similarity index 91%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnectionTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/connection/CircuitBreakerConnectionTest.java
index 620dcb046ad0d..c62d9fbe3d3f7 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnectionTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/connection/CircuitBreakerConnectionTest.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.connection;
+package io.shardingsphere.orchestration.internal.circuit.connection;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.metadata.CircuitBreakerDatabaseMetaData;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.statement.CircuitBreakerPreparedStatement;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.statement.CircuitBreakerStatement;
+import io.shardingsphere.orchestration.internal.circuit.metadata.CircuitBreakerDatabaseMetaData;
+import io.shardingsphere.orchestration.internal.circuit.statement.CircuitBreakerPreparedStatement;
+import io.shardingsphere.orchestration.internal.circuit.statement.CircuitBreakerStatement;
import org.junit.Test;
import java.sql.Connection;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSourceTest.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
similarity index 90%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
index 80a42471948aa..9c7b84dd55496 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.datasource;
+package io.shardingsphere.orchestration.internal.circuit.datasource;
-import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnection;
+import io.shardingsphere.orchestration.internal.circuit.connection.CircuitBreakerConnection;
import org.junit.Test;
import static org.junit.Assert.assertNull;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
similarity index 99%
rename from sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
rename to sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
index dcd5223af8322..468dd8c4bec7e 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/jdbc/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/orchestration/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.circuit.metadata;
+package io.shardingsphere.orchestration.internal.circuit.metadata;
import org.junit.Test;
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index f87b716c12f75..613214cef670f 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -22,20 +22,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
@@ -49,7 +49,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
props:
sql.show: true
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index 3b19381d1e57c..5282be5fd3b48 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -22,20 +22,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
@@ -48,7 +48,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
orchestration:
name: demo_ds_ms
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
index f9b8181cc8794..9993477cdc952 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
@@ -8,20 +8,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
@@ -34,7 +34,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
props:
sql.show: true
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
index 88308367e81cd..a73a07d2492ea 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
@@ -7,20 +7,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
@@ -32,7 +32,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
orchestration:
name: demo_ds_ms
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
index 01589f2634e80..98be8bd736d13 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
@@ -34,20 +34,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db_ms_${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: order_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: id
@@ -60,7 +60,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
masterSlaveRules:
db_ms_0:
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
index e598c1da37cc9..c6ccb64c00a25 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
@@ -34,20 +34,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db_ms_${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
@@ -60,7 +60,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
masterSlaveRules:
db_ms_0:
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
index 9bd037e348387..f2091bb04e4a8 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
@@ -8,20 +8,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db_ms_${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
@@ -33,7 +33,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
masterSlaveRules:
db_ms_0:
diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
index 5a86fd6497ae8..024a8193ab524 100644
--- a/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
+++ b/sharding-orchestration/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
@@ -8,20 +8,20 @@ shardingRule:
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
algorithmExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
- keyGeneratorClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.IncrementKeyGenerator
+ keyGeneratorClassName: io.shardingsphere.orchestration.api.yaml.fixture.IncrementKeyGenerator
t_order_item:
actualDataNodes: db_ms_${0..1}.t_order_item_${0..1}
databaseStrategy:
standard:
shardingColumn: user_id
- preciseAlgorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+ preciseAlgorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.SingleAlgorithm
tableStrategy:
inline:
shardingColumn: order_id
@@ -34,7 +34,7 @@ shardingRule:
defaultTableStrategy:
complex:
shardingColumns: id, order_id
- algorithmClassName: io.shardingsphere.jdbc.orchestration.api.yaml.fixture.MultiAlgorithm
+ algorithmClassName: io.shardingsphere.orchestration.api.yaml.fixture.MultiAlgorithm
masterSlaveRules:
db_ms_0:
diff --git a/sharding-orchestration/sharding-orchestration-core/pom.xml b/sharding-orchestration/sharding-orchestration-core/pom.xml
index a17daee9b6ee8..4487199795a9f 100644
--- a/sharding-orchestration/sharding-orchestration-core/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-core/pom.xml
@@ -9,7 +9,7 @@
4.0.0
sharding-orchestration-core
-
+
io.shardingsphere
@@ -18,4 +18,3 @@
-
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/config/OrchestrationConfiguration.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationConfiguration.java
similarity index 95%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/config/OrchestrationConfiguration.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationConfiguration.java
index 974e7d5874e4f..09984451b6c0d 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/config/OrchestrationConfiguration.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationConfiguration.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.config;
+package io.shardingsphere.orchestration.config;
import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration;
import lombok.Getter;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/config/OrchestrationType.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java
similarity index 93%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/config/OrchestrationType.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java
index 8111c12bf1417..78b457f592148 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/config/OrchestrationType.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.config;
+package io.shardingsphere.orchestration.config;
/**
* Orchestration type.
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java
similarity index 94%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java
index b385673545c3c..24531650d1f78 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java
@@ -15,20 +15,19 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal;
+package io.shardingsphere.orchestration.internal;
import com.google.common.base.Preconditions;
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
-import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.core.rule.DataSourceParameter;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.config.ConfigurationService;
-import io.shardingsphere.jdbc.orchestration.internal.listener.ListenerFactory;
-import io.shardingsphere.jdbc.orchestration.internal.state.datasource.DataSourceService;
-import io.shardingsphere.jdbc.orchestration.internal.state.instance.InstanceStateService;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.internal.config.ConfigurationService;
+import io.shardingsphere.orchestration.internal.listener.ListenerFactory;
+import io.shardingsphere.orchestration.internal.state.datasource.DataSourceService;
+import io.shardingsphere.orchestration.internal.state.instance.InstanceStateService;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration;
import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;
@@ -36,6 +35,7 @@
import io.shardingsphere.orchestration.reg.newzk.NewZookeeperRegistryCenter;
import io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration;
import io.shardingsphere.orchestration.reg.zookeeper.ZookeeperRegistryCenter;
+import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigMapListenerManager.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigMapListenerManager.java
similarity index 95%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigMapListenerManager.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigMapListenerManager.java
index 8611486c4d8e5..a7512a177da87 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigMapListenerManager.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigMapListenerManager.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.config;
+package io.shardingsphere.orchestration.internal.config;
import io.shardingsphere.core.api.ConfigMapContext;
-import io.shardingsphere.jdbc.orchestration.internal.listener.ListenerManager;
+import io.shardingsphere.orchestration.internal.listener.ListenerManager;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
import io.shardingsphere.orchestration.reg.listener.DataChangedEvent;
import io.shardingsphere.orchestration.reg.listener.EventListener;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationListenerManager.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationListenerManager.java
similarity index 89%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationListenerManager.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationListenerManager.java
index acb57c47a5dd3..efdb7518373e6 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationListenerManager.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationListenerManager.java
@@ -15,15 +15,15 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.config;
+package io.shardingsphere.orchestration.internal.config;
import io.shardingsphere.core.event.ShardingEventBusInstance;
import io.shardingsphere.core.rule.ShardingRule;
-import io.shardingsphere.jdbc.orchestration.internal.event.config.MasterSlaveConfigurationEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.event.config.ProxyConfigurationEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.event.config.ShardingConfigurationEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.listener.ListenerManager;
-import io.shardingsphere.jdbc.orchestration.internal.state.datasource.DataSourceService;
+import io.shardingsphere.orchestration.internal.event.config.MasterSlaveConfigurationEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.config.ProxyConfigurationEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.config.ShardingConfigurationEventBusEvent;
+import io.shardingsphere.orchestration.internal.listener.ListenerManager;
+import io.shardingsphere.orchestration.internal.state.datasource.DataSourceService;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
import io.shardingsphere.orchestration.reg.listener.DataChangedEvent;
import io.shardingsphere.orchestration.reg.listener.EventListener;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationNode.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationNode.java
similarity index 97%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationNode.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationNode.java
index 923e3080f7df3..565a98cf91e8a 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationNode.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationNode.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.config;
+package io.shardingsphere.orchestration.internal.config;
import lombok.RequiredArgsConstructor;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationService.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationService.java
similarity index 97%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationService.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationService.java
index ec1257ce5df64..99b64f8aaa569 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationService.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationService.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.config;
+package io.shardingsphere.orchestration.internal.config;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -25,11 +25,11 @@
import io.shardingsphere.core.rule.DataSourceParameter;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.converter.DataSourceConverter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.converter.DataSourceParameterConverter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.converter.MasterSlaveConfigurationConverter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.converter.ProxyConfigurationConverter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.converter.ShardingConfigurationConverter;
+import io.shardingsphere.orchestration.internal.yaml.converter.DataSourceConverter;
+import io.shardingsphere.orchestration.internal.yaml.converter.DataSourceParameterConverter;
+import io.shardingsphere.orchestration.internal.yaml.converter.MasterSlaveConfigurationConverter;
+import io.shardingsphere.orchestration.internal.yaml.converter.ProxyConfigurationConverter;
+import io.shardingsphere.orchestration.internal.yaml.converter.ShardingConfigurationConverter;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
import javax.sql.DataSource;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/MasterSlaveConfigurationEventBusEvent.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/MasterSlaveConfigurationEventBusEvent.java
similarity index 94%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/MasterSlaveConfigurationEventBusEvent.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/MasterSlaveConfigurationEventBusEvent.java
index 3bd5635fcff6c..8b2bb96a42572 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/MasterSlaveConfigurationEventBusEvent.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/MasterSlaveConfigurationEventBusEvent.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.event.config;
+package io.shardingsphere.orchestration.internal.event.config;
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
import lombok.Getter;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/ProxyConfigurationEventBusEvent.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ProxyConfigurationEventBusEvent.java
similarity index 94%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/ProxyConfigurationEventBusEvent.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ProxyConfigurationEventBusEvent.java
index 858eb2382745e..6024ea75fe3b0 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/ProxyConfigurationEventBusEvent.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ProxyConfigurationEventBusEvent.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.event.config;
+package io.shardingsphere.orchestration.internal.event.config;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/ShardingConfigurationEventBusEvent.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ShardingConfigurationEventBusEvent.java
similarity index 94%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/ShardingConfigurationEventBusEvent.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ShardingConfigurationEventBusEvent.java
index d9ca837c4a692..4a1d26cf0eb00 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/config/ShardingConfigurationEventBusEvent.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ShardingConfigurationEventBusEvent.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.event.config;
+package io.shardingsphere.orchestration.internal.event.config;
import io.shardingsphere.core.rule.ShardingRule;
import lombok.Getter;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/CircuitStateEventBusEvent.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/CircuitStateEventBusEvent.java
similarity index 92%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/CircuitStateEventBusEvent.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/CircuitStateEventBusEvent.java
index 2812c8bb63969..d15aeba92ac97 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/CircuitStateEventBusEvent.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/CircuitStateEventBusEvent.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.event.state;
+package io.shardingsphere.orchestration.internal.event.state;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/DisabledStateEventBusEvent.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/DisabledStateEventBusEvent.java
similarity index 93%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/DisabledStateEventBusEvent.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/DisabledStateEventBusEvent.java
index 28e2b305ecb2a..27a7c7a306675 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/DisabledStateEventBusEvent.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/DisabledStateEventBusEvent.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.event.state;
+package io.shardingsphere.orchestration.internal.event.state;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/ProxyDisabledStateEventBusEvent.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/ProxyDisabledStateEventBusEvent.java
similarity index 93%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/ProxyDisabledStateEventBusEvent.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/ProxyDisabledStateEventBusEvent.java
index 208eb65559f27..3e62629a60fc1 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/event/state/ProxyDisabledStateEventBusEvent.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/state/ProxyDisabledStateEventBusEvent.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.event.state;
+package io.shardingsphere.orchestration.internal.event.state;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/listener/ListenerFactory.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/listener/ListenerFactory.java
similarity index 85%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/listener/ListenerFactory.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/listener/ListenerFactory.java
index 1e42b3e7b59bd..49ce2a3a280a3 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/listener/ListenerFactory.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/listener/ListenerFactory.java
@@ -15,12 +15,12 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.listener;
+package io.shardingsphere.orchestration.internal.listener;
-import io.shardingsphere.jdbc.orchestration.internal.config.ConfigMapListenerManager;
-import io.shardingsphere.jdbc.orchestration.internal.config.ConfigurationListenerManager;
-import io.shardingsphere.jdbc.orchestration.internal.state.datasource.DataSourceListenerManager;
-import io.shardingsphere.jdbc.orchestration.internal.state.instance.InstanceListenerManager;
+import io.shardingsphere.orchestration.internal.config.ConfigMapListenerManager;
+import io.shardingsphere.orchestration.internal.config.ConfigurationListenerManager;
+import io.shardingsphere.orchestration.internal.state.datasource.DataSourceListenerManager;
+import io.shardingsphere.orchestration.internal.state.instance.InstanceListenerManager;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
/**
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/listener/ListenerManager.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/listener/ListenerManager.java
similarity index 94%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/listener/ListenerManager.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/listener/ListenerManager.java
index 401d46769412d..bd0bc9bc1ed97 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/listener/ListenerManager.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/listener/ListenerManager.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.listener;
+package io.shardingsphere.orchestration.internal.listener;
/**
* Registry center's listener manager.
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/StateNode.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/StateNode.java
similarity index 96%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/StateNode.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/StateNode.java
index 06bdf6a46481a..4b77c0f898f40 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/StateNode.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/StateNode.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.state;
+package io.shardingsphere.orchestration.internal.state;
/**
* State node.
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/StateNodeStatus.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/StateNodeStatus.java
similarity index 92%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/StateNodeStatus.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/StateNodeStatus.java
index ee479f3b23b43..8cfc89ec24d94 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/StateNodeStatus.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/StateNodeStatus.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.state;
+package io.shardingsphere.orchestration.internal.state;
/**
* State node status.
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/datasource/DataSourceListenerManager.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceListenerManager.java
similarity index 88%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/datasource/DataSourceListenerManager.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceListenerManager.java
index 2e3d2285c79fe..2a17347ef67d8 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/datasource/DataSourceListenerManager.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceListenerManager.java
@@ -15,13 +15,13 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.state.datasource;
+package io.shardingsphere.orchestration.internal.state.datasource;
import io.shardingsphere.core.event.ShardingEventBusInstance;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.DisabledStateEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.ProxyDisabledStateEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.listener.ListenerManager;
-import io.shardingsphere.jdbc.orchestration.internal.state.StateNode;
+import io.shardingsphere.orchestration.internal.event.state.DisabledStateEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.state.ProxyDisabledStateEventBusEvent;
+import io.shardingsphere.orchestration.internal.listener.ListenerManager;
+import io.shardingsphere.orchestration.internal.state.StateNode;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
import io.shardingsphere.orchestration.reg.listener.DataChangedEvent;
import io.shardingsphere.orchestration.reg.listener.EventListener;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/datasource/DataSourceService.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java
similarity index 95%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/datasource/DataSourceService.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java
index 73ac0a49065d7..38afa87c25995 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/datasource/DataSourceService.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java
@@ -15,15 +15,15 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.state.datasource;
+package io.shardingsphere.orchestration.internal.state.datasource;
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
-import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
import io.shardingsphere.core.rule.DataSourceParameter;
-import io.shardingsphere.jdbc.orchestration.internal.config.ConfigurationService;
-import io.shardingsphere.jdbc.orchestration.internal.state.StateNode;
-import io.shardingsphere.jdbc.orchestration.internal.state.StateNodeStatus;
+import io.shardingsphere.core.yaml.YamlRuleConfiguration;
+import io.shardingsphere.orchestration.internal.config.ConfigurationService;
+import io.shardingsphere.orchestration.internal.state.StateNode;
+import io.shardingsphere.orchestration.internal.state.StateNodeStatus;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
import javax.sql.DataSource;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/InstanceListenerManager.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/InstanceListenerManager.java
similarity index 90%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/InstanceListenerManager.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/InstanceListenerManager.java
index 9fbc16f839cb6..85eac5bea08d4 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/InstanceListenerManager.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/InstanceListenerManager.java
@@ -15,13 +15,13 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.state.instance;
+package io.shardingsphere.orchestration.internal.state.instance;
import io.shardingsphere.core.event.ShardingEventBusInstance;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.CircuitStateEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.listener.ListenerManager;
-import io.shardingsphere.jdbc.orchestration.internal.state.StateNode;
-import io.shardingsphere.jdbc.orchestration.internal.state.StateNodeStatus;
+import io.shardingsphere.orchestration.internal.event.state.CircuitStateEventBusEvent;
+import io.shardingsphere.orchestration.internal.listener.ListenerManager;
+import io.shardingsphere.orchestration.internal.state.StateNode;
+import io.shardingsphere.orchestration.internal.state.StateNodeStatus;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
import io.shardingsphere.orchestration.reg.listener.DataChangedEvent;
import io.shardingsphere.orchestration.reg.listener.EventListener;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/InstanceStateService.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/InstanceStateService.java
similarity index 92%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/InstanceStateService.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/InstanceStateService.java
index e39fd9f29bc00..f93d152e77161 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/InstanceStateService.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/InstanceStateService.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.state.instance;
+package io.shardingsphere.orchestration.internal.state.instance;
-import io.shardingsphere.jdbc.orchestration.internal.state.StateNode;
+import io.shardingsphere.orchestration.internal.state.StateNode;
import io.shardingsphere.orchestration.reg.api.RegistryCenter;
/**
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/OrchestrationInstance.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/OrchestrationInstance.java
similarity index 91%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/OrchestrationInstance.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/OrchestrationInstance.java
index 34a4417b6a8dc..9de6b3129eff3 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/state/instance/OrchestrationInstance.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/instance/OrchestrationInstance.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.state.instance;
+package io.shardingsphere.orchestration.internal.state.instance;
-import io.shardingsphere.jdbc.orchestration.internal.util.IpUtils;
+import io.shardingsphere.orchestration.internal.util.IpUtils;
import lombok.Getter;
import java.lang.management.ManagementFactory;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/util/IpUtils.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/util/IpUtils.java
similarity index 98%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/util/IpUtils.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/util/IpUtils.java
index ace65a6f50de4..58a99075a05c3 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/util/IpUtils.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/util/IpUtils.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.util;
+package io.shardingsphere.orchestration.internal.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/DataSourceConverter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/DataSourceConverter.java
similarity index 91%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/DataSourceConverter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/DataSourceConverter.java
index 4ae6149cb2e1a..448f3e03ef141 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/DataSourceConverter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/DataSourceConverter.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.converter;
+package io.shardingsphere.orchestration.internal.yaml.converter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.representer.DataSourceRepresenter;
+import io.shardingsphere.orchestration.internal.yaml.representer.DataSourceRepresenter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.Yaml;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/DataSourceParameterConverter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/DataSourceParameterConverter.java
similarity index 91%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/DataSourceParameterConverter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/DataSourceParameterConverter.java
index b293db914aae6..3ed603809655b 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/DataSourceParameterConverter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/DataSourceParameterConverter.java
@@ -15,10 +15,10 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.converter;
+package io.shardingsphere.orchestration.internal.yaml.converter;
import io.shardingsphere.core.rule.DataSourceParameter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
+import io.shardingsphere.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.Yaml;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/MasterSlaveConfigurationConverter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/MasterSlaveConfigurationConverter.java
similarity index 92%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/MasterSlaveConfigurationConverter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/MasterSlaveConfigurationConverter.java
index aeee4fb72bc95..4559c208de228 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/MasterSlaveConfigurationConverter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/MasterSlaveConfigurationConverter.java
@@ -15,12 +15,12 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.converter;
+package io.shardingsphere.orchestration.internal.yaml.converter;
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.representer.MasterSlaveConfigurationRepresenter;
+import io.shardingsphere.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
+import io.shardingsphere.orchestration.internal.yaml.representer.MasterSlaveConfigurationRepresenter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.Yaml;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/ProxyConfigurationConverter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/ProxyConfigurationConverter.java
similarity index 93%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/ProxyConfigurationConverter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/ProxyConfigurationConverter.java
index 120faae2ae5cc..0f2c49edc4f28 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/ProxyConfigurationConverter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/ProxyConfigurationConverter.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.converter;
+package io.shardingsphere.orchestration.internal.yaml.converter;
-import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
+import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
+import io.shardingsphere.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.Yaml;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/ShardingConfigurationConverter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/ShardingConfigurationConverter.java
similarity index 92%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/ShardingConfigurationConverter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/ShardingConfigurationConverter.java
index b21e05e1f4a7e..30d5d80ce413b 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/converter/ShardingConfigurationConverter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/converter/ShardingConfigurationConverter.java
@@ -15,12 +15,12 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.converter;
+package io.shardingsphere.orchestration.internal.yaml.converter;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
-import io.shardingsphere.jdbc.orchestration.internal.yaml.representer.ShardingConfigurationRepresenter;
+import io.shardingsphere.orchestration.internal.yaml.representer.DefaultConfigurationRepresenter;
+import io.shardingsphere.orchestration.internal.yaml.representer.ShardingConfigurationRepresenter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.Yaml;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DataSourceRepresenter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/DataSourceRepresenter.java
similarity index 98%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DataSourceRepresenter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/DataSourceRepresenter.java
index 96839a45b48aa..1bec7adbb9564 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DataSourceRepresenter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/DataSourceRepresenter.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.representer;
+package io.shardingsphere.orchestration.internal.yaml.representer;
import com.google.common.collect.Sets;
import io.shardingsphere.core.exception.ShardingException;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DefaultConfigurationRepresenter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/DefaultConfigurationRepresenter.java
similarity index 94%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DefaultConfigurationRepresenter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/DefaultConfigurationRepresenter.java
index b8838ff4c14a5..48c9b3dc84a91 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DefaultConfigurationRepresenter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/DefaultConfigurationRepresenter.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.representer;
+package io.shardingsphere.orchestration.internal.yaml.representer;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.Tag;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/MasterSlaveConfigurationRepresenter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/MasterSlaveConfigurationRepresenter.java
similarity index 96%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/MasterSlaveConfigurationRepresenter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/MasterSlaveConfigurationRepresenter.java
index 6045ffaf009f9..4496704b0a418 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/MasterSlaveConfigurationRepresenter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/MasterSlaveConfigurationRepresenter.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.representer;
+package io.shardingsphere.orchestration.internal.yaml.representer;
import io.shardingsphere.core.exception.ShardingException;
import org.yaml.snakeyaml.introspector.Property;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/ProxyConfigurationRepresenter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/ProxyConfigurationRepresenter.java
similarity index 96%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/ProxyConfigurationRepresenter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/ProxyConfigurationRepresenter.java
index 2e486a62c53c6..ff08dcc434f9e 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/ProxyConfigurationRepresenter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/ProxyConfigurationRepresenter.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.representer;
+package io.shardingsphere.orchestration.internal.yaml.representer;
import io.shardingsphere.core.exception.ShardingException;
import org.yaml.snakeyaml.introspector.Property;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/ShardingConfigurationRepresenter.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/ShardingConfigurationRepresenter.java
similarity index 96%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/ShardingConfigurationRepresenter.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/ShardingConfigurationRepresenter.java
index 2e8f124f901c4..366f993824196 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/ShardingConfigurationRepresenter.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/yaml/representer/ShardingConfigurationRepresenter.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.yaml.representer;
+package io.shardingsphere.orchestration.internal.yaml.representer;
import io.shardingsphere.core.exception.ShardingException;
import org.yaml.snakeyaml.introspector.Property;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/yaml/YamlOrchestrationConfiguration.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java
similarity index 89%
rename from sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/yaml/YamlOrchestrationConfiguration.java
rename to sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java
index fcc9016d2a512..692c824866e07 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/yaml/YamlOrchestrationConfiguration.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java
@@ -15,11 +15,11 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.yaml;
+package io.shardingsphere.orchestration.yaml;
import com.google.common.base.Preconditions;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.jdbc.orchestration.config.OrchestrationType;
+import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationType;
import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;
import io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration;
import lombok.Getter;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/AllTests.java b/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/AllTests.java
similarity index 87%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/AllTests.java
rename to sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/AllTests.java
index 09d1db7ca8cb4..7e6e8fc5fad22 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/AllTests.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/AllTests.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration;
+package io.shardingsphere.orchestration;
-import io.shardingsphere.jdbc.orchestration.internal.AllInternalTests;
+import io.shardingsphere.orchestration.internal.AllInternalTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/internal/AllInternalTests.java b/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/internal/AllInternalTests.java
similarity index 85%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/internal/AllInternalTests.java
rename to sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/internal/AllInternalTests.java
index 64c2737c954b5..6b4d952b1cdb1 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/internal/AllInternalTests.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/internal/AllInternalTests.java
@@ -15,9 +15,9 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal;
+package io.shardingsphere.orchestration.internal;
-import io.shardingsphere.jdbc.orchestration.internal.config.ConfigurationNodeTest;
+import io.shardingsphere.orchestration.internal.config.ConfigurationNodeTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationNodeTest.java b/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/internal/config/ConfigurationNodeTest.java
similarity index 94%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationNodeTest.java
rename to sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/internal/config/ConfigurationNodeTest.java
index f3177d89ec99f..9d22d1d127ddc 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/internal/config/ConfigurationNodeTest.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/orchestration/internal/config/ConfigurationNodeTest.java
@@ -15,7 +15,7 @@
*
*/
-package io.shardingsphere.jdbc.orchestration.internal.config;
+package io.shardingsphere.orchestration.internal.config;
import org.junit.Test;
diff --git a/sharding-orchestration/sharding-orchestration-reg/src/test/resources/logback-test.xml b/sharding-orchestration/sharding-orchestration-reg/src/test/resources/logback-test.xml
index 30f533962f7dd..1cb0de791ca6c 100644
--- a/sharding-orchestration/sharding-orchestration-reg/src/test/resources/logback-test.xml
+++ b/sharding-orchestration/sharding-orchestration-reg/src/test/resources/logback-test.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/Bootstrap.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/Bootstrap.java
index 04aff50b1b3cf..b3130abbb9f2f 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/Bootstrap.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/Bootstrap.java
@@ -20,8 +20,8 @@
import io.shardingsphere.core.rule.DataSourceParameter;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.OrchestrationFacade;
import io.shardingsphere.opentracing.ShardingTracer;
+import io.shardingsphere.orchestration.internal.OrchestrationFacade;
import io.shardingsphere.proxy.config.ProxyContext;
import io.shardingsphere.proxy.config.yaml.ProxyConfiguration;
import io.shardingsphere.proxy.config.yaml.ProxyYamlConfigurationLoader;
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/ProxyContext.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/ProxyContext.java
index 2ec4ad47bc931..08069cbc91fdc 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/ProxyContext.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/ProxyContext.java
@@ -28,9 +28,9 @@
import io.shardingsphere.core.rule.ProxyAuthority;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
-import io.shardingsphere.jdbc.orchestration.internal.event.config.ProxyConfigurationEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.CircuitStateEventBusEvent;
-import io.shardingsphere.jdbc.orchestration.internal.event.state.ProxyDisabledStateEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.config.ProxyConfigurationEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.state.CircuitStateEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.state.ProxyDisabledStateEventBusEvent;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/yaml/ProxyYamlServerConfiguration.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/yaml/ProxyYamlServerConfiguration.java
index 8015563cdda39..f182867be4209 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/yaml/ProxyYamlServerConfiguration.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/config/yaml/ProxyYamlServerConfiguration.java
@@ -18,7 +18,7 @@
package io.shardingsphere.proxy.config.yaml;
import io.shardingsphere.core.rule.ProxyAuthority;
-import io.shardingsphere.jdbc.orchestration.yaml.YamlOrchestrationConfiguration;
+import io.shardingsphere.orchestration.yaml.YamlOrchestrationConfiguration;
import lombok.Getter;
import lombok.Setter;