让quick-start.bat跑利索了

.gitignore

@@ -32,3 +32,6 @@
 /modules/extension/.classpath
 /modules/extension/.project
 /modules/extension/.settings/org.eclipse.jdt.core.prefs
+/support/maven-archetype/target/
+/support/maven-archetype/.settings/
+/support/maven-archetype/.project
\ No newline at end of file

TODO.txt

@@ -72,7 +72,7 @@ TODO部分:
   * 用JUnit自带的Catetory的演示
   * 升级Selenium到最新版, 使用自带的Wait类
   * 升级Jquery-validation用法
-  * Cleanup 代码Header中SVN相关的部分
+  * 安全部分加入salt
   
 
 -----------------------------------------------------------------------------------

bin/generate-project.bat

-@echo off
-echo [INFO] 确保已用mvn install安裝tools\maven\archetype中的mini-web項目模板
-
-set MVN=mvn
-if exist "tools\maven\apache-maven-3.0.2\" set MVN="%cd%\tools\maven\apache-maven-3.0.2\bin\mvn.bat"
-echo Maven命令为%MVN%
-
-mkdir generated-projects
-cd generated-projects
-call mvn archetype:generate -DarchetypeCatalog=local
-
-pause
-
-

examples/showcase/src/main/resources/applicationContext.xml

@@ -26,9 +26,6 @@
 	<!-- 使用annotation 自动注册bean,并检查@Required,@Autowired的属性已被注入 -->
 	<context:component-scan base-package="org.springside.examples.showcase" />
 
-	<!-- 以静态变量保存ApplicationContext -->
-	<bean class="org.springside.modules.utils.spring.SpringContextHolder" lazy-init="false" />
-
 	<!-- 数据源配置,使用应用内的DBCP数据库连接池 -->
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
 		<!-- Connection Info -->

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springside</groupId>
 	<artifactId>springside</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.0.RC1-SNAPSHOT</version>
 	<name>Springside</name>
 	<packaging>pom</packaging>
 	
@@ -17,7 +17,7 @@
 				<module>examples/mini-service</module>
 				<module>examples/mini-web</module>
 				<module>examples/showcase</module>
-				<module>tools/maven/archetype</module>
+				<module>support/maven-archetype</module>
 	  	</modules>
 	  </profile>
 	  
@@ -27,7 +27,7 @@
 				<module>modules/parent</module>
 				<module>modules/core</module>
 				<module>modules/extension</module>
-				<module>tools/maven/archetype</module>
+				<module>support/maven-archetype</module>
 	  	</modules>
 	  </profile>
 </profiles>

bin/quick-start.bat → quick-start.bat

 @echo off
-echo [INFO] 确保默认JDK版本为JDK6.0及以上版本,已配置JAVA_HOME.
+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.
 
 set MVN=mvn
 set ANT=ant
 set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m
 
-if exist "tools\maven\apache-maven-3.0.3\" set MVN="%cd%\tools\maven\apache-maven-3.0.3\bin\mvn.bat"
-if exist "tools\ant\apache-ant-1.8.2\" set ANT="%cd%\tools\ant\apache-ant-1.8.2\bin\ant.bat"
-echo Maven命令为%MVN%
-echo Ant命令为%ANT%
-
-echo [Step 1] 安装SpringSide 所有modules到本地Maven仓库, 为所有项目生成Eclipse项目文件.
+echo [Step 1] Install all springside modules to local maven repository, and generate eclipse files to all projects.
 call %MVN% clean install -Pmodules -Dmaven.test.skip=true
 if errorlevel 1 goto error
 call %MVN% -Pall eclipse:clean eclipse:eclipse
 if errorlevel 1 goto error
 
-echo [Step 2] 启动H2数据库.
-cd tools/h2
-start "H2" %MVN% exec:java -PwithoutBrowser
+echo [Step 2] Start H2 Standalone database.
+cd support/h2
+start "H2 Database" %MVN% exec:java -PwithoutBrowser
 cd ..\..\
 
-echo [Step 3] 为Mini-Service 初始化数据库, 启动Jetty.
+echo [Step 3] Mini-Service:init database data and start jetty.
 cd examples\mini-service
 call %ANT% -f bin/db/build.xml init-db
 if errorlevel 1 goto error
-start "Mini-Service" %MVN% jetty:run -Djetty.port=8083
+start "Mini-Service" %MVN% jetty:run -Djetty.port=8082
 cd ..\..\
 
-echo [Step 4] 为Mini-Web 初始化数据库, 启动Jetty.
+echo [Step 4] Mini-Web:init database data and start jetty.
 cd examples\mini-web
 call %ANT% -f bin/db/build.xml init-db 
 if errorlevel 1 goto error
-start "Mini-Web" %MVN% jetty:run -Djetty.port=8084
+start "Mini-Web" %MVN% jetty:run -Djetty.port=8081
 cd ..\..\
 
-echo [Step 5] 为Showcase 生成Eclipse项目文件, 编译, 打包, 初始化数据库, 启动Jetty.
+echo [Step 5] Showcase:init database data and start jetty.
 cd examples\showcase
 call %ANT% -f bin/db/build.xml init-db
 if errorlevel 1 goto error
 start "Showcase" %MVN% jetty:run
 cd ..\..\
 
-echo [INFO] SpringSide4.0 快速启动完毕.
-echo [INFO] 可访问以下演示网址:
-echo [INFO] http://localhost:8083/mini-service
-echo [INFO] http://localhost:8084/mini-web
+echo [INFO] SpringSide4.0 Quick Start finish.
+echo [INFO] Access below demo sites:
+echo [INFO] http://localhost:8082/mini-service
+echo [INFO] http://localhost:8081/mini-web
 echo [INFO] http://localhost:8080/showcase
 
 goto end
 :error
-echo "有错误发生"
+echo Error Happen!!! Please check the Pre-Requirement.
 :end
 pause
\ No newline at end of file

support/h2/pom.xml

@@ -4,7 +4,8 @@
 	<parent>
 		<artifactId>springside-parent</artifactId>
 		<groupId>org.springside</groupId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0.RC1-SNAPSHOT</version>
+		<relativePath>../../modules/parent</relativePath>
 	</parent>
 	<groupId>org.springside</groupId>
 	<artifactId>h2-starts</artifactId>
@@ -67,6 +68,8 @@
 						<arguments>
 							<argument>-tcp</argument>
 							<argument>-web</argument>
+							<argument>-webPort</argument>
+							<argument>8090</argument>
 						</arguments>
 					</configuration>
 			</plugin>

support/maven-archetype/pom.xml

@@ -5,8 +5,8 @@
   	<parent>
 		<groupId>org.springside</groupId>
 		<artifactId>springside-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../../../modules/parent</relativePath>
+		<version>4.0.0.RC1-SNAPSHOT</version>
+		<relativePath>../../modules/parent</relativePath>
 	</parent>
   <groupId>org.springside</groupId>
   <artifactId>springside-mini-web-archetype</artifactId>