From bdb7c12d45a807befe699d207cfdd1556da7aff1 Mon Sep 17 00:00:00 2001 From: Calvin Date: Fri, 5 Oct 2012 00:43:53 +0800 Subject: [PATCH] =?UTF-8?q?functional=E7=9A=84package=E5=90=8D=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=AB=EF=BC=8Ccss?= =?UTF-8?q?=E5=90=8D=E5=8F=ABquickstart=E4=B8=8D=E8=83=BD=E5=BE=88?= =?UTF-8?q?=E5=A5=BD=E8=87=AA=E5=8A=A8=E6=94=B9=E5=90=8D=E7=AD=89=E5=B0=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quickstart/src/main/webapp/WEB-INF/layouts/default.jsp | 2 +- .../main/webapp/static/styles/{quickstart.css => main.css} | 0 examples/showcase/bin/yuicompressor.bat | 2 +- .../showcase/src/main/webapp/WEB-INF/layouts/default.jsp | 2 +- .../main/webapp/static/styles/{showcase.css => main.css} | 0 .../webapp/static/styles/{showcase.min.css => main.min.css} | 0 pom.xml | 5 ++--- support/maven-archetype/README.txt | 1 + .../maven-archetype/create-project.bat | 3 +++ support/maven-archetype/generate/.gitkeep | 0 support/maven-archetype/install-archetype.bat | 4 ++++ .../src/main/webapp/WEB-INF/layouts/default.jsp | 4 ++-- .../src/main/webapp/WEB-INF/layouts/header.jsp | 2 +- .../archetype-resources/src/main/webapp/WEB-INF/web.xml | 2 +- .../main/webapp/static/styles/{quickstart.css => main.css} | 0 .../quickstart => }/functional/BaseFunctionalTestCase.java | 0 .../quickstart => }/functional/BaseSeleniumTestCase.java | 4 ++-- .../quickstart => }/functional/QuickStartServer.java | 0 .../examples/quickstart => }/functional/gui/ProfileFT.java | 0 .../examples/quickstart => }/functional/gui/RegisterFT.java | 4 ++-- .../examples/quickstart => }/functional/gui/SecurityFT.java | 6 +++--- .../examples/quickstart => }/functional/gui/TaskGuiFT.java | 0 .../quickstart => }/functional/gui/UserAdminFT.java | 0 .../quickstart => }/functional/rest/TaskRestFT.java | 0 24 files changed, 24 insertions(+), 17 deletions(-) rename examples/quickstart/src/main/webapp/static/styles/{quickstart.css => main.css} (100%) rename examples/showcase/src/main/webapp/static/styles/{showcase.css => main.css} (100%) rename examples/showcase/src/main/webapp/static/styles/{showcase.min.css => main.min.css} (100%) rename create-project.bat => support/maven-archetype/create-project.bat (52%) create mode 100644 support/maven-archetype/generate/.gitkeep create mode 100644 support/maven-archetype/install-archetype.bat rename support/maven-archetype/src/main/resources/archetype-resources/src/main/webapp/static/styles/{quickstart.css => main.css} (100%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/BaseFunctionalTestCase.java (100%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/BaseSeleniumTestCase.java (91%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/QuickStartServer.java (100%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/gui/ProfileFT.java (100%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/gui/RegisterFT.java (88%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/gui/SecurityFT.java (86%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/gui/TaskGuiFT.java (100%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/gui/UserAdminFT.java (100%) rename support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/{org/springside/examples/quickstart => }/functional/rest/TaskRestFT.java (100%) 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 @@