merge from master

zzh8002 · Jan 15, 2016 · dad643d · dad643d
2 parents 0dad388 + 03c1286
commit dad643d
Show file tree

Hide file tree

Showing 889 changed files with 141,055 additions and 98,094 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -7,6 +7,12 @@ RAP通过GUI工具帮助WEB工程师更高效的管理接口文档，同时通
 
 <img src="http://gtms04.alicdn.com/tps/i4/TB19tgUKVXXXXXAXXXXAhCB5VXX-1222-646.png" width="600" />
 
+### Architect
+* Hibernate5 + Spring4 + Struts2
+* MySQL
+* Redis
+* Velocity
+
 ### Why we use RAP?
 * Enterprise level application. More than 350+ corporations including Alibaba Group are using RAP to manage their important API Docs!
 * Fast and efficient technical support, continuously update. Go to issues list to find out how lively the community is!
@@ -45,12 +51,12 @@ RAP通过GUI工具帮助WEB工程师更高效的管理接口文档，同时通
 
 ## About
 
-    @version     v0.12.0
+    @version     v0.13.0
     @author      @bosn @wangjeaf
     @director    @limu @xinglie
     @update      Oct. 13th 2015
     @dependency  MockJS(@nuysoft)
-    @licence     GPL
+    @license     GPL
 
 ## Contact
 

diff --git a/WebContent/WEB-INF/lib/.DS_Store b/WebContent/WEB-INF/lib/.DS_Store
diff --git a/WebContent/WEB-INF/lib/activation.jar b/WebContent/WEB-INF/lib/activation.jar
diff --git a/WebContent/WEB-INF/lib/antlr-2.7.6.jar b/WebContent/WEB-INF/lib/antlr-2.7.6.jar
diff --git a/WebContent/WEB-INF/lib/automaton.jar b/WebContent/WEB-INF/lib/automaton.jar
diff --git a/WebContent/WEB-INF/lib/axis.jar b/WebContent/WEB-INF/lib/axis.jar
diff --git a/WebContent/WEB-INF/lib/c3p0-0.9.1.2.jar b/WebContent/WEB-INF/lib/c3p0-0.9.1.2.jar
diff --git a/WebContent/WEB-INF/lib/cglib-nodep-2.1_3.jar b/WebContent/WEB-INF/lib/cglib-nodep-2.1_3.jar
diff --git a/WebContent/WEB-INF/lib/codehaus.jackson.core-1.5.4.jar b/WebContent/WEB-INF/lib/codehaus.jackson.core-1.5.4.jar
diff --git a/WebContent/WEB-INF/lib/codehaus.jackson.mapper-1.5.4.jar b/WebContent/WEB-INF/lib/codehaus.jackson.mapper-1.5.4.jar
diff --git a/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar b/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar
diff --git a/WebContent/WEB-INF/lib/commons-chain-1.1.jar b/WebContent/WEB-INF/lib/commons-chain-1.1.jar
diff --git a/WebContent/WEB-INF/lib/commons-codec-1.3.jar b/WebContent/WEB-INF/lib/commons-codec-1.3.jar
diff --git a/WebContent/WEB-INF/lib/commons-codec-1.6.jar b/WebContent/WEB-INF/lib/commons-codec-1.6.jar
diff --git a/WebContent/WEB-INF/lib/commons-collections-3.2.jar b/WebContent/WEB-INF/lib/commons-collections-3.2.jar
diff --git a/WebContent/WEB-INF/lib/commons-digester-2.0.jar b/WebContent/WEB-INF/lib/commons-digester-2.0.jar
diff --git a/WebContent/WEB-INF/lib/commons-discovery.jar b/WebContent/WEB-INF/lib/commons-discovery.jar
diff --git a/WebContent/WEB-INF/lib/commons-fileupload-1.3.1.jar b/WebContent/WEB-INF/lib/commons-fileupload-1.3.1.jar
diff --git a/WebContent/WEB-INF/lib/commons-httpclient-3.1.jar b/WebContent/WEB-INF/lib/commons-httpclient-3.1.jar
diff --git a/WebContent/WEB-INF/lib/commons-io-2.2.jar b/WebContent/WEB-INF/lib/commons-io-2.2.jar
diff --git a/WebContent/WEB-INF/lib/commons-lang-2.4.jar b/WebContent/WEB-INF/lib/commons-lang-2.4.jar
diff --git a/WebContent/WEB-INF/lib/commons-lang3-3.2.jar b/WebContent/WEB-INF/lib/commons-lang3-3.2.jar
diff --git a/WebContent/WEB-INF/lib/commons-logging-1.1.3.jar b/WebContent/WEB-INF/lib/commons-logging-1.1.3.jar
diff --git a/WebContent/WEB-INF/lib/commons-net-ftp-2.0.jar b/WebContent/WEB-INF/lib/commons-net-ftp-2.0.jar
diff --git a/WebContent/WEB-INF/lib/commons-pool-1.5.4.jar b/WebContent/WEB-INF/lib/commons-pool-1.5.4.jar
diff --git a/WebContent/WEB-INF/lib/commons-validator-1.3.1.jar b/WebContent/WEB-INF/lib/commons-validator-1.3.1.jar
diff --git a/WebContent/WEB-INF/lib/derbyclient.jar b/WebContent/WEB-INF/lib/derbyclient.jar
diff --git a/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
diff --git a/WebContent/WEB-INF/lib/dozer-5.1.jar b/WebContent/WEB-INF/lib/dozer-5.1.jar
diff --git a/WebContent/WEB-INF/lib/dvsl-1.0.jar b/WebContent/WEB-INF/lib/dvsl-1.0.jar
diff --git a/WebContent/WEB-INF/lib/ehcache-1.6.0-beta4.jar b/WebContent/WEB-INF/lib/ehcache-1.6.0-beta4.jar
diff --git a/WebContent/WEB-INF/lib/fluent-hc-4.3.3.jar b/WebContent/WEB-INF/lib/fluent-hc-4.3.3.jar
diff --git a/WebContent/WEB-INF/lib/freemarker-2.3.22.jar b/WebContent/WEB-INF/lib/freemarker-2.3.22.jar
diff --git a/WebContent/WEB-INF/lib/google-collections-1.0.jar b/WebContent/WEB-INF/lib/google-collections-1.0.jar
diff --git a/WebContent/WEB-INF/lib/gson-1.5-sources.jar b/WebContent/WEB-INF/lib/gson-1.5-sources.jar
diff --git a/WebContent/WEB-INF/lib/gson-1.5.jar b/WebContent/WEB-INF/lib/gson-1.5.jar
diff --git a/WebContent/WEB-INF/lib/hessian-3.2.1.jar b/WebContent/WEB-INF/lib/hessian-3.2.1.jar
diff --git a/WebContent/WEB-INF/lib/hibernate-tools.jar b/WebContent/WEB-INF/lib/hibernate-tools.jar
diff --git a/WebContent/WEB-INF/lib/hibernate3.jar b/WebContent/WEB-INF/lib/hibernate3.jar
diff --git a/WebContent/WEB-INF/lib/httpclient-4.3.3.jar b/WebContent/WEB-INF/lib/httpclient-4.3.3.jar
diff --git a/WebContent/WEB-INF/lib/httpclient-cache-4.3.3.jar b/WebContent/WEB-INF/lib/httpclient-cache-4.3.3.jar
diff --git a/WebContent/WEB-INF/lib/httpcore-4.3.2.jar b/WebContent/WEB-INF/lib/httpcore-4.3.2.jar
diff --git a/WebContent/WEB-INF/lib/httpmime-4.3.3.jar b/WebContent/WEB-INF/lib/httpmime-4.3.3.jar
diff --git a/WebContent/WEB-INF/lib/jackson-asl-0.9.3.jar b/WebContent/WEB-INF/lib/jackson-asl-0.9.3.jar
diff --git a/WebContent/WEB-INF/lib/jakarta.commons.lang-2.4.jar b/WebContent/WEB-INF/lib/jakarta.commons.lang-2.4.jar
diff --git a/WebContent/WEB-INF/lib/jakarta.log4j-1.2.15.jar b/WebContent/WEB-INF/lib/jakarta.log4j-1.2.15.jar
diff --git a/WebContent/WEB-INF/lib/java.servlet-2.5.jar b/WebContent/WEB-INF/lib/java.servlet-2.5.jar
diff --git a/WebContent/WEB-INF/lib/javassist-3.11.0.GA.jar b/WebContent/WEB-INF/lib/javassist-3.11.0.GA.jar
diff --git a/WebContent/WEB-INF/lib/javax.mail.jar b/WebContent/WEB-INF/lib/javax.mail.jar
diff --git a/WebContent/WEB-INF/lib/jaxen-1.1-beta-9.jar b/WebContent/WEB-INF/lib/jaxen-1.1-beta-9.jar
diff --git a/WebContent/WEB-INF/lib/jaxrpc.jar b/WebContent/WEB-INF/lib/jaxrpc.jar
diff --git a/WebContent/WEB-INF/lib/js.jar b/WebContent/WEB-INF/lib/js.jar
diff --git a/WebContent/WEB-INF/lib/json-rpc.jar b/WebContent/WEB-INF/lib/json-rpc.jar
diff --git a/WebContent/WEB-INF/lib/jsonplugin-0.30.jar b/WebContent/WEB-INF/lib/jsonplugin-0.30.jar
diff --git a/WebContent/WEB-INF/lib/jta.jar b/WebContent/WEB-INF/lib/jta.jar
diff --git a/WebContent/WEB-INF/lib/junit-4.4.jar b/WebContent/WEB-INF/lib/junit-4.4.jar
diff --git a/WebContent/WEB-INF/lib/jxl.jar b/WebContent/WEB-INF/lib/jxl.jar
diff --git a/WebContent/WEB-INF/lib/log4j-api-2.0.2.jar b/WebContent/WEB-INF/lib/log4j-api-2.0.2.jar
diff --git a/WebContent/WEB-INF/lib/log4j-core-2.0.2.jar b/WebContent/WEB-INF/lib/log4j-core-2.0.2.jar
diff --git a/WebContent/WEB-INF/lib/mysql-connector-java-5.1.6-bin.jar b/WebContent/WEB-INF/lib/mysql-connector-java-5.1.6-bin.jar
diff --git a/WebContent/WEB-INF/lib/nekohtml-1.9.13.jar b/WebContent/WEB-INF/lib/nekohtml-1.9.13.jar
diff --git a/WebContent/WEB-INF/lib/ognl-3.0.6.jar b/WebContent/WEB-INF/lib/ognl-3.0.6.jar
diff --git a/WebContent/WEB-INF/lib/org.slf4j.slf4j-api-1.5.6.jar b/WebContent/WEB-INF/lib/org.slf4j.slf4j-api-1.5.6.jar
diff --git a/WebContent/WEB-INF/lib/org.slf4j.slf4j-log4j12-1.5.6.jar b/WebContent/WEB-INF/lib/org.slf4j.slf4j-log4j12-1.5.6.jar
diff --git a/WebContent/WEB-INF/lib/oro-2.0.8.jar b/WebContent/WEB-INF/lib/oro-2.0.8.jar
diff --git a/WebContent/WEB-INF/lib/ostermillerutils_1_07_00.jar b/WebContent/WEB-INF/lib/ostermillerutils_1_07_00.jar
diff --git a/WebContent/WEB-INF/lib/pinyin4j-2.5.0.jar b/WebContent/WEB-INF/lib/pinyin4j-2.5.0.jar
diff --git a/WebContent/WEB-INF/lib/prettytime-3.2.3.Final.jar b/WebContent/WEB-INF/lib/prettytime-3.2.3.Final.jar
diff --git a/WebContent/WEB-INF/lib/quartz-all-1.6.0.jar b/WebContent/WEB-INF/lib/quartz-all-1.6.0.jar
diff --git a/WebContent/WEB-INF/lib/saaj.jar b/WebContent/WEB-INF/lib/saaj.jar
diff --git a/WebContent/WEB-INF/lib/servletapi-2.3.jar b/WebContent/WEB-INF/lib/servletapi-2.3.jar
diff --git a/WebContent/WEB-INF/lib/sitemesh-2.2.1.jar b/WebContent/WEB-INF/lib/sitemesh-2.2.1.jar
diff --git a/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar b/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar
diff --git a/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar b/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
diff --git a/WebContent/WEB-INF/lib/sourceforge.spring.modules.core-2.5.6.jar b/WebContent/WEB-INF/lib/sourceforge.spring.modules.core-2.5.6.jar
diff --git a/WebContent/WEB-INF/lib/spring-modules-cache.jar b/WebContent/WEB-INF/lib/spring-modules-cache.jar
diff --git a/WebContent/WEB-INF/lib/spring.jar b/WebContent/WEB-INF/lib/spring.jar
diff --git a/WebContent/WEB-INF/lib/spy-2.4.jar b/WebContent/WEB-INF/lib/spy-2.4.jar
diff --git a/WebContent/WEB-INF/lib/sslext-1.2-0.jar b/WebContent/WEB-INF/lib/sslext-1.2-0.jar
diff --git a/WebContent/WEB-INF/lib/stringtree-json-2.0.5.jar b/WebContent/WEB-INF/lib/stringtree-json-2.0.5.jar
diff --git a/WebContent/WEB-INF/lib/struts2-core-2.3.24.jar b/WebContent/WEB-INF/lib/struts2-core-2.3.24.jar
diff --git a/WebContent/WEB-INF/lib/struts2-jasperreports-plugin-2.3.24.jar b/WebContent/WEB-INF/lib/struts2-jasperreports-plugin-2.3.24.jar
diff --git a/WebContent/WEB-INF/lib/struts2-jfreechart-plugin-2.3.24.jar b/WebContent/WEB-INF/lib/struts2-jfreechart-plugin-2.3.24.jar
diff --git a/WebContent/WEB-INF/lib/struts2-json-plugin-2.3.24.jar b/WebContent/WEB-INF/lib/struts2-json-plugin-2.3.24.jar
diff --git a/WebContent/WEB-INF/lib/struts2-sitemesh-plugin-2.0.14.jar b/WebContent/WEB-INF/lib/struts2-sitemesh-plugin-2.0.14.jar
diff --git a/WebContent/WEB-INF/lib/struts2-spring-plugin-2.3.24.jar b/WebContent/WEB-INF/lib/struts2-spring-plugin-2.3.24.jar
diff --git a/WebContent/WEB-INF/lib/struts2-tiles-plugin-2.3.24.jar b/WebContent/WEB-INF/lib/struts2-tiles-plugin-2.3.24.jar
diff --git a/WebContent/WEB-INF/lib/urlrewritefilter-4.0.3.jar b/WebContent/WEB-INF/lib/urlrewritefilter-4.0.3.jar
diff --git a/WebContent/WEB-INF/lib/velocity-1.7-dep.jar b/WebContent/WEB-INF/lib/velocity-1.7-dep.jar
diff --git a/WebContent/WEB-INF/lib/velocity-1.7.jar b/WebContent/WEB-INF/lib/velocity-1.7.jar
diff --git a/WebContent/WEB-INF/lib/velocity-tools-2.0.jar b/WebContent/WEB-INF/lib/velocity-tools-2.0.jar
diff --git a/WebContent/WEB-INF/lib/velocity-tools-generic-2.0.jar b/WebContent/WEB-INF/lib/velocity-tools-generic-2.0.jar
diff --git a/WebContent/WEB-INF/lib/velocity-tools-view-2.0.jar b/WebContent/WEB-INF/lib/velocity-tools-view-2.0.jar
diff --git a/WebContent/WEB-INF/lib/wddx.jar b/WebContent/WEB-INF/lib/wddx.jar
diff --git a/WebContent/WEB-INF/lib/wsdl4j.jar b/WebContent/WEB-INF/lib/wsdl4j.jar
diff --git a/WebContent/WEB-INF/lib/xercesImpl-2.6.2.jar b/WebContent/WEB-INF/lib/xercesImpl-2.6.2.jar
diff --git a/WebContent/WEB-INF/lib/xercesImpl.jar b/WebContent/WEB-INF/lib/xercesImpl.jar
diff --git a/WebContent/WEB-INF/lib/xwork-core-2.3.24.jar b/WebContent/WEB-INF/lib/xwork-core-2.3.24.jar
diff --git a/WebContent/WEB-INF/toolbox.xml b/WebContent/WEB-INF/toolbox.xml
diff --git a/WebContent/WEB-INF/urlrewrite.xml b/WebContent/WEB-INF/urlrewrite.xml
diff --git a/WebContent/account/myAccount.vm b/WebContent/account/myAccount.vm
diff --git a/WebContent/account/mySetting.vm b/WebContent/account/mySetting.vm