From 6225e45b6c1bb56275872c26ae7df97d4d012ee8 Mon Sep 17 00:00:00 2001
From: huanghaiquan <huanghaiquan@jd.com>
Date: Wed, 18 Dec 2019 00:39:03 +0800
Subject: [PATCH] Fixed compilation errors of framework;

---
 core/gateway/pom.xml                          |  6 ++--
 core/ledger/pom.xml                           |  1 -
 core/manager/manager-web/pom.xml              |  2 +-
 core/peer/pom.xml                             |  4 +--
 core/pom.xml                                  |  2 ++
 deploy/deploy-gateway/pom.xml                 | 17 ++++++-----
 deploy/deploy-peer/pom.xml                    | 22 +++++++-------
 deploy/pom.xml                                | 29 ++++++++-----------
 framework/pom.xml                             |  1 +
 framework/sdk/pom.xml                         |  1 +
 framework/sdk/sdk-client/pom.xml              |  2 +-
 .../sdk/sdk-rpc}/pom.xml                      | 16 ++--------
 .../converters/BinaryMessageConverter.java    |  0
 .../web/converters/BytesInputConverter.java   |  0
 .../converters/HashDigestInputConverter.java  |  0
 .../ByteArrayObjectJsonDeserializer.java      |  0
 .../ByteArrayObjectJsonSerializer.java        |  0
 .../web/serializes/ByteArrayObjectUtil.java   |  0
 18 files changed, 45 insertions(+), 58 deletions(-)
 rename {core/ledger/ledger-rpc => framework/sdk/sdk-rpc}/pom.xml (72%)
 rename {core/ledger/ledger-rpc => framework/sdk/sdk-rpc}/src/main/java/com/jd/blockchain/web/converters/BinaryMessageConverter.java (100%)
 rename {core/ledger/ledger-rpc => framework/sdk/sdk-rpc}/src/main/java/com/jd/blockchain/web/converters/BytesInputConverter.java (100%)
 rename {core/ledger/ledger-rpc => framework/sdk/sdk-rpc}/src/main/java/com/jd/blockchain/web/converters/HashDigestInputConverter.java (100%)
 rename {core/ledger/ledger-rpc => framework/sdk/sdk-rpc}/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonDeserializer.java (100%)
 rename {core/ledger/ledger-rpc => framework/sdk/sdk-rpc}/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonSerializer.java (100%)
 rename {core/ledger/ledger-rpc => framework/sdk/sdk-rpc}/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectUtil.java (100%)

diff --git a/core/gateway/pom.xml b/core/gateway/pom.xml
index 2556937d..1b595ffa 100644
--- a/core/gateway/pom.xml
+++ b/core/gateway/pom.xml
@@ -28,8 +28,8 @@
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
-			<artifactId>ledger-rpc</artifactId>
-			<version>${project.version}</version>
+			<artifactId>sdk-rpc</artifactId>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>data-explorer</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.1.2.RELEASE</version>
 		</dependency>
 
 		<dependency>
diff --git a/core/ledger/pom.xml b/core/ledger/pom.xml
index fe53caf4..bd9e75aa 100644
--- a/core/ledger/pom.xml
+++ b/core/ledger/pom.xml
@@ -12,6 +12,5 @@
 
 	<modules>
 		<module>ledger-database</module>
-		<module>ledger-rpc</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/core/manager/manager-web/pom.xml b/core/manager/manager-web/pom.xml
index 2df0b6d5..88d34b32 100644
--- a/core/manager/manager-web/pom.xml
+++ b/core/manager/manager-web/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.jd.blockchain</groupId>
             <artifactId>manager-explorer</artifactId>
-            <version>1.1.1.RELEASE</version>
+            <version>1.1.2.RELEASE</version>
         </dependency>
 
         <dependency>
diff --git a/core/peer/pom.xml b/core/peer/pom.xml
index 19f850e1..d357e868 100644
--- a/core/peer/pom.xml
+++ b/core/peer/pom.xml
@@ -27,8 +27,8 @@
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
-			<artifactId>ledger-rpc</artifactId>
-			<version>${project.version}</version>
+			<artifactId>sdk-rpc</artifactId>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index b23168f5..d1fc9f8c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,6 +6,7 @@
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-parent</artifactId>
 		<version>1.1.1.RELEASE</version>
+		<relativePath>../project/parent</relativePath>
 	</parent>
 
 	<groupId>com.jd.blockchain</groupId>
@@ -18,6 +19,7 @@
 	</properties>
 
 	<modules>
+		<module>../framework</module>
 		<module>consensus</module>
 		<module>contract</module>
 		<module>crypto</module>
diff --git a/deploy/deploy-gateway/pom.xml b/deploy/deploy-gateway/pom.xml
index ea4f9310..3b23c591 100644
--- a/deploy/deploy-gateway/pom.xml
+++ b/deploy/deploy-gateway/pom.xml
@@ -4,30 +4,31 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>deployment</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>deploy-root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>deployment-gateway</artifactId>
+	<artifactId>deploy-gateway</artifactId>
+	
 
 	<dependencies>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>gateway</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>consensus-bftsmart</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>consensus-mq</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>crypto-classic</artifactId>
 			<version>${project.version}</version>
@@ -36,7 +37,7 @@
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>crypto-sm</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency> -->
 	</dependencies>
 
 	<build>
diff --git a/deploy/deploy-peer/pom.xml b/deploy/deploy-peer/pom.xml
index 266e5855..6a3f665f 100644
--- a/deploy/deploy-peer/pom.xml
+++ b/deploy/deploy-peer/pom.xml
@@ -4,33 +4,33 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>deployment</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>deploy-root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>deployment-peer</artifactId>
+	<artifactId>deploy-peer</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>peer</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>runtime-modular</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>runtime-modular-booter</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>manager-booter</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-composite</artifactId>
 			<version>${project.version}</version>
@@ -39,16 +39,16 @@
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-service</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-redis</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-rocksdb</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 
 		<!-- <dependency> <groupId>com.jd.blockchain</groupId> <artifactId>gateway</artifactId> 
diff --git a/deploy/pom.xml b/deploy/pom.xml
index fef74936..fcc26040 100644
--- a/deploy/pom.xml
+++ b/deploy/pom.xml
@@ -4,27 +4,22 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>jdchain-root</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>jdchain-parent</artifactId>
+		<version>1.1.1.RELEASE</version>
+		<relativePath>../project/parent</relativePath>
 	</parent>
-	<artifactId>deployment</artifactId>
+	<artifactId>deploy-root</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
+	<properties>
+		<core.version>1.2.0-SNAPSHOT</core.version>
+	</properties>
+
 	<modules>
-		<module>deployment-gateway</module>
-		<module>deployment-peer</module>
+		<module>../core</module>
+		<module>deploy-gateway</module>
+		<module>deploy-peer</module>
 	</modules>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/framework/pom.xml b/framework/pom.xml
index 6b527dbf..575c9a84 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -6,6 +6,7 @@
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-parent</artifactId>
 		<version>1.1.1.RELEASE</version>
+		<relativePath>../project/parent</relativePath>
 	</parent>
 
 	<artifactId>jdchain-framework</artifactId>
diff --git a/framework/sdk/pom.xml b/framework/sdk/pom.xml
index 1694f141..321d2370 100644
--- a/framework/sdk/pom.xml
+++ b/framework/sdk/pom.xml
@@ -10,6 +10,7 @@
 	<packaging>pom</packaging>
 
 	<modules>
+		<module>sdk-rpc</module>
 		<module>sdk-base</module>
 		<module>sdk-client</module>
     </modules>
diff --git a/framework/sdk/sdk-client/pom.xml b/framework/sdk/sdk-client/pom.xml
index 6cca87b7..d59637a1 100644
--- a/framework/sdk/sdk-client/pom.xml
+++ b/framework/sdk/sdk-client/pom.xml
@@ -17,7 +17,7 @@
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
-			<artifactId>ledger-rpc</artifactId>
+			<artifactId>sdk-rpc</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/core/ledger/ledger-rpc/pom.xml b/framework/sdk/sdk-rpc/pom.xml
similarity index 72%
rename from core/ledger/ledger-rpc/pom.xml
rename to framework/sdk/sdk-rpc/pom.xml
index dff81f7b..719650fc 100644
--- a/core/ledger/ledger-rpc/pom.xml
+++ b/framework/sdk/sdk-rpc/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>ledger-core</artifactId>
+		<artifactId>sdk</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>ledger-rpc</artifactId>
+	<artifactId>sdk-rpc</artifactId>
 
 	<dependencies>
 		<dependency>
@@ -36,16 +36,4 @@
 		</dependency>
 	</dependencies>
 
-	<!--<build>-->
-		<!--<plugins>-->
-			<!--<plugin>-->
-				<!--<groupId>org.apache.maven.plugins</groupId>-->
-				<!--<artifactId>maven-deploy-plugin</artifactId>-->
-				<!--<version>2.8.2</version>-->
-				<!--<configuration>-->
-					<!--<skip>true</skip>-->
-				<!--</configuration>-->
-			<!--</plugin>-->
-		<!--</plugins>-->
-	<!--</build>-->
 </project>
\ No newline at end of file
diff --git a/core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/BinaryMessageConverter.java b/framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/converters/BinaryMessageConverter.java
similarity index 100%
rename from core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/BinaryMessageConverter.java
rename to framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/converters/BinaryMessageConverter.java
diff --git a/core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/BytesInputConverter.java b/framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/converters/BytesInputConverter.java
similarity index 100%
rename from core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/BytesInputConverter.java
rename to framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/converters/BytesInputConverter.java
diff --git a/core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/HashDigestInputConverter.java b/framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/converters/HashDigestInputConverter.java
similarity index 100%
rename from core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/HashDigestInputConverter.java
rename to framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/converters/HashDigestInputConverter.java
diff --git a/core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonDeserializer.java b/framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonDeserializer.java
similarity index 100%
rename from core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonDeserializer.java
rename to framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonDeserializer.java
diff --git a/core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonSerializer.java b/framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonSerializer.java
similarity index 100%
rename from core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonSerializer.java
rename to framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectJsonSerializer.java
diff --git a/core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectUtil.java b/framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectUtil.java
similarity index 100%
rename from core/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectUtil.java
rename to framework/sdk/sdk-rpc/src/main/java/com/jd/blockchain/web/serializes/ByteArrayObjectUtil.java