From a1a5cd59b3c74bf4e116264e9d8cd88790b5c3cb Mon Sep 17 00:00:00 2001
From: "jy.hu" <foxinmy@gmail.com>
Date: Sun, 22 Jun 2014 18:37:04 +0800
Subject: [PATCH] config moved
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为避免冲突讲config.propertiese移入src/main/java/com/foxinmy/weixin4j目录并更新其它相关
---
 pom.xml                                            |  7 +++++++
 .../com/foxinmy/weixin4j}/config.properties        |  0
 .../com/foxinmy/weixin4j/error.xml}                |  0
 .../java/com/foxinmy/weixin4j/http/Response.java   | 14 ++++++++++----
 .../com/foxinmy/weixin4j/util/WeixinConfig.java    |  8 ++++++--
 5 files changed, 23 insertions(+), 6 deletions(-)
 rename src/main/{resources => java/com/foxinmy/weixin4j}/config.properties (100%)
 rename src/main/{resources/error_code.xml => java/com/foxinmy/weixin4j/error.xml} (100%)

diff --git a/pom.xml b/pom.xml
index 9a2412cc..b17171c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,13 @@
 					<exclude>logback.xml</exclude>
 				</excludes>
 			</resource>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/config.properties</include>
+					<include>**/error.xml</include>
+				</includes>
+			</resource>
 		</resources>
 		<finalName>weixin4j-sdk</finalName>
 	</build>
diff --git a/src/main/resources/config.properties b/src/main/java/com/foxinmy/weixin4j/config.properties
similarity index 100%
rename from src/main/resources/config.properties
rename to src/main/java/com/foxinmy/weixin4j/config.properties
diff --git a/src/main/resources/error_code.xml b/src/main/java/com/foxinmy/weixin4j/error.xml
similarity index 100%
rename from src/main/resources/error_code.xml
rename to src/main/java/com/foxinmy/weixin4j/error.xml
diff --git a/src/main/java/com/foxinmy/weixin4j/http/Response.java b/src/main/java/com/foxinmy/weixin4j/http/Response.java
index 4c684128..caeec808 100644
--- a/src/main/java/com/foxinmy/weixin4j/http/Response.java
+++ b/src/main/java/com/foxinmy/weixin4j/http/Response.java
@@ -10,6 +10,7 @@ import org.dom4j.io.SAXReader;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.foxinmy.weixin4j.WeixinProxy;
 import com.foxinmy.weixin4j.msg.ErrorMessage;
 import com.thoughtworks.xstream.XStream;
 
@@ -59,12 +60,17 @@ public class Response {
 		JSONObject jsonObj = getAsJson();
 		if (jsonObj.containsKey(ERROR_CODE_KEY)) {
 			SAXReader reader = new SAXReader();
-			Document doc = reader.read(Thread.currentThread().getContextClassLoader().getResourceAsStream("error_code.xml"));
-			Node node = doc.getRootElement().selectSingleNode(String.format("error[@code='%d']", jsonObj.getInteger(ERROR_CODE_KEY)));
+			Document doc = reader.read(WeixinProxy.class
+					.getResourceAsStream("error.xml"));
+			Node node = doc.getRootElement().selectSingleNode(
+					String.format("error[@code='%d']",
+							jsonObj.getInteger(ERROR_CODE_KEY)));
 			if (node != null) {
-				return new ErrorMessage(jsonObj.getInteger(ERROR_CODE_KEY), jsonObj.getString(ERROR_MSG_KEY), node.getStringValue());
+				return new ErrorMessage(jsonObj.getInteger(ERROR_CODE_KEY),
+						jsonObj.getString(ERROR_MSG_KEY), node.getStringValue());
 			}
-			return new ErrorMessage(jsonObj.getInteger(ERROR_CODE_KEY), "unknown error", "未知错误");
+			return new ErrorMessage(jsonObj.getInteger(ERROR_CODE_KEY),
+					"unknown error", "未知错误");
 		}
 
 		return new ErrorMessage(0, "request success", "");
diff --git a/src/main/java/com/foxinmy/weixin4j/util/WeixinConfig.java b/src/main/java/com/foxinmy/weixin4j/util/WeixinConfig.java
index 1573be0c..f428c33b 100644
--- a/src/main/java/com/foxinmy/weixin4j/util/WeixinConfig.java
+++ b/src/main/java/com/foxinmy/weixin4j/util/WeixinConfig.java
@@ -6,6 +6,8 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.foxinmy.weixin4j.WeixinProxy;
+
 public class WeixinConfig {
 	public WeixinConfig() {
 	}
@@ -13,7 +15,8 @@ public class WeixinConfig {
 	private static Properties props = new Properties();
 	static {
 		try {
-			props.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("config.properties"));
+			props.load(WeixinProxy.class
+					.getResourceAsStream("config.properties"));
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
@@ -29,7 +32,8 @@ public class WeixinConfig {
 		String sub = null;
 		while (m.find()) {
 			sub = m.group();
-			m.appendReplacement(sb, getValue(sub.substring(1, sub.length() - 1)));
+			m.appendReplacement(sb,
+					getValue(sub.substring(1, sub.length() - 1)));
 		}
 		m.appendTail(sb);
 		return sb.toString();