diff --git a/examples/quickstart/src/main/webapp/WEB-INF/layouts/default.jsp b/examples/quickstart/src/main/webapp/WEB-INF/layouts/default.jsp index 00e650a7..3cf24682 100644 --- a/examples/quickstart/src/main/webapp/WEB-INF/layouts/default.jsp +++ b/examples/quickstart/src/main/webapp/WEB-INF/layouts/default.jsp @@ -16,7 +16,7 @@ - + diff --git a/examples/quickstart/src/main/webapp/static/styles/quickstart.css b/examples/quickstart/src/main/webapp/static/styles/main.css similarity index 100% rename from examples/quickstart/src/main/webapp/static/styles/quickstart.css rename to examples/quickstart/src/main/webapp/static/styles/main.css diff --git a/examples/showcase/bin/yuicompressor.bat b/examples/showcase/bin/yuicompressor.bat index 07ed4a1b..98c8b1a7 100644 --- a/examples/showcase/bin/yuicompressor.bat +++ b/examples/showcase/bin/yuicompressor.bat @@ -2,6 +2,6 @@ echo [PreRequirment] Download yuicompressor-2.4.7.jar from http://yuilibrary.com/downloads/yuicompressor and put it here. cd %~dp0 -java -jar yuicompressor-2.4.7.jar -o ..\src\main\webapp\static\styles\showcase.min.css ..\src\main\webapp\static\styles\showcase.css +java -jar yuicompressor-2.4.7.jar -o ..\src\main\webapp\static\styles\main.min.css ..\src\main\webapp\static\styles\main.css pause \ No newline at end of file diff --git a/examples/showcase/src/main/webapp/WEB-INF/layouts/default.jsp b/examples/showcase/src/main/webapp/WEB-INF/layouts/default.jsp index 271a0888..58459c5f 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/layouts/default.jsp +++ b/examples/showcase/src/main/webapp/WEB-INF/layouts/default.jsp @@ -14,7 +14,7 @@ - + diff --git a/examples/showcase/src/main/webapp/static/styles/showcase.css b/examples/showcase/src/main/webapp/static/styles/main.css similarity index 100% rename from examples/showcase/src/main/webapp/static/styles/showcase.css rename to examples/showcase/src/main/webapp/static/styles/main.css diff --git a/examples/showcase/src/main/webapp/static/styles/showcase.min.css b/examples/showcase/src/main/webapp/static/styles/main.min.css similarity index 100% rename from examples/showcase/src/main/webapp/static/styles/showcase.min.css rename to examples/showcase/src/main/webapp/static/styles/main.min.css diff --git a/pom.xml b/pom.xml index e95f0bb5..beeb7daa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springside springside-project @@ -39,7 +38,7 @@ modules examples - + Jenkins diff --git a/support/maven-archetype/README.txt b/support/maven-archetype/README.txt index 0daf4ead..8a7d8e0f 100644 --- a/support/maven-archetype/README.txt +++ b/support/maven-archetype/README.txt @@ -2,6 +2,7 @@ a. create a archetype.properties, the content is +package=org.springside.examples.quickstart projectName=QuickStart tablePrefix=ss_ diff --git a/create-project.bat b/support/maven-archetype/create-project.bat similarity index 52% rename from create-project.bat rename to support/maven-archetype/create-project.bat index 0e701108..d00b6fa2 100644 --- a/create-project.bat +++ b/support/maven-archetype/create-project.bat @@ -1,4 +1,7 @@ @echo off +echo [INFO] Generating project in ./generate dir + +cd generate call mvn archetype:generate -DarchetypeCatalog=local pause \ No newline at end of file diff --git a/support/maven-archetype/generate/.gitkeep b/support/maven-archetype/generate/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/support/maven-archetype/install-archetype.bat b/support/maven-archetype/install-archetype.bat new file mode 100644 index 00000000..2f54cb22 --- /dev/null +++ b/support/maven-archetype/install-archetype.bat @@ -0,0 +1,4 @@ +@echo off + +call mvn clean install +pause \ No newline at end of file diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/default.jsp b/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/default.jsp index d2c9fa5b..3e894f4c 100644 --- a/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/default.jsp +++ b/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/default.jsp @@ -10,7 +10,7 @@ -QuickStart示例:<sitemesh:title/> +${projectName}示例:<sitemesh:title/> @@ -19,7 +19,7 @@ - + diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/header.jsp b/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/header.jsp index 6ebb52c9..2eedc6fa 100644 --- a/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/header.jsp +++ b/support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/layouts/header.jsp @@ -7,7 +7,7 @@