From 6d3f942de076a5d75b3fceeb36cc49e93ccd45bb Mon Sep 17 00:00:00 2001
From: shamphone <shamphone@gmail.com>
Date: Thu, 14 Sep 2017 22:53:17 +0800
Subject: [PATCH] fix jigsaw-rpc-example-client error

---
 jigsaw-rpc-example-client/pom.xml             | 23 +++++++++----------
 .../gen/org/jigsaw/payment/Hello.java         |  0
 .../jigsaw/payment/rpc/hello/HelloClient.java |  0
 .../payment/rpc/hello/HelloClientConfig.java  |  0
 .../resources/hello.client.properties         |  0
 .../src/{main => test}/resources/hello.proto  |  0
 .../{main => test}/resources/log4j.properties |  0
 .../{main => test}/resources/logback-test.xml |  0
 jigsaw-rpc-payment/pom.xml                    |  2 +-
 jigsaw-rpc-user/pom.xml                       |  2 +-
 .../org/jigsaw/payment/rpc/BaseService.java   |  2 +-
 .../jigsaw/payment/rpc/NotFoundException.java |  2 +-
 .../jigsaw/payment/rpc/SystemException.java   |  2 +-
 .../org/jigsaw/payment/rpc/UserException.java |  2 +-
 pom.xml                                       |  2 +-
 15 files changed, 18 insertions(+), 19 deletions(-)
 rename jigsaw-rpc-example-client/src/{main => test}/gen/org/jigsaw/payment/Hello.java (100%)
 rename jigsaw-rpc-example-client/src/{main => test}/java/org/jigsaw/payment/rpc/hello/HelloClient.java (100%)
 rename jigsaw-rpc-example-client/src/{main => test}/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java (100%)
 rename jigsaw-rpc-example-client/src/{main => test}/resources/hello.client.properties (100%)
 rename jigsaw-rpc-example-client/src/{main => test}/resources/hello.proto (100%)
 rename jigsaw-rpc-example-client/src/{main => test}/resources/log4j.properties (100%)
 rename jigsaw-rpc-example-client/src/{main => test}/resources/logback-test.xml (100%)

diff --git a/jigsaw-rpc-example-client/pom.xml b/jigsaw-rpc-example-client/pom.xml
index eb14d4c..a6c018f 100644
--- a/jigsaw-rpc-example-client/pom.xml
+++ b/jigsaw-rpc-example-client/pom.xml
@@ -20,7 +20,7 @@
 		<jackson.version>2.7.9</jackson.version>
 		<proto.path>protoc</proto.path>
 		<thrift.path>thrift</thrift.path>
-		<idl.folder>${basedir}/src/main/resources</idl.folder>
+		<idl.folder>${basedir}/src/test/resources</idl.folder>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -53,24 +53,24 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<tasks>
-								<echo>Delete folder : ${basedir}/src/main/gen</echo>
-								<delete dir="${basedir}/src/main/gen" quiet="true" />
-								<echo>Create folder : ${basedir}/src/main/gen</echo>
-								<mkdir dir="${basedir}/src/main/gen" />
+								<echo>Delete folder : ${basedir}/src/test/gen</echo>
+								<delete dir="${basedir}/src/test/gen" quiet="true" />
+								<echo>Create folder : ${basedir}/src/test/gen</echo>
+								<mkdir dir="${basedir}/src/test/gen" />
 								<!-- Compile thrift files in all locations -->
 								<echo>Compiling **/*.thrift files...</echo>
 								<apply executable="${thrift.path}">
 									<arg value="--gen" />
 									<arg value="java" />
 									<arg value="-out" />
-									<arg value="${basedir}/src/main/gen" />
+									<arg value="${basedir}/src/test/gen" />
 									<fileset dir="${idl.folder}" includes="**/*.thrift" />
 								</apply>
 								<!-- Compile proto files in all locations -->
 								<echo>Compiling **/*.proto files...</echo>
 								<apply executable="${proto.path}">
 									<arg value="--proto_path=${idl.folder}" />
-									<arg value="--java_out=${basedir}/src/main/gen" />
+									<arg value="--java_out=${basedir}/src/test/gen" />
 									<fileset dir="${idl.folder}" includes="**/*.proto"
 										excludes="google/protobuf/descriptor.proto" />
 								</apply>
@@ -83,17 +83,16 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.7</version>
 				<executions>
 					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
+						<id>add-test-source</id>
+						<phase>generate-test-sources</phase>
 						<goals>
-							<goal>add-source</goal>
+							<goal>add-test-source</goal>
 						</goals>
 						<configuration>
 							<sources>
-								<source>src/main/gen</source>
+								<source>src/test/gen</source>
 							</sources>
 						</configuration>
 					</execution>
diff --git a/jigsaw-rpc-example-client/src/main/gen/org/jigsaw/payment/Hello.java b/jigsaw-rpc-example-client/src/test/gen/org/jigsaw/payment/Hello.java
similarity index 100%
rename from jigsaw-rpc-example-client/src/main/gen/org/jigsaw/payment/Hello.java
rename to jigsaw-rpc-example-client/src/test/gen/org/jigsaw/payment/Hello.java
diff --git a/jigsaw-rpc-example-client/src/main/java/org/jigsaw/payment/rpc/hello/HelloClient.java b/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClient.java
similarity index 100%
rename from jigsaw-rpc-example-client/src/main/java/org/jigsaw/payment/rpc/hello/HelloClient.java
rename to jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClient.java
diff --git a/jigsaw-rpc-example-client/src/main/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java b/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java
similarity index 100%
rename from jigsaw-rpc-example-client/src/main/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java
rename to jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java
diff --git a/jigsaw-rpc-example-client/src/main/resources/hello.client.properties b/jigsaw-rpc-example-client/src/test/resources/hello.client.properties
similarity index 100%
rename from jigsaw-rpc-example-client/src/main/resources/hello.client.properties
rename to jigsaw-rpc-example-client/src/test/resources/hello.client.properties
diff --git a/jigsaw-rpc-example-client/src/main/resources/hello.proto b/jigsaw-rpc-example-client/src/test/resources/hello.proto
similarity index 100%
rename from jigsaw-rpc-example-client/src/main/resources/hello.proto
rename to jigsaw-rpc-example-client/src/test/resources/hello.proto
diff --git a/jigsaw-rpc-example-client/src/main/resources/log4j.properties b/jigsaw-rpc-example-client/src/test/resources/log4j.properties
similarity index 100%
rename from jigsaw-rpc-example-client/src/main/resources/log4j.properties
rename to jigsaw-rpc-example-client/src/test/resources/log4j.properties
diff --git a/jigsaw-rpc-example-client/src/main/resources/logback-test.xml b/jigsaw-rpc-example-client/src/test/resources/logback-test.xml
similarity index 100%
rename from jigsaw-rpc-example-client/src/main/resources/logback-test.xml
rename to jigsaw-rpc-example-client/src/test/resources/logback-test.xml
diff --git a/jigsaw-rpc-payment/pom.xml b/jigsaw-rpc-payment/pom.xml
index 78c6e96..b6a384c 100644
--- a/jigsaw-rpc-payment/pom.xml
+++ b/jigsaw-rpc-payment/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>jigsaw-rpc-payment</artifactId>
 	<packaging>jar</packaging>
 	<version>1.0.0-SNAPSHOT</version>
-	<name>支付账户和订单管理</name>
+	<name>jigsaw-rpc-payment</name>
 	<properties>
 		<protobuf.version>3.3.1</protobuf.version>
 		<protobuf-java-format.version>1.2</protobuf-java-format.version>
diff --git a/jigsaw-rpc-user/pom.xml b/jigsaw-rpc-user/pom.xml
index 2d4552f..9b27c47 100644
--- a/jigsaw-rpc-user/pom.xml
+++ b/jigsaw-rpc-user/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>jigsaw-rpc-user</artifactId>
 	<packaging>jar</packaging>
 	<version>1.0.0-SNAPSHOT</version>
-	<name>用户管理</name>
+	<name>jigsaw-rpc-user</name>
 	<properties>
 		<protobuf.version>3.3.1</protobuf.version>
 		<protobuf-java-format.version>1.2</protobuf-java-format.version>
diff --git a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java
index fabaa71..4a2bd58 100644
--- a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java
+++ b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java
@@ -7,7 +7,7 @@
 package org.jigsaw.payment.rpc;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-08-30")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-09-14")
 public class BaseService {
 
   /**
diff --git a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java
index 6852d9f..6bdbf07 100644
--- a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java
+++ b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java
@@ -20,7 +20,7 @@ package org.jigsaw.payment.rpc;
  * key:  The value passed from the client in the identifier, which was not
  *   found. For example, the GUID that was not found.
  */
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-08-30")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-09-14")
 public class NotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NotFoundException, NotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NotFoundException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotFoundException");
 
diff --git a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java
index 5adcf71..aa1dce4 100644
--- a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java
+++ b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java
@@ -21,7 +21,7 @@ package org.jigsaw.payment.rpc;
  *   API requests for the user until at least this many seconds have passed. Present only
  *   when errorCode is RATE_LIMIT_REACHED,
  */
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-08-30")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-09-14")
 public class SystemException extends org.apache.thrift.TException implements org.apache.thrift.TBase<SystemException, SystemException._Fields>, java.io.Serializable, Cloneable, Comparable<SystemException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SystemException");
 
diff --git a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java
index 99c58b4..1856fb7 100644
--- a/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java
+++ b/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java
@@ -23,7 +23,7 @@ package org.jigsaw.payment.rpc;
  * 
  * message:  This may contain additional information about the error.
  */
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-08-30")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-09-14")
 public class UserException extends org.apache.thrift.TException implements org.apache.thrift.TBase<UserException, UserException._Fields>, java.io.Serializable, Cloneable, Comparable<UserException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserException");
 
diff --git a/pom.xml b/pom.xml
index 0574c8a..c037dc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>1.11</version>
+					<version>3.0.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>