diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index 526b6c2d..00000000
--- a/TODO.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-4.0 RC1版
-
-目标：体现Spring4.0的主体框架与选型.
- Linux脚本,SpringContextHoler放回去免得惹事.
- FieldSet的大小问题，BluePrint input.span,border,.colborder的使用
-
- 文档：Jersey文档-quickstart，Jersey json client，Jersey Multipart，Jerseys的介绍，showcase部分
-
----------------------------------------------------------------------------------
-已完成部分:
-1. 主要改动
- * DAO框架用Spring Data JPA + Hibernate的JPA实现代替Hibernate原生API + DIY BaseDao基类
- * DAO框架增加MyBatis的使用，与Hibernate在不同的场景各展所长
- * MVC框架从Struts2转为Spring MVC3
- * 安全框架从SpringSecurity转为Apache Shiro
- * 使用SiteMesh3实现Layout Decoration
- * CSS框架从YUI转为Blueprint
- * Spring引入Profile概念统一测试、生产環境的配置
- * 演示Hibernate Validator
- * 添加各种常用Utility的Demo, 升级Guava和Commons-Lang3.0.
- * 升級Jackson1.9 演示，包括可擴展的對象, 對象循環引用，局部更新，自定义类型的持久化，自定义Naming策略，已存在對象等新特性.
- * 升级Selenium2.0演示，融合Selenium 1.0与2.0的API
- * Mock框架从EasyMock+JMock换成Mockito + PowerMock
- * SpringSide Modules的重构
- * 依赖包重要版本升级如：Maven 3.0, Hibernate 3.6.9, Jetty 7.6.1
-
-2. 次要改动
- * 升级SpyMemcached2.6版演示
- * 升级JodaTime2.0版演示
- * 使用log4jdbc打印SQL及执行时间
- * 演示RESTful库Jersey的Multi-Part客户端与服务端
- * Form对齐从Table改为Label+CSS
- * 删除已过期演示: CXF的ws-security和ws附件协议,Flash Chart, 驗證碼, JMX客户端
- * 依赖包版本的升级
- -- Spring 3.0.4->3.1.1, CXF 2.2.10->2.5.2, Jersey 1.3->1.11, Activemq 5.4.0->5.5.1, Jquery 1.4->1.7.1, Ehcache 1.6—>2.5.1
- -- Guava r06->11, Commons-lang 2.5->3.1, HttpClient 4.0.1->4.2.0 Beta1, Dozer 5.2.1->5.3.2
- -- Commons-io 1.4->2.1, Commons pool 1.5.5->1.6, Commons Codec 1.4->1.6, Slf4j 1.6.2->1.6.4
- -- Junit 4.8.1->4.10, Perf4j 0.9.13->0.9.14, Jmemcached 0.8->1.0, yuicompressor 2.4.2->2.4.7, H2 1.2.142->1.3.164
- -- 所有maven插件升级到最新版
-
-3. 其他非代码改动
- * 使用Maven FailSafe插件分开单元测试和集成测试
- * 数据库初始化从ant改为用maven,消除quick-start对ant的依赖
- * cxf wsdl2java从ant改为用maven plugin
- * hibernate代码生成从ant改为用Eclipse插件
-
------------------------------------------------------------------------------------
-4.0 正式版
- * Review HttpClient的使用
- * Review perf4j的使用
- * 升级Jquery-validation用法??
- * Hash与加密要加入salt
- * 第三方repository也移到github，依赖包次要版本升级:JSW 3.5.7, Log4jdbc,Spymemcached(需自行打包),在pom.xml中标注自己提供的包
- * No Content Error
- * 参考springfuse改进404.jsp,500.jsp
-
-
-
-3.其他非代码改动
- * 发布前打包Maven-Archetype的项目生成模板
- * 文档，尽量的多。
-
------------------------------------------------------------------------------------
-
-需自行时常检查版本的依赖包
-1.Blueprint,jquery,yuicompressor,SpyMemcached,log4jdbc,jsw
\ No newline at end of file
diff --git a/examples/mini-service/pom.xml b/examples/mini-service/pom.xml
index 1b776635..2fc788ae 100644
--- a/examples/mini-service/pom.xml
+++ b/examples/mini-service/pom.xml
@@ -4,7 +4,7 @@
org.springside
springside-parent
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
../../modules/parent
org.springside.examples
diff --git a/examples/mini-web/pom.xml b/examples/mini-web/pom.xml
index 4ed5fdce..5a3c8590 100644
--- a/examples/mini-web/pom.xml
+++ b/examples/mini-web/pom.xml
@@ -4,13 +4,13 @@
org.springside
springside-parent
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
../../modules/parent
org.springside.examples
mini-web
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
war
Springside :: Example :: Mini-Web
diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml
index 0732bd81..11331c11 100644
--- a/examples/showcase/pom.xml
+++ b/examples/showcase/pom.xml
@@ -4,7 +4,7 @@
org.springside
springside-parent
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
../../modules/parent
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/functional/webservice/rs/UserResourceServiceIT.java b/examples/showcase/src/test/java/org/springside/examples/showcase/functional/webservice/rs/UserResourceServiceIT.java
index 08d75ac3..f0b03291 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/functional/webservice/rs/UserResourceServiceIT.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/functional/webservice/rs/UserResourceServiceIT.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.*;
import java.util.List;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.springside.examples.showcase.Start;
import org.springside.examples.showcase.functional.BaseFunctionalTestCase;
@@ -39,6 +40,7 @@ public class UserResourceServiceIT extends BaseFunctionalTestCase {
}
@Test
+ @Ignore("not support yet")
public void getAllUserWithoutPermission() {
try {
client.getAllUser("user", "user");
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 859bb48e..ce817448 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
org.springside
springside-parent
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
../parent
springside-core
diff --git a/modules/extension/pom.xml b/modules/extension/pom.xml
index 40ed380f..bc1ac081 100644
--- a/modules/extension/pom.xml
+++ b/modules/extension/pom.xml
@@ -4,7 +4,7 @@
org.springside
springside-parent
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
../parent
springside-extension
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index 5b88c479..ae32d1f7 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -6,7 +6,7 @@
springside-parent
pom
Springside :: Module :: Parent
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
SpringSide
http://www.springside.org.cn
@@ -14,7 +14,7 @@
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
3.1.1.RELEASE
3.6.9.Final
3.0.6
diff --git a/pom.xml b/pom.xml
index b7f5f500..8fa8b9f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.springside
springside
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
Springside
pom
diff --git a/quick-start b/quick-start
index 4b7a0506..1a76a4ba 100644
--- a/quick-start
+++ b/quick-start
@@ -1,7 +1,7 @@
#!/bin/bash
echo "[Pre-Requirement] Makesure install JDK 6.0+ and set the JAVA_HOME."
-echo "[Pre-Requirement] Makesure install Maven 3.0+ and set the PATH."
+echo "[Pre-Requirement] Makesure install Maven 3.0.4+ and set the PATH."
set MAVEN_OPTS=$MAVEN_OPTS -XX:MaxPermSize=128m
@@ -27,8 +27,7 @@ mvn clean jetty:run -Djetty.port=8081 &
cd ..\showcase
mvn clean jetty:run &
-echo "[INFO] SpringSide4.0 Quick Start finished."
-echo "[INFO] Access below demo sites:"
+echo "[INFO] Please wait a moment then access below demo sites:"
echo "[INFO] http://localhost:8082/mini-service"
echo "[INFO] http://localhost:8081/mini-web"
echo "[INFO] http://localhost:8080/showcase"
diff --git a/quick-start.bat b/quick-start.bat
index 0cec4fc3..723e7f91 100644
--- a/quick-start.bat
+++ b/quick-start.bat
@@ -1,6 +1,6 @@
@echo off
echo [Pre-Requirement] Makesure install JDK 6.0+ and set the JAVA_HOME.
-echo [Pre-Requirement] Makesure install Maven 3.0.3+ and set the PATH.
+echo [Pre-Requirement] Makesure install Maven 3.0.4+ and set the PATH.
set MVN=mvn
set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m
@@ -35,8 +35,7 @@ if errorlevel 1 goto error
cd ..\..\
-echo [INFO] SpringSide4.0 Quick Start finished.
-echo [INFO] Access below demo sites:
+echo [INFO] Please wait a moment then access below demo sites:
echo [INFO] http://localhost:8082/mini-service
echo [INFO] http://localhost:8081/mini-web
echo [INFO] http://localhost:8080/showcase
diff --git a/support/h2/pom.xml b/support/h2/pom.xml
index 9cb8ce3c..3ba79d83 100644
--- a/support/h2/pom.xml
+++ b/support/h2/pom.xml
@@ -4,7 +4,7 @@
springside-parent
org.springside
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
../../modules/parent
org.springside
diff --git a/support/maven-archetype/pom.xml b/support/maven-archetype/pom.xml
index f63db01b..c14386b9 100644
--- a/support/maven-archetype/pom.xml
+++ b/support/maven-archetype/pom.xml
@@ -5,7 +5,7 @@
org.springside
springside-parent
- 4.0.0.RC1-SNAPSHOT
+ 4.0.0.RC1
../../modules/parent
org.springside