From c3d7000ff136314634421159969985526f180b47 Mon Sep 17 00:00:00 2001 From: Dheeraj-Baluja Date: Sat, 5 Jul 2014 01:18:51 +0530 Subject: [PATCH 1/2] Formatting done and renamed the project correctly --- .../WebContent/META-INF/MANIFEST.MF | 0 .../WebContent/WEB-INF/dispatcher-servlet.xml | 0 .../WebContent/WEB-INF/views/employeeAdded.jsp | 0 .../WebContent/WEB-INF/views/employeeHome.jsp | 0 .../WebContent/WEB-INF/views/error.jsp | 0 .../WebContent/WEB-INF/web.xml | 0 {SpringMVCFormExample => spring-mvc-forms}/WebContent/index.jsp | 0 .../src/com/demo/controllers/EmployeeController.java | 0 .../src/com/demo/form/Employee.java | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {SpringMVCFormExample => spring-mvc-forms}/WebContent/META-INF/MANIFEST.MF (100%) rename {SpringMVCFormExample => spring-mvc-forms}/WebContent/WEB-INF/dispatcher-servlet.xml (100%) rename {SpringMVCFormExample => spring-mvc-forms}/WebContent/WEB-INF/views/employeeAdded.jsp (100%) rename {SpringMVCFormExample => spring-mvc-forms}/WebContent/WEB-INF/views/employeeHome.jsp (100%) rename {SpringMVCFormExample => spring-mvc-forms}/WebContent/WEB-INF/views/error.jsp (100%) rename {SpringMVCFormExample => spring-mvc-forms}/WebContent/WEB-INF/web.xml (100%) rename {SpringMVCFormExample => spring-mvc-forms}/WebContent/index.jsp (100%) rename {SpringMVCFormExample => spring-mvc-forms}/src/com/demo/controllers/EmployeeController.java (100%) rename {SpringMVCFormExample => spring-mvc-forms}/src/com/demo/form/Employee.java (100%) diff --git a/SpringMVCFormExample/WebContent/META-INF/MANIFEST.MF b/spring-mvc-forms/WebContent/META-INF/MANIFEST.MF similarity index 100% rename from SpringMVCFormExample/WebContent/META-INF/MANIFEST.MF rename to spring-mvc-forms/WebContent/META-INF/MANIFEST.MF diff --git a/SpringMVCFormExample/WebContent/WEB-INF/dispatcher-servlet.xml b/spring-mvc-forms/WebContent/WEB-INF/dispatcher-servlet.xml similarity index 100% rename from SpringMVCFormExample/WebContent/WEB-INF/dispatcher-servlet.xml rename to spring-mvc-forms/WebContent/WEB-INF/dispatcher-servlet.xml diff --git a/SpringMVCFormExample/WebContent/WEB-INF/views/employeeAdded.jsp b/spring-mvc-forms/WebContent/WEB-INF/views/employeeAdded.jsp similarity index 100% rename from SpringMVCFormExample/WebContent/WEB-INF/views/employeeAdded.jsp rename to spring-mvc-forms/WebContent/WEB-INF/views/employeeAdded.jsp diff --git a/SpringMVCFormExample/WebContent/WEB-INF/views/employeeHome.jsp b/spring-mvc-forms/WebContent/WEB-INF/views/employeeHome.jsp similarity index 100% rename from SpringMVCFormExample/WebContent/WEB-INF/views/employeeHome.jsp rename to spring-mvc-forms/WebContent/WEB-INF/views/employeeHome.jsp diff --git a/SpringMVCFormExample/WebContent/WEB-INF/views/error.jsp b/spring-mvc-forms/WebContent/WEB-INF/views/error.jsp similarity index 100% rename from SpringMVCFormExample/WebContent/WEB-INF/views/error.jsp rename to spring-mvc-forms/WebContent/WEB-INF/views/error.jsp diff --git a/SpringMVCFormExample/WebContent/WEB-INF/web.xml b/spring-mvc-forms/WebContent/WEB-INF/web.xml similarity index 100% rename from SpringMVCFormExample/WebContent/WEB-INF/web.xml rename to spring-mvc-forms/WebContent/WEB-INF/web.xml diff --git a/SpringMVCFormExample/WebContent/index.jsp b/spring-mvc-forms/WebContent/index.jsp similarity index 100% rename from SpringMVCFormExample/WebContent/index.jsp rename to spring-mvc-forms/WebContent/index.jsp diff --git a/SpringMVCFormExample/src/com/demo/controllers/EmployeeController.java b/spring-mvc-forms/src/com/demo/controllers/EmployeeController.java similarity index 100% rename from SpringMVCFormExample/src/com/demo/controllers/EmployeeController.java rename to spring-mvc-forms/src/com/demo/controllers/EmployeeController.java diff --git a/SpringMVCFormExample/src/com/demo/form/Employee.java b/spring-mvc-forms/src/com/demo/form/Employee.java similarity index 100% rename from SpringMVCFormExample/src/com/demo/form/Employee.java rename to spring-mvc-forms/src/com/demo/form/Employee.java From 8434f826e6a631409bdc9fbd705c4240fd7c5207 Mon Sep 17 00:00:00 2001 From: Dheeraj-Baluja Date: Sat, 5 Jul 2014 01:27:10 +0530 Subject: [PATCH 2/2] Formatted the code --- .../WebContent/WEB-INF/views/employeeHome.jsp | 2 +- spring-mvc-forms/WebContent/WEB-INF/web.xml | 31 +++++++------- .../demo/controllers/EmployeeController.java | 29 +++++++------ .../src/com/demo/form/Employee.java | 42 +++++++++---------- 4 files changed, 53 insertions(+), 51 deletions(-) diff --git a/spring-mvc-forms/WebContent/WEB-INF/views/employeeHome.jsp b/spring-mvc-forms/WebContent/WEB-INF/views/employeeHome.jsp index f86fc19146..497eade8c7 100644 --- a/spring-mvc-forms/WebContent/WEB-INF/views/employeeHome.jsp +++ b/spring-mvc-forms/WebContent/WEB-INF/views/employeeHome.jsp @@ -12,7 +12,7 @@

Welcome, Enter The Employee Details

- diff --git a/spring-mvc-forms/WebContent/WEB-INF/web.xml b/spring-mvc-forms/WebContent/WEB-INF/web.xml index 47dd114f2a..4c122670e5 100644 --- a/spring-mvc-forms/WebContent/WEB-INF/web.xml +++ b/spring-mvc-forms/WebContent/WEB-INF/web.xml @@ -1,16 +1,19 @@ - - SpringMVCFormExample - - dispatcher - org.springframework.web.servlet.DispatcherServlet - 1 - - - dispatcher - / - - - index.jsp - + + SpringMVCFormExample + + dispatcher + org.springframework.web.servlet.DispatcherServlet + + 1 + + + dispatcher + / + + + index.jsp + \ No newline at end of file diff --git a/spring-mvc-forms/src/com/demo/controllers/EmployeeController.java b/spring-mvc-forms/src/com/demo/controllers/EmployeeController.java index d4bc8e44ad..1dd76ae23f 100644 --- a/spring-mvc-forms/src/com/demo/controllers/EmployeeController.java +++ b/spring-mvc-forms/src/com/demo/controllers/EmployeeController.java @@ -15,20 +15,19 @@ import com.demo.form.Employee; @Controller public class EmployeeController { - @RequestMapping(value = "/employee", method = RequestMethod.GET) - public ModelAndView showForm() { - return new ModelAndView("employeeHome", "employee", new Employee()); - } + @RequestMapping(value = "/employee", method = RequestMethod.GET) + public ModelAndView showForm() { + return new ModelAndView("employeeHome", "employee", new Employee()); + } - @RequestMapping(value = "/addEmployee", method = RequestMethod.POST) - public String submit(@Valid @ModelAttribute("employee")Employee employee, BindingResult result, - ModelMap model) { - if (result.hasErrors()) { - return "error"; - } - model.addAttribute("name", employee.getName()); - model.addAttribute("contactNumber", employee.getContactNumber()); - model.addAttribute("id", employee.getId()); - return "employeeAdded"; - } + @RequestMapping(value = "/addEmployee", method = RequestMethod.POST) + public String submit(@Valid @ModelAttribute("employee") Employee employee, BindingResult result, ModelMap model) { + if (result.hasErrors()) { + return "error"; + } + model.addAttribute("name", employee.getName()); + model.addAttribute("contactNumber", employee.getContactNumber()); + model.addAttribute("id", employee.getId()); + return "employeeAdded"; + } } diff --git a/spring-mvc-forms/src/com/demo/form/Employee.java b/spring-mvc-forms/src/com/demo/form/Employee.java index cf7fb574cf..569347b628 100644 --- a/spring-mvc-forms/src/com/demo/form/Employee.java +++ b/spring-mvc-forms/src/com/demo/form/Employee.java @@ -2,32 +2,32 @@ package com.demo.form; public class Employee { - private String name; - private long id; - private String contactNumber; + private String name; + private long id; + private String contactNumber; - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public long getId() { - return id; - } + public long getId() { + return id; + } - public void setId(long id) { - this.id = id; - } + public void setId(long id) { + this.id = id; + } - public String getContactNumber() { - return contactNumber; - } + public String getContactNumber() { + return contactNumber; + } - public void setContactNumber(String contactNumber) { - this.contactNumber = contactNumber; - } + public void setContactNumber(String contactNumber) { + this.contactNumber = contactNumber; + } }