cim 增加 netty版本，主目录分为 cim_for_netty和cim_for_mina,俩个版本功能完全一致！只有cim-core里面实现稍有不同

2025-07-23 16:26:42 +08:00 · 2014-07-26 12:07:26 +08:00 · 2014-07-26 12:07:26 +08:00 · b19d264ae3
commit b19d264ae3
parent e7ea7b84c6
1176 changed files with 9076 additions and 185 deletions
--- a/cim_for_mina/1.5.VERSION
+++ b/cim_for_mina/1.5.VERSION
@ -0,0 +1 @@
+1.5
--- a/cim_for_mina/cim-core/.classpath
+++ b/cim_for_mina/cim-core/.classpath
--- a/cim_for_mina/cim-core/.project
+++ b/cim_for_mina/cim-core/.project
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMConnectorManager.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMConnectorManager.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMDataConfig.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMDataConfig.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMEnventListenerReceiver.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMEnventListenerReceiver.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMListenerManager.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMListenerManager.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMMessageReceiveComparator.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMMessageReceiveComparator.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMPushManager.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMPushManager.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMPushService.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMPushService.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMSessionDisableException.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMSessionDisableException.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/NetWorkDisableException.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/NetWorkDisableException.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/OnCIMMessageListener.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/OnCIMMessageListener.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/WriteToClosedSessionException.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/client/android/WriteToClosedSessionException.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/constant/CIMConstant.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/constant/CIMConstant.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageCodecFactory.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageCodecFactory.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageDecoder.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageDecoder.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageEncoder.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageEncoder.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageCodecFactory.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageCodecFactory.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageDecoder.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageDecoder.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageEncoder.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageEncoder.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/handle/CIMRequestHandler.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/handle/CIMRequestHandler.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/handle/HeartbeatHandler.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/handle/HeartbeatHandler.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/handle/MainIOHandler.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/handle/MainIOHandler.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/Message.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/Message.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/ReplyBody.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/ReplyBody.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/SentBody.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/SentBody.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/CIMSession.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/CIMSession.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/DefaultSessionManager.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/DefaultSessionManager.java
--- a/cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/SessionManager.java
+++ b/cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/SessionManager.java
--- a/cim_for_mina/ichat-server/.classpath
+++ b/cim_for_mina/ichat-server/.classpath
--- a/cim_for_mina/ichat-server/.mymetadata
+++ b/cim_for_mina/ichat-server/.mymetadata
--- a/cim_for_mina/ichat-server/.project
+++ b/cim_for_mina/ichat-server/.project
--- a/cim_for_mina/ichat-server/.settings/org.eclipse.core.resources.prefs
+++ b/cim_for_mina/ichat-server/.settings/org.eclipse.core.resources.prefs
--- a/cim_for_mina/ichat-server/WebRoot/META-INF/MANIFEST.MF
+++ b/cim_for_mina/ichat-server/WebRoot/META-INF/MANIFEST.MF
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/log4j.properties
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/log4j.properties
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/spring-cim.xml
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/spring-cim.xml
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/spring-config.xml
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/spring-config.xml
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/spring-push.xml
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/spring-push.xml
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/struts.xml
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/struts.xml
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.aop-3.0.2.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.aop-3.0.2.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.asm-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.asm-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.beans-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.beans-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.context-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.context-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.core-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.core-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.expression-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.expression-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.jdbc-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.jdbc-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.orm-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.orm-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.transaction-3.0.2.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.transaction-3.0.2.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.web-3.0.2.RELEASE.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.web-3.0.2.RELEASE.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/antlr-2.7.6.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/antlr-2.7.6.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/asm.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/asm.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/aspectjweaver.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/aspectjweaver.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/cim-core.1.5.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/cim-core.1.5.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-fileupload-1.2.1.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-fileupload-1.2.1.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-io-2.4.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-io-2.4.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-lang-2.3.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-lang-2.3.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-logging-1.0.4.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-logging-1.0.4.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/freemarker-2.3.15.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/freemarker-2.3.15.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/gson-2.1.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/gson-2.1.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/httpclient-4.3.4.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/httpclient-4.3.4.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/httpcore-4.3.2.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/httpcore-4.3.2.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/jstl-1.2.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/jstl-1.2.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/log4j.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/log4j.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/mina-core-2.0.7.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/mina-core-2.0.7.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/mina-integration-beans-2.0.0-RC1.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/mina-integration-beans-2.0.0-RC1.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/ognl-2.7.3.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/ognl-2.7.3.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/slf4j-api-1.7.5.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/slf4j-api-1.7.5.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/slf4j-nop-1.7.5.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/slf4j-nop-1.7.5.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/spring-context-support.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/spring-context-support.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/struts2-core-2.1.8.1.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/struts2-core-2.1.8.1.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/xstream-1.3.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/xstream-1.3.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/xwork-core-2.1.6.jar
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/xwork-core-2.1.6.jar
--- a/cim_for_mina/ichat-server/WebRoot/WEB-INF/web.xml
+++ b/cim_for_mina/ichat-server/WebRoot/WEB-INF/web.xml
--- a/cim_for_mina/ichat-server/WebRoot/console/header.jsp
+++ b/cim_for_mina/ichat-server/WebRoot/console/header.jsp
--- a/cim_for_mina/ichat-server/WebRoot/console/index.jsp
+++ b/cim_for_mina/ichat-server/WebRoot/console/index.jsp
--- a/cim_for_mina/ichat-server/WebRoot/console/nav.jsp
+++ b/cim_for_mina/ichat-server/WebRoot/console/nav.jsp
--- a/cim_for_mina/ichat-server/WebRoot/console/session/manage.jsp
+++ b/cim_for_mina/ichat-server/WebRoot/console/session/manage.jsp
--- a/cim_for_mina/ichat-server/WebRoot/index.jsp
+++ b/cim_for_mina/ichat-server/WebRoot/index.jsp
--- a/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/css/bootstrap-theme.min.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/css/bootstrap-theme.min.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/css/bootstrap.min.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/css/bootstrap.min.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ b/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.eot
--- a/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ b/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.svg
--- a/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.ttf
+++ b/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.ttf
--- a/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.woff
+++ b/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/fonts/glyphicons-halflings-regular.woff
--- a/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/js/bootstrap.min.js
+++ b/cim_for_mina/ichat-server/WebRoot/resource/bootstrap/js/bootstrap.min.js
--- a/cim_for_mina/ichat-server/WebRoot/resource/css/base-ui.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/css/base-ui.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/css/dialog.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/css/dialog.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/css/login.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/css/login.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/css/main-layout.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/css/main-layout.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/css/table.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/css/table.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/css/webbase.css
+++ b/cim_for_mina/ichat-server/WebRoot/resource/css/webbase.css
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/avatar-hover-bg.png
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/avatar-hover-bg.png
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/blue_line.jpg
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/blue_line.jpg
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/disk-spr.png
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/disk-spr.png
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/icon.png
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/icon.png
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/icon_admin.png
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/icon_admin.png
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/icon_error.png
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/icon_error.png
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/icon_group_admin.png
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/icon_group_admin.png
--- a/cim_for_mina/ichat-server/WebRoot/resource/img/icon_hint.png
+++ b/cim_for_mina/ichat-server/WebRoot/resource/img/icon_hint.png
--- a/Show More
+++ b/Show More