From 545aec3335ad893b31a21143f6303693c11cf5cb Mon Sep 17 00:00:00 2001
From: huanghaiquan <huanghaiquan@jd.com>
Date: Tue, 30 Apr 2019 20:51:15 +0800
Subject: [PATCH] =?UTF-8?q?Merged=20contract-model=20project=20into=20ledg?=
 =?UTF-8?q?er-model=20project=EF=BC=8Cand=20removed=20it.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/contract/contract-model/pom.xml        | 32 -------------------
 .../main/resources/sys-contract.properties    |  7 ----
 source/contract/pom.xml                       |  1 -
 3 files changed, 40 deletions(-)
 delete mode 100644 source/contract/contract-model/pom.xml
 delete mode 100644 source/contract/contract-model/src/main/resources/sys-contract.properties

diff --git a/source/contract/contract-model/pom.xml b/source/contract/contract-model/pom.xml
deleted file mode 100644
index de1c279c..00000000
--- a/source/contract/contract-model/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<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>contract</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>contract-model</artifactId>
-
-	<dependencies>
-		<!-- <dependency>
-			<groupId>com.jd.blockchain</groupId>
-			<artifactId>sdk-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.jd.blockchain</groupId>
-			<artifactId>tools-keygen</artifactId>
-			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>crypto-framework</artifactId>
-					<groupId>com.jd.blockchain</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency> -->
-
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/source/contract/contract-model/src/main/resources/sys-contract.properties b/source/contract/contract-model/src/main/resources/sys-contract.properties
deleted file mode 100644
index e8aee795..00000000
--- a/source/contract/contract-model/src/main/resources/sys-contract.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#项目源文件存放的位置;
-PROJECT_BASE_DIR=e:\\gitCode\\block\\prototype\\
-#合同使用的类库存放的位置，可能不在项目中，故采用全新的地址;
-LEDGER_BASE_CLASS_PATH=e:\\gitCode\\block\\prototype\\libs\\
-BLACKLIST=java.io;java.net;java.util.Random
-#type:public,private
-CONTRACT_CLASSLOADER_TYPE=private
\ No newline at end of file
diff --git a/source/contract/pom.xml b/source/contract/pom.xml
index 39cbad89..835b06aa 100644
--- a/source/contract/pom.xml
+++ b/source/contract/pom.xml
@@ -10,7 +10,6 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>contract-model</module>
 		<module>contract-framework</module>
 		<module>contract-jvm</module>
 		<module>contract-maven-plugin</module>