issue #71 替换掉JAXB，避免因OpenJDK造成无法deserialize xml的错误

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/ApiTestModule.java

@@ -1,23 +1,17 @@
 package me.chanjar.weixin.cp.api;
 
-import java.io.InputStream;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import com.google.inject.Binder;
 import com.google.inject.Module;
-import org.xml.sax.InputSource;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.util.xml.XStreamInitializer;
+
+import java.io.InputStream;
 
 public class ApiTestModule implements Module {
 
   @Override
   public void configure(Binder binder) {
-    try {
       InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml");
       WxXmlCpInMemoryConfigStorage config = fromXml(WxXmlCpInMemoryConfigStorage.class, is1);
       WxCpServiceImpl wxService = new WxCpServiceImpl();
@@ -25,21 +19,16 @@ public class ApiTestModule implements Module {
 
       binder.bind(WxCpServiceImpl.class).toInstance(wxService);
       binder.bind(WxCpConfigStorage.class).toInstance(config);
-    } catch (JAXBException e) {
-      throw new RuntimeException(e);
-    }
   }
 
-  public static <T> T fromXml(Class<T> clazz, InputStream is) throws JAXBException {
-    Unmarshaller um = JAXBContext.newInstance(clazz).createUnmarshaller();
-    InputSource inputSource = new InputSource(is);
-    inputSource.setEncoding("utf-8");
-    T object = (T) um.unmarshal(inputSource);
-    return object;
+  public static <T> T fromXml(Class<T> clazz, InputStream is) {
+    XStream xstream = XStreamInitializer.getInstance();
+    xstream.alias("xml", clazz);
+    xstream.processAnnotations(clazz);
+    return (T) xstream.fromXML(is);
   }
 
-  @XmlRootElement(name = "xml")
-  @XmlAccessorType(XmlAccessType.FIELD)
+  @XStreamAlias("xml")
   public static class WxXmlCpInMemoryConfigStorage extends WxCpInMemoryConfigStorage {
     
     protected String userId;

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBaseAPITest.java

@@ -1,14 +1,12 @@
 package me.chanjar.weixin.cp.api;
 
+import com.google.inject.Inject;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.StringUtils;
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import me.chanjar.weixin.common.exception.WxErrorException;
-
-import com.google.inject.Inject;
-
 /**
  * 基础API测试
  * @author Daniel Qian

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java

@@ -1,15 +1,13 @@
 package me.chanjar.weixin.cp.api;
 
-import java.util.List;
-
+import com.google.inject.Inject;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.cp.bean.WxCpDepart;
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import me.chanjar.weixin.common.exception.WxErrorException;
-
-import com.google.inject.Inject;
+import java.util.List;
 
 /**
  * 测试部门接口

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMediaAPITest.java

@@ -1,20 +1,18 @@
 package me.chanjar.weixin.cp.api;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.google.inject.Inject;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import me.chanjar.weixin.common.exception.WxErrorException;
-
-import com.google.inject.Inject;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 测试多媒体文件上传下载

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java

@@ -1,14 +1,12 @@
 package me.chanjar.weixin.cp.api;
 
+import com.google.inject.Inject;
 import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import me.chanjar.weixin.common.exception.WxErrorException;
-
-import com.google.inject.Inject;
-
 /***
  * 测试发送消息
  * @author Daniel Qian

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageRouterTest.java

@@ -1,7 +1,5 @@
 package me.chanjar.weixin.cp.api;
 
-import java.util.Map;
-
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
 import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
@@ -9,6 +7,8 @@ import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import java.util.Map;
+
 /**
  * 测试消息路由器
  * @author Daniel Qian

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java

@@ -1,9 +1,9 @@
 package me.chanjar.weixin.cp.api;
 
 import com.google.inject.Inject;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.cp.bean.WxCpDepart;
 import me.chanjar.weixin.cp.bean.WxCpUser;
-import me.chanjar.weixin.common.exception.WxErrorException;
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxMenuAPITest.java

@@ -1,19 +1,15 @@
 package me.chanjar.weixin.cp.api;
 
-import javax.xml.bind.JAXBException;
-
+import com.google.inject.Inject;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.bean.WxMenu;
+import me.chanjar.weixin.common.bean.WxMenu.WxMenuButton;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import com.google.inject.Inject;
-
-import me.chanjar.weixin.common.bean.WxMenu.WxMenuButton;
-import me.chanjar.weixin.common.exception.WxErrorException;
-
 /**
  * 测试菜单
  * @author Daniel Qian
@@ -42,7 +38,7 @@ public class WxMenuAPITest {
   }
   
   @DataProvider(name="menu")
-  public Object[][] getMenu() throws JAXBException {
+  public Object[][] getMenu() {
     WxMenu menu = new WxMenu();
     WxMenuButton button1 = new WxMenuButton();
     button1.setType(WxConsts.BUTTON_CLICK);