From c223ef7295614ea649043e3de6abc9d9b0880583 Mon Sep 17 00:00:00 2001
From: huanghaiquan <huanghaiquan@jd.com>
Date: Wed, 18 Dec 2019 17:37:22 +0800
Subject: [PATCH] Fixed compilation errors of samples;

---
 pom.xml                                       |  2 +-
 samples/contract-samples/pom.xml              | 10 +++----
 samples/pom.xml                               | 28 +++++++++++++++++
 samples/sdk-samples/pom.xml                   |  9 ++----
 .../SDK_GateWay_Participant_Regist_Test_.java | 29 +++++++++++++-----
 ...ateWay_Participant_State_Update_Test_.java | 30 ++++++++++++++-----
 6 files changed, 81 insertions(+), 27 deletions(-)
 create mode 100644 samples/pom.xml

diff --git a/pom.xml b/pom.xml
index fd2fede6..0db59375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,10 @@
 	<description>jdchain root project</description>
 
 	<modules>
+		<module>project</module>
 		<module>framework</module>
 		<module>core</module>
 		<module>deploy</module>
-		<module>project</module>
 		<module>test</module>
 		<module>sample</module>
 	</modules>
diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml
index 15ac70d8..f542780b 100644
--- a/samples/contract-samples/pom.xml
+++ b/samples/contract-samples/pom.xml
@@ -2,12 +2,12 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
-    <parent>
-        <artifactId>contract</artifactId>
-        <groupId>com.jd.blockchain</groupId>
-        <version>1.1.2.RELEASE</version>
-    </parent>
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+		<groupId>com.jd.blockchain</groupId>
+		<artifactId>jdchain-samples</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent> 
 
     <artifactId>contract-samples</artifactId>
 
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644
index 00000000..26a33f96
--- /dev/null
+++ b/samples/pom.xml
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<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>
+	<artifactId>jdchain-samples</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<properties>
+		<framework.version>1.2.0-SNAPSHOT</framework.version>
+	</properties>
+
+	<modules>
+		<module>../framework</module>
+		<module>sdk-samples</module>
+		<module>contract-samples</module>
+	</modules>
+
+
+</project>
diff --git a/samples/sdk-samples/pom.xml b/samples/sdk-samples/pom.xml
index ece0c958..178d8d23 100644
--- a/samples/sdk-samples/pom.xml
+++ b/samples/sdk-samples/pom.xml
@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>sdk</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>jdchain-samples</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sdk-samples</artifactId>
 
@@ -20,11 +20,6 @@
 			<artifactId>ledger-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.jd.blockchain</groupId>
-			<artifactId>tools-initializer</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>contract-samples</artifactId>
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java
index 77157f0d..77c1e62e 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java
@@ -1,17 +1,32 @@
 package test.com.jd.blockchain.sdk.test;
 
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import com.jd.blockchain.binaryproto.DataContractRegistry;
-import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.ledger.*;
+import com.jd.blockchain.crypto.AddressEncoding;
+import com.jd.blockchain.crypto.AsymmetricKeypair;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.KeyGenUtils;
+import com.jd.blockchain.crypto.PrivKey;
+import com.jd.blockchain.crypto.PubKey;
+import com.jd.blockchain.ledger.BlockchainKeypair;
+import com.jd.blockchain.ledger.EndpointRequest;
+import com.jd.blockchain.ledger.NodeRequest;
+import com.jd.blockchain.ledger.ParticipantRegisterOperation;
+import com.jd.blockchain.ledger.ParticipantStateUpdateOperation;
+import com.jd.blockchain.ledger.PreparedTransaction;
+import com.jd.blockchain.ledger.TransactionContent;
+import com.jd.blockchain.ledger.TransactionContentBody;
+import com.jd.blockchain.ledger.TransactionRequest;
+import com.jd.blockchain.ledger.TransactionResponse;
+import com.jd.blockchain.ledger.TransactionTemplate;
 import com.jd.blockchain.sdk.BlockchainService;
 import com.jd.blockchain.sdk.client.GatewayServiceFactory;
 import com.jd.blockchain.sdk.samples.SDKDemo_Constant;
-import com.jd.blockchain.tools.keygen.KeyGenCommand;
 import com.jd.blockchain.utils.net.NetworkAddress;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
 
 /**
  * 注册参与方测试
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_State_Update_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_State_Update_Test_.java
index 4fb229ce..d1ffb9e6 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_State_Update_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_State_Update_Test_.java
@@ -1,17 +1,33 @@
 package test.com.jd.blockchain.sdk.test;
 
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import com.jd.blockchain.binaryproto.DataContractRegistry;
-import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.ledger.*;
+import com.jd.blockchain.crypto.AddressEncoding;
+import com.jd.blockchain.crypto.AsymmetricKeypair;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.KeyGenUtils;
+import com.jd.blockchain.crypto.PrivKey;
+import com.jd.blockchain.crypto.PubKey;
+import com.jd.blockchain.ledger.BlockchainKeypair;
+import com.jd.blockchain.ledger.EndpointRequest;
+import com.jd.blockchain.ledger.NodeRequest;
+import com.jd.blockchain.ledger.ParticipantNodeState;
+import com.jd.blockchain.ledger.ParticipantRegisterOperation;
+import com.jd.blockchain.ledger.ParticipantStateUpdateOperation;
+import com.jd.blockchain.ledger.PreparedTransaction;
+import com.jd.blockchain.ledger.TransactionContent;
+import com.jd.blockchain.ledger.TransactionContentBody;
+import com.jd.blockchain.ledger.TransactionRequest;
+import com.jd.blockchain.ledger.TransactionResponse;
+import com.jd.blockchain.ledger.TransactionTemplate;
 import com.jd.blockchain.sdk.BlockchainService;
 import com.jd.blockchain.sdk.client.GatewayServiceFactory;
 import com.jd.blockchain.sdk.samples.SDKDemo_Constant;
-import com.jd.blockchain.tools.keygen.KeyGenCommand;
 import com.jd.blockchain.utils.net.NetworkAddress;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
 
 /**
  * 参与方状态更新测试