From 59bf6ff380f9c4e4e81e3bd21fdc61c31d77e61e Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Sat, 7 May 2016 16:17:28 +0800
Subject: [PATCH] up

---
 weixin4j-example/pom.xml                                  | 8 ++++++++
 .../example/server/Weixin4jServerStartupWithThread.java   | 2 +-
 .../server/Weixin4jServerStartupWithoutThread.java        | 4 ++--
 .../example/server/handler/HelloMessageHandler.java       | 2 +-
 .../example/server/handler/SubscribeMessageHandler.java   | 2 +-
 .../example/server/handler/TextMessageHandler.java        | 2 +-
 .../example/server/handler/VoiceMessageHandler.java       | 2 +-
 weixin4j-example/src/main/resources/spring-bean.xml       | 6 +++---
 weixin4j-example/src/main/script/startup.sh               | 4 ++--
 9 files changed, 20 insertions(+), 12 deletions(-)
 rename weixin4j-example/src/main/java/com/{foximy => foxinmy}/weixin4j/example/server/Weixin4jServerStartupWithThread.java (98%)
 rename weixin4j-example/src/main/java/com/{foximy => foxinmy}/weixin4j/example/server/Weixin4jServerStartupWithoutThread.java (87%)
 rename weixin4j-example/src/main/java/com/{foximy => foxinmy}/weixin4j/example/server/handler/HelloMessageHandler.java (95%)
 rename weixin4j-example/src/main/java/com/{foximy => foxinmy}/weixin4j/example/server/handler/SubscribeMessageHandler.java (93%)
 rename weixin4j-example/src/main/java/com/{foximy => foxinmy}/weixin4j/example/server/handler/TextMessageHandler.java (93%)
 rename weixin4j-example/src/main/java/com/{foximy => foxinmy}/weixin4j/example/server/handler/VoiceMessageHandler.java (93%)

diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml
index 69ada7fc..844a0bbc 100644
--- a/weixin4j-example/pom.xml
+++ b/weixin4j-example/pom.xml
@@ -33,6 +33,13 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -65,6 +72,7 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>4.2.1.RELEASE</version>
+			<optional>true</optional>
 		</dependency>
 		<!-- test.... -->
 		<dependency>
diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/Weixin4jServerStartupWithThread.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/Weixin4jServerStartupWithThread.java
similarity index 98%
rename from weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/Weixin4jServerStartupWithThread.java
rename to weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/Weixin4jServerStartupWithThread.java
index a51c9817..9f253681 100644
--- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/Weixin4jServerStartupWithThread.java
+++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/Weixin4jServerStartupWithThread.java
@@ -1,4 +1,4 @@
-package com.foximy.weixin4j.example.server;
+package com.foxinmy.weixin4j.example.server;
 
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/Weixin4jServerStartupWithoutThread.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/Weixin4jServerStartupWithoutThread.java
similarity index 87%
rename from weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/Weixin4jServerStartupWithoutThread.java
rename to weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/Weixin4jServerStartupWithoutThread.java
index e0d6d084..7b09eb25 100644
--- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/Weixin4jServerStartupWithoutThread.java
+++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/Weixin4jServerStartupWithoutThread.java
@@ -1,4 +1,4 @@
-package com.foximy.weixin4j.example.server;
+package com.foxinmy.weixin4j.example.server;
 
 import com.foxinmy.weixin4j.exception.WeixinException;
 import com.foxinmy.weixin4j.startup.WeixinServerBootstrap;
@@ -28,7 +28,7 @@ public class Weixin4jServerStartupWithoutThread {
 	/**
 	 * 处理微信消息的全限包名(也可通过addHandler方式一个一个添加)
 	 */
-	private static String handlerPackage = "com.foximy.weixin4j.example.server.handler";
+	private static String handlerPackage = "com.foxinmy.weixin4j.example.server.handler";
 
 	/**
 	 * 入口函数 可使用assembly插件打成可执行zip包:https://github.com/foxinmy/weixin4j/wiki/
diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/HelloMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/HelloMessageHandler.java
similarity index 95%
rename from weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/HelloMessageHandler.java
rename to weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/HelloMessageHandler.java
index 20ecd5ae..fe6a37be 100644
--- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/HelloMessageHandler.java
+++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/HelloMessageHandler.java
@@ -1,4 +1,4 @@
-package com.foximy.weixin4j.example.server.handler;
+package com.foxinmy.weixin4j.example.server.handler;
 
 import org.springframework.stereotype.Component;
 
diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/SubscribeMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/SubscribeMessageHandler.java
similarity index 93%
rename from weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/SubscribeMessageHandler.java
rename to weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/SubscribeMessageHandler.java
index bd3b2411..4bc465ab 100644
--- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/SubscribeMessageHandler.java
+++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/SubscribeMessageHandler.java
@@ -1,4 +1,4 @@
-package com.foximy.weixin4j.example.server.handler;
+package com.foxinmy.weixin4j.example.server.handler;
 
 import org.springframework.stereotype.Component;
 
diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/TextMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/TextMessageHandler.java
similarity index 93%
rename from weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/TextMessageHandler.java
rename to weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/TextMessageHandler.java
index 6b435f00..135f3dbc 100644
--- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/TextMessageHandler.java
+++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/TextMessageHandler.java
@@ -1,4 +1,4 @@
-package com.foximy.weixin4j.example.server.handler;
+package com.foxinmy.weixin4j.example.server.handler;
 
 import org.springframework.stereotype.Component;
 
diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/VoiceMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/VoiceMessageHandler.java
similarity index 93%
rename from weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/VoiceMessageHandler.java
rename to weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/VoiceMessageHandler.java
index 59707431..c612efa5 100644
--- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/VoiceMessageHandler.java
+++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/VoiceMessageHandler.java
@@ -1,4 +1,4 @@
-package com.foximy.weixin4j.example.server.handler;
+package com.foxinmy.weixin4j.example.server.handler;
 
 import org.springframework.stereotype.Component;
 
diff --git a/weixin4j-example/src/main/resources/spring-bean.xml b/weixin4j-example/src/main/resources/spring-bean.xml
index 1a955f94..15ec6293 100644
--- a/weixin4j-example/src/main/resources/spring-bean.xml
+++ b/weixin4j-example/src/main/resources/spring-bean.xml
@@ -75,7 +75,7 @@
 
 	<!-- 微信消息服务～start -->
 	<bean
-		class="com.foximy.weixin4j.example.server.Weixin4jServerStartupWithThread">
+		class="com.foxinmy.weixin4j.example.server.Weixin4jServerStartupWithThread">
 		<!-- 端口号 微信暂时只支持80端口 所以需要自己把微信被动消息请求转发(nginx等)到这个端口上来 -->
 		<constructor-arg index="0" value="30000" />
 		<!-- token信息 -->
@@ -91,11 +91,11 @@
 		</constructor-arg>
 		<!-- 处理微信消息的全限包名 -->
 		<constructor-arg index="2"
-			value="com.foximy.weixin4j.example.server.handler" />
+			value="com.foxinmy.weixin4j.example.server.handler" />
 	</bean>
 	<!-- 微信消息服务～end -->
 
 	<!-- spring扫描策略~start -->
-	<context:component-scan base-package="com.foximy.weixin4j.example.server.handler" />
+	<context:component-scan base-package="com.foxinmy.weixin4j.example.server.handler" />
 	<!-- spring扫描策略~end -->
 </beans>
\ No newline at end of file
diff --git a/weixin4j-example/src/main/script/startup.sh b/weixin4j-example/src/main/script/startup.sh
index 970d3496..ee85c866 100644
--- a/weixin4j-example/src/main/script/startup.sh
+++ b/weixin4j-example/src/main/script/startup.sh
@@ -8,10 +8,10 @@ JAVA_HOME="/usr/local/java"
 RUNNING_USER=root
  
 #App home
-APP_HOME="/usr/local/weixin4j"
+APP_HOME="/usr/local/weixin4j/weixin4j-server"
  
 #Main class
-APP_MAINCLASS=com.foximy.weixin4j.example.server.Weixin4jServerStartupWithoutThread
+APP_MAINCLASS=com.foxinmy.weixin4j.example.server.Weixin4jServerStartupWithoutThread
  
 #classpath
 CLASSPATH=$APP_HOME/classes