refactoring: moved JSPs into subdirectories for admin

Author: phasenraum2010

src/main/java/org/woehlke/greenshop/admin/web/catalog/CategoryAndProductController.java

@@ -64,7 +64,7 @@ public String rootCategories(Model model){
         logger.info("################################################");
         logger.info(rootCategories.toString());
         logger.info("################################################");
-        return "admin/categories";
+        return "admin/catalog/categories";
     }
 
     @RequestMapping(value = "/admin/categories/{categoryId}/parent/{parentId}/product/{productId}", method = RequestMethod.GET)
@@ -76,7 +76,7 @@ public String rootCategoryId(
         int menuCategory = AdminMenuCategory.CATALOG.ordinal();
         model.addAttribute("menuCategory",menuCategory);
         performCategoryAndProduct(categoryId, parentId, productId, model);
-        return "admin/categories";
+        return "admin/catalog/categories";
     }
 
     @RequestMapping(value = "/admin/categories/{categoryId}/parent/{parentId}/product/{productId}/setActive", method = RequestMethod.GET)
@@ -89,7 +89,7 @@ public String rootCategoryIdSetActive(
         model.addAttribute("menuCategory",menuCategory);
         productService.setProductActive(productId);
         performCategoryAndProduct(categoryId, parentId, productId,model);
-        return "admin/categories";
+        return "admin/catalog/categories";
     }
 
     @RequestMapping(value = "/admin/categories/{categoryId}/parent/{parentId}/product/{productId}/setInactive", method = RequestMethod.GET)
@@ -102,7 +102,7 @@ public String rootCategoryIdSetInactive(
         model.addAttribute("menuCategory",menuCategory);
         productService.setProductInactive(productId);
         performCategoryAndProduct(categoryId, parentId, productId,model);
-        return "admin/categories";
+        return "admin/catalog/categories";
     }
 
     private void performCategoryAndProduct(

src/main/java/org/woehlke/greenshop/admin/web/catalog/ManufacturerController.java

@@ -39,7 +39,7 @@ public String manufacturers(Model model){
         }
         model.addAttribute("thisManufacturer",thisManufacturer);
         model.addAttribute("productsOfThisManufacturer",productsOfThisManufacturer);
-        return "admin/manufacturers";
+        return "admin/catalog/manufacturers";
     }
 
     @RequestMapping(value = "/admin/manufacturers/{manufacturerId}", method = RequestMethod.GET)
@@ -57,6 +57,6 @@ public String manufacturersId(
         }
         model.addAttribute("thisManufacturer",thisManufacturer);
         model.addAttribute("productsOfThisManufacturer",productsOfThisManufacturer);
-        return "admin/manufacturers";
+        return "admin/catalog/manufacturers";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/catalog/ReviewController.java

@@ -42,7 +42,7 @@ public String reviews(Model model){
         model.addAttribute("thisReview",thisReview);
         int averageRating = thisReview.getReview().getReview().getRating();
         model.addAttribute("averageRating",averageRating);
-        return "admin/reviews";
+        return "admin/catalog/reviews";
     }
 
     @RequestMapping(value = "/admin/reviews/{reviewId}", method = RequestMethod.GET)
@@ -59,7 +59,7 @@ public String reviewsId(@PathVariable long reviewId,Model model){
         model.addAttribute("thisReview",thisReview);
         int averageRating = thisReview.getReview().getReview().getRating();
         model.addAttribute("averageRating",averageRating);
-        return "admin/reviews";
+        return "admin/catalog/reviews";
     }
 
     @RequestMapping(value = "/admin/reviews/setInactive/{reviewId}", method = RequestMethod.GET)
@@ -77,7 +77,7 @@ public String reviewsSetInactive(@PathVariable long reviewId,Model model){
         model.addAttribute("reviews",reviews);
         int averageRating = thisReview.getReview().getReview().getRating();
         model.addAttribute("averageRating",averageRating);
-        return "admin/reviews";
+        return "admin/catalog/reviews";
     }
 
     @RequestMapping(value = "/admin/reviews/setActive/{reviewId}", method = RequestMethod.GET)
@@ -95,6 +95,6 @@ public String reviewsSetActive(@PathVariable long reviewId,Model model){
         model.addAttribute("reviews",reviews);
         int averageRating = thisReview.getReview().getReview().getRating();
         model.addAttribute("averageRating",averageRating);
-        return "admin/reviews";
+        return "admin/catalog/reviews";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/catalog/SpecialController.java

@@ -39,7 +39,7 @@ public String specials(Model model){
             thisSpecial = specials.iterator().next();
         }
         model.addAttribute("thisSpecial",thisSpecial);
-        return "admin/specials";
+        return "admin/catalog/specials";
     }
 
     @RequestMapping(value = "/admin/specials/{productId}", method = RequestMethod.GET)
@@ -54,7 +54,7 @@ public String specialsId(@PathVariable long productId,Model model){
             thisSpecial = specialService.findSpecialProductById(productId, language);
         }
         model.addAttribute("thisSpecial",thisSpecial);
-        return "admin/specials";
+        return "admin/catalog/specials";
     }
 
     @RequestMapping(value = "/admin/specials/setInactive/{productId}", method = RequestMethod.GET)
@@ -71,7 +71,7 @@ public String specialSetInactive(@PathVariable long productId,Model model){
         model.addAttribute("thisSpecial",thisSpecial);
         List<SpecialProduct> specials = specialService.getSpecialProducts(language);
         model.addAttribute("specials",specials);
-        return "admin/specials";
+        return "admin/catalog/specials";
     }
 
     @RequestMapping(value = "/admin/specials/setActive/{productId}", method = RequestMethod.GET)
@@ -88,6 +88,6 @@ public String specialSetActive(@PathVariable long productId,Model model){
         model.addAttribute("thisSpecial",thisSpecial);
         List<SpecialProduct> specials = specialService.getSpecialProducts(language);
         model.addAttribute("specials",specials);
-        return "admin/specials";
+        return "admin/catalog/specials";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/configuration/AdministratorController.java

@@ -39,7 +39,7 @@ public String administrators(Model model){
             thisAdministrator = administrators.iterator().next();
         }
         model.addAttribute("thisAdministrator",thisAdministrator);
-        return "admin/administrators";
+        return "admin/configuration/administrators";
     }
 
     @RequestMapping(value = "/admin/administrators/{administratorId}", method = RequestMethod.GET)
@@ -51,6 +51,6 @@ public String administratorId(
         model.addAttribute("thisAdministrator",thisAdministrator);
         List<Administrator> administrators = administratorService.findAllAdministrators();
         model.addAttribute("administrators",administrators);
-        return "admin/administrators";
+        return "admin/configuration/administrators";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/customer/CustomerController.java

@@ -35,7 +35,7 @@ public String customers(Model model){
         }
         model.addAttribute("thisCustomer",thisCustomer);
         model.addAttribute("thisCustomersNumberOfReviews",thisCustomersNumberOfReviews);
-        return "admin/customers";
+        return "admin/customer/customers";
     }
 
     @RequestMapping(value = "/admin/customers/{customerId}", method = RequestMethod.GET)
@@ -48,6 +48,6 @@ public String customerId(@PathVariable long customerId, Model model){
         int thisCustomersNumberOfReviews = customerService.getNumberOfReviewsForCustomer(thisCustomer.getCustomer());
         model.addAttribute("thisCustomer",thisCustomer);
         model.addAttribute("thisCustomersNumberOfReviews",thisCustomersNumberOfReviews);
-        return "admin/customers";
+        return "admin/customer/customers";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/customer/OrderController.java

@@ -38,7 +38,7 @@ public String orders(Model model){
             thisOrder = orders.iterator().next();
         }
         model.addAttribute("thisOrder",thisOrder);
-        return "admin/orders";
+        return "admin/customer/orders";
     }
 
     @RequestMapping(value = "/admin/orders/{orderId}", method = RequestMethod.GET)
@@ -50,6 +50,6 @@ public String orderId(@PathVariable long orderId, Model model){
         model.addAttribute("orders",orders);
         OrderAdminBean thisOrder = orderService.findOrderById(orderId,language);
         model.addAttribute("thisOrder",thisOrder);
-        return "admin/orders";
+        return "admin/customer/orders";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/localization/CurrencyController.java

@@ -16,6 +16,6 @@ public class CurrencyController {
     public String currencies(Model model){
         int menuCategory = AdminMenuCategory.LOCALISATION.ordinal();
         model.addAttribute("menuCategory",menuCategory);
-        return "admin/currencies";
+        return "admin/localization/currencies";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/localization/LanguageController.java

@@ -32,7 +32,7 @@ public String languages(Model model){
             thisLanguage = languages.iterator().next();
         }
         model.addAttribute("thisLanguage",thisLanguage);
-        return "admin/languages";
+        return "admin/localization/languages";
     }
 
     @RequestMapping(value = "/admin/languages/{languageId}", method = RequestMethod.GET)
@@ -43,6 +43,6 @@ public String languageId(@PathVariable long languageId, Model model){
         model.addAttribute("languages", languages);
         Language thisLanguage = languageService.findLanguageById(languageId);
         model.addAttribute("thisLanguage",thisLanguage);
-        return "admin/languages";
+        return "admin/localization/languages";
     }
 }

src/main/java/org/woehlke/greenshop/admin/web/localization/OrderStatusController.java

@@ -39,7 +39,7 @@ public String ordersStatus(Model model){
             thisOrderStatus =  orderStatuses.iterator().next();
         }
         model.addAttribute("thisOrderStatus",thisOrderStatus);
-        return "admin/ordersStatus";
+        return "admin/localization/ordersStatus";
     }
 
     @RequestMapping(value = "/admin/ordersStatus/{ordersStatusId}", method = RequestMethod.GET)
@@ -54,6 +54,6 @@ public String ordersStatusId(@PathVariable long ordersStatusId, Model model){
         thisOrderStatusId.setLanguage(language);
         OrderStatus thisOrderStatus = orderService.findOrderStatusById(thisOrderStatusId);
         model.addAttribute("thisOrderStatus",thisOrderStatus);
-        return "admin/ordersStatus";
+        return "admin/localization/ordersStatus";
     }
 }