diff --git a/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/account/LoginController.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/account/LoginController.java new file mode 100644 index 00000000..5f2742dc --- /dev/null +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/account/LoginController.java @@ -0,0 +1,31 @@ +package org.springside.examples.quickstart.web.account; + +import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * LoginController负责打开登录页面(GET请求)和登录出错页面(POST请求), + + * 真正登录的POST请求由Filter完成, + * + * @author calvin + */ +@Controller +public class LoginController { + + @RequestMapping(value = "/login", method = RequestMethod.GET) + public String login() { + return "account/login"; + } + + @RequestMapping(value = "/login", method = RequestMethod.POST) + public String fail(@RequestParam(FormAuthenticationFilter.DEFAULT_USERNAME_PARAM) String userName, Model model) { + model.addAttribute(FormAuthenticationFilter.DEFAULT_USERNAME_PARAM, userName); + return "account/login"; + } + +} diff --git a/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskController.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/task/TaskController.java similarity index 96% rename from examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskController.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/web/task/TaskController.java index 3904dc93..1f8500c2 100644 --- a/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskController.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/task/TaskController.java @@ -1,4 +1,4 @@ -package org.springside.examples.quickstart.web; +package org.springside.examples.quickstart.web.task; import java.util.List; @@ -45,13 +45,13 @@ public class TaskController { List tasks = taskService.getUserTask(userId); model.addAttribute("tasks", tasks); - return "taskList"; + return "task/taskList"; } @RequestMapping(value = "create") public String createForm(Model model) { model.addAttribute("task", new Task()); - return "taskForm"; + return "task/taskForm"; } @RequestMapping(value = "save") @@ -67,7 +67,7 @@ public class TaskController { @RequestMapping(value = "update/{id}") public String updateForm(@PathVariable("id") Long id, Model model) { model.addAttribute("task", taskService.getTask(id)); - return "taskForm"; + return "task/taskForm"; } @RequestMapping(value = "save/{id}") diff --git a/examples/quickstart/src/main/resources/applicationContext.xml b/examples/quickstart/src/main/resources/applicationContext.xml index 602ae727..139705c9 100644 --- a/examples/quickstart/src/main/resources/applicationContext.xml +++ b/examples/quickstart/src/main/resources/applicationContext.xml @@ -84,8 +84,7 @@ + classpath*:/application.development.properties" /> diff --git a/examples/quickstart/src/main/resources/sql/h2/schema.sql b/examples/quickstart/src/main/resources/sql/h2/schema.sql index caa1c01e..7bc063ed 100644 --- a/examples/quickstart/src/main/resources/sql/h2/schema.sql +++ b/examples/quickstart/src/main/resources/sql/h2/schema.sql @@ -4,7 +4,8 @@ drop table if exists ss_user; create table ss_task ( id bigint generated by default as identity, - title varchar(255) not null, + title varchar(128) not null, + description varchar(255), user_id bigint, primary key (id) ); diff --git a/examples/quickstart/src/main/webapp/WEB-INF/views/login.jsp b/examples/quickstart/src/main/webapp/WEB-INF/views/account/login.jsp similarity index 100% rename from examples/quickstart/src/main/webapp/WEB-INF/views/login.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/views/account/login.jsp diff --git a/examples/quickstart/src/main/webapp/WEB-INF/views/taskForm.jsp b/examples/quickstart/src/main/webapp/WEB-INF/views/task/taskForm.jsp similarity index 79% rename from examples/quickstart/src/main/webapp/WEB-INF/views/taskForm.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/views/task/taskForm.jsp index d8ece71c..d50132c5 100644 --- a/examples/quickstart/src/main/webapp/WEB-INF/views/taskForm.jsp +++ b/examples/quickstart/src/main/webapp/WEB-INF/views/task/taskForm.jsp @@ -22,11 +22,17 @@
管理任务
- +
+
+ +
+ +
+
  diff --git a/examples/quickstart/src/main/webapp/WEB-INF/views/taskList.jsp b/examples/quickstart/src/main/webapp/WEB-INF/views/task/taskList.jsp similarity index 92% rename from examples/quickstart/src/main/webapp/WEB-INF/views/taskList.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/views/task/taskList.jsp index 7ca4a20d..1a81507a 100644 --- a/examples/quickstart/src/main/webapp/WEB-INF/views/taskList.jsp +++ b/examples/quickstart/src/main/webapp/WEB-INF/views/task/taskList.jsp @@ -12,7 +12,7 @@ - + diff --git a/examples/quickstart/src/test/resources/data/import-data.sql b/examples/quickstart/src/test/resources/data/import-data.sql index 74de5b40..60c61007 100644 --- a/examples/quickstart/src/test/resources/data/import-data.sql +++ b/examples/quickstart/src/test/resources/data/import-data.sql @@ -1,6 +1,7 @@ -insert into SS_TASK (ID,TITLE,USER_ID) values(1, 'Study PlayFramework 2.0',1); -insert into SS_TASK (ID,TITLE,USER_ID) values(2, 'Study Grails 2.0',1); -insert into SS_TASK (ID,TITLE,USER_ID) values(3, 'Try SpringFuse',1); -insert into SS_TASK (ID,TITLE,USER_ID) values(4, 'Try Spring Roo',1); -insert into SS_TASK (ID,TITLE,USER_ID) values(5, 'Release SprignSide 4.0',1); -insert into SS_USER (ID,LOGIN_NAME,NAME,PASSWORD,SALT) values(1,'user','Calvin','2488aa0c31c624687bd9928e0a5d29e7d1ed520b','6d65d24122c30500'); \ No newline at end of file +insert into SS_TASK (ID, TITLE, DESCRIPTION, USER_ID) values(1, 'Study PlayFramework 2.0','http://www.playframework.org/', 1); +insert into SS_TASK (ID, TITLE, DESCRIPTION, USER_ID) values(2, 'Study Grails 2.0','http://www.grails.org/', 1); +insert into SS_TASK (ID, TITLE, DESCRIPTION, USER_ID) values(3, 'Try SpringFuse','http://www.springfuse.com/', 1); +insert into SS_TASK (ID, TITLE, DESCRIPTION, USER_ID) values(4, 'Try Spring Roo','http://www.springsource.org/spring-roo', 1); +insert into SS_TASK (ID, TITLE, DESCRIPTION, USER_ID) values(5, 'Release SpringSide 4.0','As soon as posibble', 1); + +insert into SS_USER (ID, LOGIN_NAME, NAME, PASSWORD, SALT) values(1,'user','Calvin','2488aa0c31c624687bd9928e0a5d29e7d1ed520b','6d65d24122c30500'); \ No newline at end of file diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml index 74a8d81c..6abbe4c2 100644 --- a/examples/showcase/pom.xml +++ b/examples/showcase/pom.xml @@ -495,19 +495,15 @@ maven-antrun-plugin - - - - - + + src="src/main/resources/sql/h2/quartz.sql" onerror="continue"> diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml index 2d63d375..0f4953b4 100644 --- a/examples/showcase/src/main/resources/applicationContext.xml +++ b/examples/showcase/src/main/resources/applicationContext.xml @@ -106,8 +106,7 @@ + classpath*:/application.development.properties" /> @@ -130,8 +129,7 @@ + location="classpath*:/application.properties" />
任务标题管理
任务管理