From aeeeace8a2276516960bc9b99a46f13a41bcccd0 Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Wed, 9 Jan 2013 21:37:28 +0800
Subject: [PATCH] renaming controllers so they all have 'Controller' suffix
---
.../{AddOwnerForm.java => AddOwnerController.java} | 4 ++--
.../web/{AddPetForm.java => AddPetController.java} | 4 ++--
.../{AddVisitForm.java => AddVisitController.java} | 4 ++--
.../{EditOwnerForm.java => EditOwnerController.java} | 4 ++--
.../web/{EditPetForm.java => EditPetController.java} | 4 ++--
...FindOwnersForm.java => FindOwnersController.java} | 4 ++--
src/main/resources/log4j.xml | 4 ++++
src/main/webapp/resources/html/tutorial.html | 12 ++++++------
8 files changed, 22 insertions(+), 18 deletions(-)
rename src/main/java/org/springframework/samples/petclinic/web/{AddOwnerForm.java => AddOwnerController.java} (95%)
rename src/main/java/org/springframework/samples/petclinic/web/{AddPetForm.java => AddPetController.java} (96%)
rename src/main/java/org/springframework/samples/petclinic/web/{AddVisitForm.java => AddVisitController.java} (96%)
rename src/main/java/org/springframework/samples/petclinic/web/{EditOwnerForm.java => EditOwnerController.java} (96%)
rename src/main/java/org/springframework/samples/petclinic/web/{EditPetForm.java => EditPetController.java} (96%)
rename src/main/java/org/springframework/samples/petclinic/web/{FindOwnersForm.java => FindOwnersController.java} (96%)
diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java b/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
similarity index 95%
rename from src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
index cd830af..0f2575c 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
@@ -27,13 +27,13 @@ import org.springframework.web.bind.support.SessionStatus;
@Controller
@RequestMapping("/owners/new")
@SessionAttributes(types = Owner.class)
-public class AddOwnerForm {
+public class AddOwnerController {
private final Clinic clinic;
@Autowired
- public AddOwnerForm(Clinic clinic) {
+ public AddOwnerController(Clinic clinic) {
this.clinic = clinic;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java b/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
index 586cf3d..314b301 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
@@ -32,13 +32,13 @@ import org.springframework.web.bind.support.SessionStatus;
@Controller
@RequestMapping("/owners/{ownerId}/pets/new")
@SessionAttributes("pet")
-public class AddPetForm {
+public class AddPetController {
private final Clinic clinic;
@Autowired
- public AddPetForm(Clinic clinic) {
+ public AddPetController(Clinic clinic) {
this.clinic = clinic;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java b/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
index 6836864..9312568 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
@@ -29,13 +29,13 @@ import org.springframework.web.bind.support.SessionStatus;
@Controller
@RequestMapping("/owners/*/pets/{petId}/visits/new")
@SessionAttributes("visit")
-public class AddVisitForm {
+public class AddVisitController {
private final Clinic clinic;
@Autowired
- public AddVisitForm(Clinic clinic) {
+ public AddVisitController(Clinic clinic) {
this.clinic = clinic;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java b/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
index 0b65de5..e602f75 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
@@ -27,13 +27,13 @@ import org.springframework.web.bind.support.SessionStatus;
@Controller
@RequestMapping("/owners/{ownerId}/edit")
@SessionAttributes(types = Owner.class)
-public class EditOwnerForm {
+public class EditOwnerController {
private final Clinic clinic;
@Autowired
- public EditOwnerForm(Clinic clinic) {
+ public EditOwnerController(Clinic clinic) {
this.clinic = clinic;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java b/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
index 1a7fd6e..c7703c1 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
@@ -30,13 +30,13 @@ import org.springframework.web.bind.support.SessionStatus;
@Controller
@RequestMapping("/owners/*/pets/{petId}/edit")
@SessionAttributes("pet")
-public class EditPetForm {
+public class EditPetController {
private final Clinic clinic;
@Autowired
- public EditPetForm(Clinic clinic) {
+ public EditPetController(Clinic clinic) {
this.clinic = clinic;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java b/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
index eb93fab..13d9eb1 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
@@ -23,13 +23,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
* @author Arjen Poutsma
*/
@Controller
-public class FindOwnersForm {
+public class FindOwnersController {
private final Clinic clinic;
@Autowired
- public FindOwnersForm(Clinic clinic) {
+ public FindOwnersController(Clinic clinic) {
this.clinic = clinic;
}
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
index 13330e6..56c78c7 100755
--- a/src/main/resources/log4j.xml
+++ b/src/main/resources/log4j.xml
@@ -15,6 +15,10 @@
<level value="DEBUG" />
</logger>
+ <logger name="org.springframework.web">
+ <level value="DEBUG" />
+ </logger>
+
<!-- Root Logger -->
diff --git a/src/main/webapp/resources/html/tutorial.html b/src/main/webapp/resources/html/tutorial.html
index acc261f..40652fe 100644
--- a/src/main/webapp/resources/html/tutorial.html
+++ b/src/main/webapp/resources/html/tutorial.html
@@ -819,32 +819,32 @@
that is used to handle simple display-oriented URLs.
</li>
<li>
- <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.FindOwnersForm</span>
+ <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.FindOwnersController</span>
is an annotation-driven, POJO <em>Form</em> controller that is used to search for
<strong>Owner</strong>s by last name.
</li>
<li>
- <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddOwnerForm</span>
+ <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddOwnerController</span>
is an annotation-driven, POJO <em>Form</em> controller that is used to add a new <strong>Owner</strong>
to the system.
</li>
<li>
- <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditOwnerForm</span>
+ <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditOwnerController</span>
is an annotation-driven, POJO <em>Form</em> controller that is used to edit an existing <strong>Owner</strong>.
A copy of the existing <strong>Owner</strong> is used for editing.
</li>
<li>
- <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddPetForm</span>
+ <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddPetController</span>
is an annotation-driven, POJO <em>Form</em> controller that is used to add a new <strong>Pet</strong>
to an existing <strong>Owner</strong>.
</li>
<li>
- <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditPetForm</span>
+ <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditPetController</span>
is an annotation-driven, POJO <em>Form</em> controller that is used to edit an existing <strong>Pet</strong>.
A copy of the existing <strong>Pet</strong> is used for editing.
</li>
<li>
- <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddVisitForm</span>
+ <span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddVisitController</span>
is an annotation-driven, POJO <em>Form</em> controller that is used to add a new <strong>Visit</strong>
to an existing <strong>Pet</strong>.
</li>
--
GitLab