diff --git a/core/consensus/consensus-bftsmart/pom.xml b/core/consensus/consensus-bftsmart/pom.xml index 3a21c5e4..66af6db9 100644 --- a/core/consensus/consensus-bftsmart/pom.xml +++ b/core/consensus/consensus-bftsmart/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - consensus - 1.1.2.RELEASE + consensus-core + 1.2.0-SNAPSHOT consensus-bftsmart @@ -13,6 +13,7 @@ com.jd.blockchain bft-smart + 0.3.0.RELEASE com.jd.blockchain @@ -22,12 +23,12 @@ com.jd.blockchain consensus-framework - ${project.version} + ${framework.version} com.jd.blockchain utils-common - ${project.version} + ${framework.version} org.apache.commons @@ -36,7 +37,7 @@ com.jd.blockchain ledger-model - ${project.version} + ${framework.version} com.jd.blockchain @@ -50,17 +51,5 @@ --> - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - \ No newline at end of file diff --git a/core/consensus/consensus-mq/pom.xml b/core/consensus/consensus-mq/pom.xml index c1b13078..477f187a 100644 --- a/core/consensus/consensus-mq/pom.xml +++ b/core/consensus/consensus-mq/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - consensus - 1.1.2.RELEASE + consensus-core + 1.2.0-SNAPSHOT consensus-mq diff --git a/core/consensus/pom.xml b/core/consensus/pom.xml index c5ad1d10..d9c9216e 100644 --- a/core/consensus/pom.xml +++ b/core/consensus/pom.xml @@ -4,14 +4,13 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT - consensus + consensus-core pom - consensus-framework consensus-bftsmart consensus-mq diff --git a/core/contract/contract-jvm/pom.xml b/core/contract/contract-jvm/pom.xml index 19501b8b..c547c43d 100644 --- a/core/contract/contract-jvm/pom.xml +++ b/core/contract/contract-jvm/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - contract - 1.1.2.RELEASE + contract-core + 1.2.0-SNAPSHOT contract-jvm diff --git a/core/contract/contract-maven-plugin/pom.xml b/core/contract/contract-maven-plugin/pom.xml index 91c815b7..c089d5b9 100644 --- a/core/contract/contract-maven-plugin/pom.xml +++ b/core/contract/contract-maven-plugin/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - contract - 1.1.2.RELEASE + contract-core + 1.2.0-SNAPSHOT contract-maven-plugin maven-plugin diff --git a/core/contract/pom.xml b/core/contract/pom.xml index d88eb189..79c0c1f1 100644 --- a/core/contract/pom.xml +++ b/core/contract/pom.xml @@ -3,17 +3,15 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT - contract + contract-core pom - contract-framework contract-jvm contract-maven-plugin - contract-samples \ No newline at end of file diff --git a/core/crypto/crypto-adv/pom.xml b/core/crypto/crypto-adv/pom.xml index 4841494b..16168b79 100644 --- a/core/crypto/crypto-adv/pom.xml +++ b/core/crypto/crypto-adv/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - crypto - 1.1.2.RELEASE + crypto-core + 1.2.0-SNAPSHOT crypto-adv diff --git a/core/crypto/crypto-pki/pom.xml b/core/crypto/crypto-pki/pom.xml index f4633b41..708832bc 100644 --- a/core/crypto/crypto-pki/pom.xml +++ b/core/crypto/crypto-pki/pom.xml @@ -2,12 +2,13 @@ + 4.0.0 - crypto com.jd.blockchain - 1.1.2.RELEASE + crypto-core + 1.2.0-SNAPSHOT - 4.0.0 + crypto-pki @@ -15,7 +16,7 @@ com.jd.blockchain crypto-framework - ${project.version} + ${framework.version} org.bouncycastle diff --git a/core/crypto/pom.xml b/core/crypto/pom.xml index f9774b54..aa6386b9 100644 --- a/core/crypto/pom.xml +++ b/core/crypto/pom.xml @@ -4,16 +4,13 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT - crypto + crypto-core pom - crypto-framework - crypto-classic - crypto-sm crypto-adv crypto-pki diff --git a/core/gateway/pom.xml b/core/gateway/pom.xml index e7632327..2556937d 100644 --- a/core/gateway/pom.xml +++ b/core/gateway/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT gateway @@ -13,7 +13,7 @@ com.jd.blockchain consensus-framework - ${project.version} + ${framework.version} com.jd.blockchain @@ -34,7 +34,7 @@ com.jd.blockchain sdk-base - ${project.version} + ${framework.version} @@ -46,30 +46,31 @@ com.jd.blockchain data-explorer + 1.1.1.RELEASE com.jd.blockchain utils-web - ${project.version} + ${framework.version} com.jd.blockchain crypto-framework - ${project.version} + ${framework.version} com.jd.blockchain crypto-classic - ${project.version} + ${framework.version} com.jd.blockchain crypto-sm - ${project.version} + ${framework.version} diff --git a/core/ledger/ledger-core/pom.xml b/core/ledger/ledger-database/pom.xml similarity index 94% rename from core/ledger/ledger-core/pom.xml rename to core/ledger/ledger-database/pom.xml index cbbfd67b..110b3514 100644 --- a/core/ledger/ledger-core/pom.xml +++ b/core/ledger/ledger-database/pom.xml @@ -4,10 +4,10 @@ 4.0.0 com.jd.blockchain - ledger - 1.1.2.RELEASE + ledger-core + 1.2.0-SNAPSHOT - ledger-core + ledger-database @@ -33,12 +33,12 @@ com.jd.blockchain storage-service - ${project.version} + ${framework.version} com.jd.blockchain contract-framework - ${project.version} + ${framework.version} com.jd.blockchain diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/AccountAccessPolicy.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/AccountAccessPolicy.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/AccountAccessPolicy.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/AccountAccessPolicy.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/AccountDecorator.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/AccountDecorator.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/AccountDecorator.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/AccountDecorator.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/AccountQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/AccountQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/AccountQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/AccountQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CompositeAccount.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/CompositeAccount.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CompositeAccount.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/CompositeAccount.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ConsensusConfig.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ConsensusConfig.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ConsensusConfig.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ConsensusConfig.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccount.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ContractAccount.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccount.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ContractAccount.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccountQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ContractAccountQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccountQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ContractAccountQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccountSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ContractAccountSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccountSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ContractAccountSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccount.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DataAccount.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccount.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DataAccount.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccountQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DataAccountQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccountQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DataAccountQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccountSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DataAccountSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccountSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DataAccountSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DefaultOperationHandleRegisteration.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DefaultOperationHandleRegisteration.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DefaultOperationHandleRegisteration.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/DefaultOperationHandleRegisteration.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/EmptyAccountSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/EmptyAccountSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/EmptyAccountSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/EmptyAccountSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/EmptyLedgerDataset.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/EmptyLedgerDataset.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/EmptyLedgerDataset.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/EmptyLedgerDataset.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/FullPermissionedSecurityManager.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/FullPermissionedSecurityManager.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/FullPermissionedSecurityManager.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/FullPermissionedSecurityManager.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericAccountDataset.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericAccountDataset.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericAccountDataset.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericAccountDataset.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericAccountSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericAccountSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericAccountSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericAccountSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericDataEntry.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericDataEntry.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericDataEntry.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericDataEntry.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataEntry.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataEntry.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataEntry.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataEntry.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenericMerkleDataSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenesisLedgerStorageProxy.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenesisLedgerStorageProxy.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/GenesisLedgerStorageProxy.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/GenesisLedgerStorageProxy.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/HashDigestList.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/HashDigestList.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/HashDigestList.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/HashDigestList.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/HashProvable.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/HashProvable.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/HashProvable.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/HashProvable.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataset.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataset.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataset.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataset.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminInfoData.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminInfoData.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminInfoData.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminInfoData.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerBlockData.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerBlockData.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerBlockData.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerBlockData.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerConfiguration.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerConfiguration.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerConfiguration.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerConfiguration.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerConsts.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerConsts.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerConsts.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerConsts.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerDataQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerDataQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerDataQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerDataQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerDataset.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerDataset.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerDataset.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerDataset.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerEditor.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerEditor.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerEditor.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerEditor.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitDecision.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitDecision.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitDecision.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitDecision.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposal.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposal.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposal.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposal.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposalData.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposalData.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposalData.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitProposalData.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitializer.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitializer.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitializer.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerInitializer.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerManage.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerManage.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerManage.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerManage.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerManager.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerManager.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerManager.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerManager.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerMetadata.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerMetadata.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerMetadata.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerMetadata.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerQueryService.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerQueryService.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerQueryService.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerQueryService.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerRepository.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerRepository.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerRepository.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerRepository.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerRepositoryImpl.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerRepositoryImpl.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerRepositoryImpl.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerRepositoryImpl.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManager.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManager.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManager.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManager.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManagerImpl.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManagerImpl.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManagerImpl.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerSecurityManagerImpl.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerService.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerService.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerService.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerService.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionContext.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionContext.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionContext.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionContext.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionData.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionData.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionData.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionData.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionalEditor.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionalEditor.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionalEditor.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/LedgerTransactionalEditor.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccount.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleAccount.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccount.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleAccount.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountHeader.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountHeader.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountHeader.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountHeader.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataCluster.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataCluster.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataCluster.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataCluster.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataEntry.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataEntry.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataEntry.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataEntry.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V0.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V0.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V0.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V0.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V1.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V1.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V1.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoder_V1.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleProofException.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleProofException.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleProofException.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleProofException.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleProvable.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleProvable.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleProvable.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleProvable.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleSequenceSNGenerator.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleSequenceSNGenerator.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleSequenceSNGenerator.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleSequenceSNGenerator.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleTree.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleTree.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleTree.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleTree.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleTreeEncoder.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleTreeEncoder.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleTreeEncoder.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MerkleTreeEncoder.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MultiIDsPolicy.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MultiIDsPolicy.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MultiIDsPolicy.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/MultiIDsPolicy.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/Node.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/Node.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/Node.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/Node.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OpeningAccessPolicy.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OpeningAccessPolicy.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OpeningAccessPolicy.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OpeningAccessPolicy.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OperationHandleContext.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OperationHandleContext.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OperationHandleContext.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OperationHandleContext.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OperationHandleRegisteration.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OperationHandleRegisteration.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/OperationHandleRegisteration.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/OperationHandleRegisteration.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/Peer.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/Peer.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/Peer.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/Peer.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/PermissionService.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/PermissionService.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/PermissionService.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/PermissionService.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/PrefixAppender.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/PrefixAppender.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/PrefixAppender.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/PrefixAppender.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/PrivilegeModelSetting.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/PrivilegeModelSetting.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/PrivilegeModelSetting.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/PrivilegeModelSetting.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/RolePrivilegeDataset.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/RolePrivilegeDataset.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/RolePrivilegeDataset.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/RolePrivilegeDataset.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SNGenerator.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SNGenerator.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SNGenerator.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SNGenerator.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SecurityContext.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SecurityContext.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SecurityContext.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SecurityContext.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SecurityPolicy.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SecurityPolicy.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SecurityPolicy.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SecurityPolicy.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SettingContext.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SettingContext.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SettingContext.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SettingContext.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SmartContract.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SmartContract.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/SmartContract.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/SmartContract.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionBatchProcessor.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionBatchProcessor.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionBatchProcessor.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionBatchProcessor.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionEngineImpl.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionEngineImpl.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionEngineImpl.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionEngineImpl.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtension.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtension.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtension.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtension.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtensionImpl.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtensionImpl.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtensionImpl.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionRequestExtensionImpl.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionStagedSnapshot.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionStagedSnapshot.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionStagedSnapshot.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/TransactionStagedSnapshot.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccount.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserAccount.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccount.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserAccount.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccountQuery.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserAccountQuery.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccountQuery.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserAccountQuery.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccountSet.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserAccountSet.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccountSet.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserAccountSet.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserRoleDataset.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserRoleDataset.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserRoleDataset.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserRoleDataset.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserRolesPrivileges.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserRolesPrivileges.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserRolesPrivileges.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/UserRolesPrivileges.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/AbstractLedgerOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/AbstractLedgerOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/AbstractLedgerOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/AbstractLedgerOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/AbtractContractEventSendOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/AbtractContractEventSendOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/AbtractContractEventSendOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/AbtractContractEventSendOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ContractCodeDeployOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ContractCodeDeployOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ContractCodeDeployOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ContractCodeDeployOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ContractLedgerContext.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ContractLedgerContext.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ContractLedgerContext.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ContractLedgerContext.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountKVSetOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountKVSetOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountKVSetOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountKVSetOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountRegisterOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountRegisterOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountRegisterOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/DataAccountRegisterOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/JVMContractEventSendOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/JVMContractEventSendOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/JVMContractEventSendOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/JVMContractEventSendOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/LedgerInitOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/LedgerInitOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/LedgerInitOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/LedgerInitOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/RolesConfigureOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/RolesConfigureOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/RolesConfigureOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/RolesConfigureOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/UserAuthorizeOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/UserAuthorizeOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/UserAuthorizeOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/UserAuthorizeOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/UserRegisterOperationHandle.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/UserRegisterOperationHandle.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/UserRegisterOperationHandle.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/handles/UserRegisterOperationHandle.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockDeserializer.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockDeserializer.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockDeserializer.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockDeserializer.java diff --git a/core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockSerializer.java b/core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockSerializer.java similarity index 100% rename from core/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockSerializer.java rename to core/ledger/ledger-database/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockSerializer.java diff --git a/core/ledger/ledger-core/src/test/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoderTest.java b/core/ledger/ledger-database/src/test/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoderTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoderTest.java rename to core/ledger/ledger-database/src/test/java/com/jd/blockchain/ledger/core/MerkleDataNodeEncoderTest.java diff --git a/core/ledger/ledger-core/src/test/java/com/jd/blockchain/ledger/core/PreviousDataNode.java b/core/ledger/ledger-database/src/test/java/com/jd/blockchain/ledger/core/PreviousDataNode.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/com/jd/blockchain/ledger/core/PreviousDataNode.java rename to core/ledger/ledger-database/src/test/java/com/jd/blockchain/ledger/core/PreviousDataNode.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingHandle.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingHandle.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingHandle.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingHandle.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/KeyValueEntry.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/KeyValueEntry.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/KeyValueEntry.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/KeyValueEntry.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/KeyValueObject.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/KeyValueObject.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/KeyValueObject.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/KeyValueObject.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TxTestContract.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/TxTestContract.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TxTestContract.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/TxTestContract.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TxTestContractImpl.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/TxTestContractImpl.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TxTestContractImpl.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/TxTestContractImpl.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/AccountSetTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/AccountSetTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/AccountSetTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/AccountSetTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/BaseAccountTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/BaseAccountTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/BaseAccountTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/BaseAccountTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingHandle.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingHandle.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingHandle.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingHandle.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAccountTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAccountTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAccountTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAccountTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAdminDatasetTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAdminDatasetTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAdminDatasetTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerAdminDatasetTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerBlockImplTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerBlockImplTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerBlockImplTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerBlockImplTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerEditorTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerEditorTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerEditorTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerEditorTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitOperationTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitOperationTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitOperationTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitOperationTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitSettingSerializeTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitSettingSerializeTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitSettingSerializeTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerInitSettingSerializeTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerMetaDataTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerMetaDataTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerMetaDataTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerMetaDataTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerSecurityManagerTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerSecurityManagerTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerSecurityManagerTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerSecurityManagerTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTestUtils.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTestUtils.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTestUtils.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTestUtils.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTransactionDataTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTransactionDataTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTransactionDataTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/LedgerTransactionDataTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/MerkleAccountSetTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/MerkleAccountSetTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/MerkleAccountSetTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/MerkleAccountSetTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/MerkleDataSetTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/MerkleDataSetTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/MerkleDataSetTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/MerkleDataSetTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/MerkleTreeTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/MerkleTreeTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/MerkleTreeTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/MerkleTreeTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/RolePrivilegeDatasetTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/RolePrivilegeDatasetTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/RolePrivilegeDatasetTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/RolePrivilegeDatasetTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TestContract.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TestContract.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TestContract.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TestContract.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TestContractImpl.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TestContractImpl.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TestContractImpl.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TestContractImpl.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionBatchProcessorTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TransactionBatchProcessorTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionBatchProcessorTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TransactionBatchProcessorTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionStagedSnapshotTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TransactionStagedSnapshotTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionStagedSnapshotTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/TransactionStagedSnapshotTest.java diff --git a/core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/UserRoleDatasetTest.java b/core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/UserRoleDatasetTest.java similarity index 100% rename from core/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/UserRoleDatasetTest.java rename to core/ledger/ledger-database/src/test/java/test/com/jd/blockchain/ledger/core/UserRoleDatasetTest.java diff --git a/core/ledger/ledger-core/src/test/resources/contract-JDChain-Contract.jar b/core/ledger/ledger-database/src/test/resources/contract-JDChain-Contract.jar similarity index 100% rename from core/ledger/ledger-core/src/test/resources/contract-JDChain-Contract.jar rename to core/ledger/ledger-database/src/test/resources/contract-JDChain-Contract.jar diff --git a/core/ledger/ledger-core/src/test/resources/logback-test.xml b/core/ledger/ledger-database/src/test/resources/logback-test.xml similarity index 100% rename from core/ledger/ledger-core/src/test/resources/logback-test.xml rename to core/ledger/ledger-database/src/test/resources/logback-test.xml diff --git a/core/ledger/ledger-rpc/pom.xml b/core/ledger/ledger-rpc/pom.xml index 57a8cf9f..dff81f7b 100644 --- a/core/ledger/ledger-rpc/pom.xml +++ b/core/ledger/ledger-rpc/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - ledger - 1.1.2.RELEASE + ledger-core + 1.2.0-SNAPSHOT ledger-rpc diff --git a/core/ledger/pom.xml b/core/ledger/pom.xml index d5049b8c..fe53caf4 100644 --- a/core/ledger/pom.xml +++ b/core/ledger/pom.xml @@ -4,15 +4,14 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT - ledger + ledger-core pom - ledger-model - ledger-core + ledger-database ledger-rpc \ No newline at end of file diff --git a/core/manager/manager-booter/pom.xml b/core/manager/manager-booter/pom.xml index e4764486..46d85347 100644 --- a/core/manager/manager-booter/pom.xml +++ b/core/manager/manager-booter/pom.xml @@ -3,14 +3,13 @@ - manager com.jd.blockchain - 1.1.2.RELEASE + manager-core + 1.2.0-SNAPSHOT 4.0.0 manager-booter - manager-booter diff --git a/core/manager/manager-model/pom.xml b/core/manager/manager-model/pom.xml index fd35f6d9..77f129d4 100644 --- a/core/manager/manager-model/pom.xml +++ b/core/manager/manager-model/pom.xml @@ -3,9 +3,9 @@ - manager com.jd.blockchain - 1.1.2.RELEASE + manager-core + 1.2.0-SNAPSHOT 4.0.0 diff --git a/core/manager/manager-service/pom.xml b/core/manager/manager-service/pom.xml index 4ea9f334..b36e8e02 100644 --- a/core/manager/manager-service/pom.xml +++ b/core/manager/manager-service/pom.xml @@ -3,14 +3,13 @@ - manager com.jd.blockchain - 1.1.2.RELEASE + manager-core + 1.2.0-SNAPSHOT 4.0.0 manager-service - manager-service diff --git a/core/manager/manager-web/pom.xml b/core/manager/manager-web/pom.xml index 0ec34f4a..2df0b6d5 100644 --- a/core/manager/manager-web/pom.xml +++ b/core/manager/manager-web/pom.xml @@ -3,14 +3,13 @@ - manager com.jd.blockchain - 1.1.2.RELEASE + manager-core + 1.2.0-SNAPSHOT - 4.0.0 + 4.0.0 manager-web - manager-web @@ -72,6 +71,7 @@ com.jd.blockchain manager-explorer + 1.1.1.RELEASE diff --git a/core/manager/pom.xml b/core/manager/pom.xml index a59378a9..a79c6ce0 100644 --- a/core/manager/pom.xml +++ b/core/manager/pom.xml @@ -2,19 +2,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + + + com.jd.blockchain + jdchain-core + 1.2.0-SNAPSHOT + + manager-core + pom + + manager-booter manager-web manager-service manager-model - - com.jd.blockchain - jdchain-root - 1.1.2.RELEASE - - manager - pom diff --git a/core/peer/pom.xml b/core/peer/pom.xml index 23a08185..19f850e1 100644 --- a/core/peer/pom.xml +++ b/core/peer/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT peer @@ -18,7 +18,12 @@ com.jd.blockchain consensus-framework - ${project.version} + ${framework.version} + + + com.jd.blockchain + utils-web + ${framework.version} com.jd.blockchain @@ -37,7 +42,7 @@ com.jd.blockchain - ledger-core + ledger-database ${project.version} @@ -45,11 +50,7 @@ tools-initializer ${project.version} - - com.jd.blockchain - utils-web - ${project.version} - + org.springframework.boot @@ -82,17 +83,5 @@ --> - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 00000000..b23168f5 --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,69 @@ + + 4.0.0 + + com.jd.blockchain + jdchain-parent + 1.1.1.RELEASE + + + com.jd.blockchain + jdchain-core + 1.2.0-SNAPSHOT + pom + + + 1.2.0-SNAPSHOT + + + + consensus + contract + crypto + ledger + runtime + storage + gateway + peer + manager + tools + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://github.com/blockchain-jd-com/jdchain-framework.git + https://github.com/blockchain-jd-com/jdchain-framework.git + https://github.com/blockchain-jd-com/jdchain-framework.git + + + + + jdchain + git-jdchain@jd.com + https://github.com/blockchain-jd-com/jdchain-framework.git + + + + + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + + + + + diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index e78338ce..d1aae37a 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -4,10 +4,10 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT - runtime + runtime-core pom diff --git a/core/runtime/runtime-context/pom.xml b/core/runtime/runtime-context/pom.xml index 33a72651..4357377a 100644 --- a/core/runtime/runtime-context/pom.xml +++ b/core/runtime/runtime-context/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - runtime - 1.1.2.RELEASE + runtime-core + 1.2.0-SNAPSHOT runtime-context @@ -13,7 +13,7 @@ com.jd.blockchain utils-common - ${project.version} + ${framework.version} \ No newline at end of file diff --git a/core/runtime/runtime-modular-booter/pom.xml b/core/runtime/runtime-modular-booter/pom.xml index d641b32a..f3060bc7 100644 --- a/core/runtime/runtime-modular-booter/pom.xml +++ b/core/runtime/runtime-modular-booter/pom.xml @@ -2,10 +2,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + com.jd.blockchain - runtime - 1.1.2.RELEASE + runtime-core + 1.2.0-SNAPSHOT runtime-modular-booter \ No newline at end of file diff --git a/core/runtime/runtime-modular/pom.xml b/core/runtime/runtime-modular/pom.xml index fc54d0ef..f6ba1b88 100644 --- a/core/runtime/runtime-modular/pom.xml +++ b/core/runtime/runtime-modular/pom.xml @@ -2,10 +2,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + com.jd.blockchain - runtime - 1.1.2.RELEASE + runtime-core + 1.2.0-SNAPSHOT runtime-modular diff --git a/core/storage/pom.xml b/core/storage/pom.xml index 7e432edd..33243052 100644 --- a/core/storage/pom.xml +++ b/core/storage/pom.xml @@ -2,16 +2,14 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE - - storage + jdchain-core + 1.2.0-SNAPSHOT + + storage-core pom - storage-service storage-redis storage-rocksdb - storage-composite diff --git a/core/storage/storage-redis/pom.xml b/core/storage/storage-redis/pom.xml index 25cd1816..82062a40 100644 --- a/core/storage/storage-redis/pom.xml +++ b/core/storage/storage-redis/pom.xml @@ -3,8 +3,8 @@ 4.0.0 com.jd.blockchain - storage - 1.1.2.RELEASE + storage-core + 1.2.0-SNAPSHOT storage-redis diff --git a/core/storage/storage-rocksdb/pom.xml b/core/storage/storage-rocksdb/pom.xml index 92246ef2..664a3f7a 100644 --- a/core/storage/storage-rocksdb/pom.xml +++ b/core/storage/storage-rocksdb/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - storage - 1.1.2.RELEASE + storage-core + 1.2.0-SNAPSHOT storage-rocksdb diff --git a/core/tools/pom.xml b/core/tools/pom.xml index 1671c46f..4d171aed 100644 --- a/core/tools/pom.xml +++ b/core/tools/pom.xml @@ -4,10 +4,10 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-core + 1.2.0-SNAPSHOT - tools + tools-core pom tools-keygen diff --git a/core/tools/tools-initializer-booter/pom.xml b/core/tools/tools-initializer-booter/pom.xml index 4c012f35..bea71a2d 100644 --- a/core/tools/tools-initializer-booter/pom.xml +++ b/core/tools/tools-initializer-booter/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - tools - 1.1.2.RELEASE + tools-core + 1.2.0-SNAPSHOT tools-initializer-booter diff --git a/core/tools/tools-initializer/pom.xml b/core/tools/tools-initializer/pom.xml index b97c7890..9f8d15fd 100644 --- a/core/tools/tools-initializer/pom.xml +++ b/core/tools/tools-initializer/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - tools - 1.1.2.RELEASE + tools-core + 1.2.0-SNAPSHOT tools-initializer @@ -32,7 +32,7 @@ com.jd.blockchain - ledger-core + ledger-database ${project.version} @@ -54,7 +54,7 @@ com.jd.blockchain storage-composite - ${project.version} + ${framework.version}