Skip to content

Commit d6fcfce

Browse files
calvin1978calvin1978
committed
让quick-start.bat跑利索了
1 parent ae0a801 commit d6fcfce

File tree

9 files changed

+65
-79
lines changed

9 files changed

+65
-79
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@
3232
/modules/extension/.classpath
3333
/modules/extension/.project
3434
/modules/extension/.settings/org.eclipse.jdt.core.prefs
35+
/support/maven-archetype/target/
36+
/support/maven-archetype/.settings/
37+
/support/maven-archetype/.project

‎TODO.txt

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

7777

7878
-----------------------------------------------------------------------------------

‎bin/generate-project.bat

-14
This file was deleted.

‎bin/quick-start.bat

-55
This file was deleted.

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

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<!-- 使用annotation 自动注册bean,并检查@Required,@Autowired的属性已被注入 -->
2727
<context:component-scan base-package="org.springside.examples.showcase" />
2828

29-
<!-- 以静态变量保存ApplicationContext -->
30-
<bean class="org.springside.modules.utils.spring.SpringContextHolder" lazy-init="false" />
31-
3229
<!-- 数据源配置,使用应用内的DBCP数据库连接池 -->
3330
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
3431
<!-- Connection Info -->

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springside</groupId>
55
<artifactId>springside</artifactId>
6-
<version>4.0.0-SNAPSHOT</version>
6+
<version>4.0.0.RC1-SNAPSHOT</version>
77
<name>Springside</name>
88
<packaging>pom</packaging>
99

@@ -17,7 +17,7 @@
1717
<module>examples/mini-service</module>
1818
<module>examples/mini-web</module>
1919
<module>examples/showcase</module>
20-
<module>tools/maven/archetype</module>
20+
<module>support/maven-archetype</module>
2121
</modules>
2222
</profile>
2323

@@ -27,7 +27,7 @@
2727
<module>modules/parent</module>
2828
<module>modules/core</module>
2929
<module>modules/extension</module>
30-
<module>tools/maven/archetype</module>
30+
<module>support/maven-archetype</module>
3131
</modules>
3232
</profile>
3333
</profiles>

‎quick-start.bat

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
@echo off
2+
echo [Pre-Requirement] Makesure install JDK 6.0+ and set the JAVA_HOME.
3+
echo [Pre-Requirement] Makesure install Maven 3.0+, Ant 1.8+ and set the PATH.
4+
echo [Pre-Requirement] Makesure download the maven-ant-tasks.jar and put it in Ant's lib dir.
5+
6+
set MVN=mvn
7+
set ANT=ant
8+
set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m
9+
10+
echo [Step 1] Install all springside modules to local maven repository, and generate eclipse files to all projects.
11+
call %MVN% clean install -Pmodules -Dmaven.test.skip=true
12+
if errorlevel 1 goto error
13+
call %MVN% -Pall eclipse:clean eclipse:eclipse
14+
if errorlevel 1 goto error
15+
16+
echo [Step 2] Start H2 Standalone database.
17+
cd support/h2
18+
start "H2 Database" %MVN% exec:java -PwithoutBrowser
19+
cd ..\..\
20+
21+
echo [Step 3] Mini-Service:init database data and start jetty.
22+
cd examples\mini-service
23+
call %ANT% -f bin/db/build.xml init-db
24+
if errorlevel 1 goto error
25+
start "Mini-Service" %MVN% jetty:run -Djetty.port=8082
26+
cd ..\..\
27+
28+
echo [Step 4] Mini-Web:init database data and start jetty.
29+
cd examples\mini-web
30+
call %ANT% -f bin/db/build.xml init-db
31+
if errorlevel 1 goto error
32+
start "Mini-Web" %MVN% jetty:run -Djetty.port=8081
33+
cd ..\..\
34+
35+
echo [Step 5] Showcase:init database data and start jetty.
36+
cd examples\showcase
37+
call %ANT% -f bin/db/build.xml init-db
38+
if errorlevel 1 goto error
39+
start "Showcase" %MVN% jetty:run
40+
cd ..\..\
41+
42+
echo [INFO] SpringSide4.0 Quick Start finish.
43+
echo [INFO] Access below demo sites:
44+
echo [INFO] http://localhost:8082/mini-service
45+
echo [INFO] http://localhost:8081/mini-web
46+
echo [INFO] http://localhost:8080/showcase
47+
48+
goto end
49+
:error
50+
echo Error Happen!!! Please check the Pre-Requirement.
51+
:end
52+
pause

‎support/h2/pom.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<parent>
55
<artifactId>springside-parent</artifactId>
66
<groupId>org.springside</groupId>
7-
<version>4.0.0-SNAPSHOT</version>
7+
<version>4.0.0.RC1-SNAPSHOT</version>
8+
<relativePath>../../modules/parent</relativePath>
89
</parent>
910
<groupId>org.springside</groupId>
1011
<artifactId>h2-starts</artifactId>
@@ -67,6 +68,8 @@
6768
<arguments>
6869
<argument>-tcp</argument>
6970
<argument>-web</argument>
71+
<argument>-webPort</argument>
72+
<argument>8090</argument>
7073
</arguments>
7174
</configuration>
7275
</plugin>

‎support/maven-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<parent>
66
<groupId>org.springside</groupId>
77
<artifactId>springside-parent</artifactId>
8-
<version>4.0.0-SNAPSHOT</version>
9-
<relativePath>../../../../modules/parent</relativePath>
8+
<version>4.0.0.RC1-SNAPSHOT</version>
9+
<relativePath>../../modules/parent</relativePath>
1010
</parent>
1111
<groupId>org.springside</groupId>
1212
<artifactId>springside-mini-web-archetype</artifactId>

0 commit comments

Comments
 (0)