diff --git a/TODO.txt b/TODO.txt index 8e902449..3e335830 100644 --- a/TODO.txt +++ b/TODO.txt @@ -4,17 +4,12 @@ TODO部分: -1.主要改动 - * - --清理相关类 - -2.次要改动 - * 初始化数据不要再依赖Ant +全部完成 --------------------------------------------------------------------------------- 已完成部分: 1. 主要改动 - * DAO框架用Spring Data JPA(Hibernate的JPA实现)代替Hibernate原生API + DIY BaseDao基类 + * DAO框架用Spring Data JPA + Hibernate的JPA实现代替Hibernate原生API + DIY BaseDao基类 * DAO框架增加MyBatis的使用,与Hibernate在不同的场景各展所长 * MVC框架从Struts2转为Spring MVC3 * 安全框架从SpringSecurity转为Apache Shiro @@ -22,8 +17,8 @@ TODO部分: * CSS框架从YUI转为Blueprint * Spring引入Profile概念统一测试、生产環境的配置 * 演示Hibernate Validator - * 升級Jackson1.9 演示,包括可擴展的對象, 對象循環引用,局部更新,自定义类型的持久化,自定义Naming策略,已存在對象等新特性. * 添加各种常用Utility的Demo, 升级Guava和Commons-Lang3.0. + * 升級Jackson1.9 演示,包括可擴展的對象, 對象循環引用,局部更新,自定义类型的持久化,自定义Naming策略,已存在對象等新特性. * 升级Selenium2.0演示,融合Selenium 1.0与2.0的API * Mock框架从EasyMock+JMock换成Mockito + PowerMock * SpringSide Modules的重构 @@ -34,7 +29,7 @@ TODO部分: * 升级JodaTime2.0版演示 * 使用log4jdbc打印SQL及执行时间 * 演示RESTful库Jersey的Multi-Part客户端与服务端 - * Form内容对齐从Table改为Label+CSS + * 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 @@ -45,6 +40,7 @@ TODO部分: 3. 其他非代码改动 * 使用Maven FailSafe插件分开单元测试和集成测试 + * 数据库初始化从ant改为用maven,消除quick-start对ant的依赖 * cxf wsdl2java从ant改为用maven plugin * hibernate代码生成从ant改为用Eclipse插件 @@ -56,7 +52,8 @@ TODO部分: 1.主要改动 * 升级Hibernate 4.0 * Schedule演示升级,升级Quartz2.x,Spring Schedule Executor配置升级 - * Search Form与分页 + * Search与分页演示 + 2.次要改动 * 包括Guava的Cache Builder做的简单缓存 @@ -64,10 +61,11 @@ TODO部分: * Review perf4j的使用 * Jersey的Jackson JSON绑定看有没有简化,并升级其他用法。 * 升级Jquery-validation用法?? JQuery flash效果 + * Ehcache2.x新功能演示 * JPA2.0特征 * Shiro的方法级权限控制, Test Helper, enable/diable用户抛出用户已锁定的异常. * Hash与加密要加入salt - * UT只初始化一次數據 + * UT更智能的初始化數據,dirty data 的标签?? * 用JUnit自带的Catetory的演示,Harmset演示 * Selenium使用自带的Wait类, 检查新版API变化 * 更深入演示PowerMock diff --git a/examples/mini-service/bin/db/build.xml b/examples/mini-service/bin/db/build.xml deleted file mode 100644 index f16b20e5..00000000 --- a/examples/mini-service/bin/db/build.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/mini-service/bin/db/db-export.bat b/examples/mini-service/bin/db/db-export.bat deleted file mode 100644 index b2b3911f..00000000 --- a/examples/mini-service/bin/db/db-export.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo [INFO] Export data to src/main/resources/data/export-data.xml by dbunit. - -cd %~dp0 -call ant exp-db -pause \ No newline at end of file diff --git a/examples/mini-service/bin/db/db-init.bat b/examples/mini-service/bin/db/db-init.bat deleted file mode 100644 index da92a395..00000000 --- a/examples/mini-service/bin/db/db-init.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo [INFO] Create schema by sql, and import default data from src/test/resources/data/sample-data.xml by dbunit. - -cd %~dp0 -call ant init-db -pause \ No newline at end of file diff --git a/examples/mini-service/bin/refreshdb.bat b/examples/mini-service/bin/refreshdb.bat new file mode 100644 index 00000000..ee037e88 --- /dev/null +++ b/examples/mini-service/bin/refreshdb.bat @@ -0,0 +1,11 @@ +@echo off +echo [INFO] Re-create the schema and provision the sample data. + +cd %~dp0 +cd .. + +set MAVEN_OPTS=%MAVEN_OPTS% +call mvn antrun:run -Prefreshdb + +cd bin +pause \ No newline at end of file diff --git a/examples/mini-service/pom.xml b/examples/mini-service/pom.xml index 43bae1db..1b776635 100644 --- a/examples/mini-service/pom.xml +++ b/examples/mini-service/pom.xml @@ -265,4 +265,47 @@ + + + + refreshdb + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + + + + + + Waiting for the h2 server start... + + + + + + The h2 server started. + + + + + + + + + + + + + + + + + + diff --git a/examples/mini-web/bin/db/build.xml b/examples/mini-web/bin/db/build.xml deleted file mode 100644 index 61bd49a0..00000000 --- a/examples/mini-web/bin/db/build.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/mini-web/bin/db/convert-h2-sql.bat b/examples/mini-web/bin/db/convert-h2-sql.bat deleted file mode 100644 index a22d0ad6..00000000 --- a/examples/mini-web/bin/db/convert-h2-sql.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo [INFO] Convert production sql to H2 sql for testing. - -cd %~dp0 -call ant convert.mysql.to.h2 -pause \ No newline at end of file diff --git a/examples/mini-web/bin/db/db-export.bat b/examples/mini-web/bin/db/db-export.bat deleted file mode 100644 index b2b3911f..00000000 --- a/examples/mini-web/bin/db/db-export.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo [INFO] Export data to src/main/resources/data/export-data.xml by dbunit. - -cd %~dp0 -call ant exp-db -pause \ No newline at end of file diff --git a/examples/mini-web/bin/db/db-init.bat b/examples/mini-web/bin/db/db-init.bat deleted file mode 100644 index da92a395..00000000 --- a/examples/mini-web/bin/db/db-init.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo [INFO] Create schema by sql, and import default data from src/test/resources/data/sample-data.xml by dbunit. - -cd %~dp0 -call ant init-db -pause \ No newline at end of file diff --git a/examples/mini-web/bin/refreshdb.bat b/examples/mini-web/bin/refreshdb.bat new file mode 100644 index 00000000..ee037e88 --- /dev/null +++ b/examples/mini-web/bin/refreshdb.bat @@ -0,0 +1,11 @@ +@echo off +echo [INFO] Re-create the schema and provision the sample data. + +cd %~dp0 +cd .. + +set MAVEN_OPTS=%MAVEN_OPTS% +call mvn antrun:run -Prefreshdb + +cd bin +pause \ No newline at end of file diff --git a/examples/mini-web/pom.xml b/examples/mini-web/pom.xml index c769c40a..4ed5fdce 100644 --- a/examples/mini-web/pom.xml +++ b/examples/mini-web/pom.xml @@ -288,4 +288,47 @@ + + + + refreshdb + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + + + + + + Waiting for the h2 server start... + + + + + + The h2 server started. + + + + + + + + + + + + + + + + + + diff --git a/examples/showcase/bin/db/build.xml b/examples/showcase/bin/db/build.xml deleted file mode 100644 index 54edbfb0..00000000 --- a/examples/showcase/bin/db/build.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/showcase/bin/db/db-export.bat b/examples/showcase/bin/db/db-export.bat deleted file mode 100644 index b2b3911f..00000000 --- a/examples/showcase/bin/db/db-export.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo [INFO] Export data to src/main/resources/data/export-data.xml by dbunit. - -cd %~dp0 -call ant exp-db -pause \ No newline at end of file diff --git a/examples/showcase/bin/db/db-init.bat b/examples/showcase/bin/db/db-init.bat deleted file mode 100644 index da92a395..00000000 --- a/examples/showcase/bin/db/db-init.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo [INFO] Create schema by sql, and import default data from src/test/resources/data/sample-data.xml by dbunit. - -cd %~dp0 -call ant init-db -pause \ No newline at end of file diff --git a/examples/showcase/bin/refreshdb.bat b/examples/showcase/bin/refreshdb.bat new file mode 100644 index 00000000..ee037e88 --- /dev/null +++ b/examples/showcase/bin/refreshdb.bat @@ -0,0 +1,11 @@ +@echo off +echo [INFO] Re-create the schema and provision the sample data. + +cd %~dp0 +cd .. + +set MAVEN_OPTS=%MAVEN_OPTS% +call mvn antrun:run -Prefreshdb + +cd bin +pause \ No newline at end of file diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml index 7661aa96..0732bd81 100644 --- a/examples/showcase/pom.xml +++ b/examples/showcase/pom.xml @@ -455,6 +455,47 @@ + + refreshdb + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + + + + + + Waiting for the h2 server start... + + + + + + The h2 server started. + + + + + + + + + + + + + + + + + + package-bin diff --git a/quick-start.bat b/quick-start.bat index 01d39c8a..e52379f7 100644 --- a/quick-start.bat +++ b/quick-start.bat @@ -1,10 +1,8 @@ @echo off echo [Pre-Requirement] Makesure install JDK 6.0+ and set the JAVA_HOME. -echo [Pre-Requirement] Makesure install Maven 3.0+, Ant 1.8+ and set the PATH. -echo [Pre-Requirement] Makesure download the maven-ant-tasks.jar and put it in Ant's lib dir. +echo [Pre-Requirement] Makesure install Maven 3.0+ set MVN=mvn -set ANT=ant set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m echo [Step 1] Install all springside modules to local maven repository, and generate eclipse files to all projects. @@ -20,26 +18,26 @@ cd ..\..\ echo [Step 3] Mini-Service:init database data and start jetty. cd examples\mini-service -call %ANT% -f bin/db/build.xml init-db +call %MVN% antrun:run -Prefreshdb if errorlevel 1 goto error -start "Mini-Service" %MVN% jetty:run -Djetty.port=8082 +start "Mini-Service" %MVN% clean jetty:run -Djetty.port=8082 cd ..\..\ echo [Step 4] Mini-Web:init database data and start jetty. cd examples\mini-web -call %ANT% -f bin/db/build.xml init-db +call %MVN% antrun:run -Prefreshdb if errorlevel 1 goto error start "Mini-Web" %MVN% jetty:run -Djetty.port=8081 cd ..\..\ echo [Step 5] Showcase:init database data and start jetty. cd examples\showcase -call %ANT% -f bin/db/build.xml init-db +call %MVN% antrun:run -Prefreshdb if errorlevel 1 goto error start "Showcase" %MVN% jetty:run cd ..\..\ -echo [INFO] SpringSide4.0 Quick Start finish. +echo [INFO] SpringSide4.0 Quick Start finished. echo [INFO] Access below demo sites: echo [INFO] http://localhost:8082/mini-service echo [INFO] http://localhost:8081/mini-web @@ -47,6 +45,6 @@ echo [INFO] http://localhost:8080/showcase goto end :error -echo Error Happen!!! Please check the Pre-Requirement. +echo Error Happen!!! :end pause \ No newline at end of file