3 13 fix servlet

lexbat · lexbat · commit 83631eedcd9e · 2017-04-09T17:46:24.000+03:00
diff --git a/src/main/java/ru/javawebinar/topjava/AuthorizedUser.java b/src/main/java/ru/javawebinar/topjava/AuthorizedUser.java
@@ -1,9 +1,11 @@
 package ru.javawebinar.topjava;
 
+import ru.javawebinar.topjava.model.BaseEntity;
+
 import static ru.javawebinar.topjava.util.MealsUtil.DEFAULT_CALORIES_PER_DAY;
 
 public class AuthorizedUser {
-    public static int id = 1;
+    public static int id = BaseEntity.START_SEQ;
 
     public static int id() {
         return id;
diff --git a/src/main/java/ru/javawebinar/topjava/web/MealServlet.java b/src/main/java/ru/javawebinar/topjava/web/MealServlet.java
@@ -29,7 +29,7 @@ public class MealServlet extends HttpServlet {
     @Override
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
-        springContext = new ClassPathXmlApplicationContext("spring/spring-app.xml");
+        springContext = new ClassPathXmlApplicationContext("spring/spring-app.xml", "spring/spring-db.xml");
         mealController = springContext.getBean(MealRestController.class);
     }
 
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -10,8 +10,8 @@ <h3>Проект <a href="https://github.com/JavaWebinar/topjava10" target="_bla
 <form method="post" action="users">
     <b>Meal list of&nbsp;</b>
     <select name="userId">
-        <option value="1">User</option>
-        <option value="2">Admin</option>
+        <option value="100000">User</option>
+        <option value="100001">Admin</option>
     </select>
     <button type="submit">Select</button>
 </form>

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class MealServlet extends HttpServlet {`
`29`	`29`	`@Override`
`30`	`30`	`public void init(ServletConfig config) throws ServletException {`
`31`	`31`	`super.init(config);`
`32`		`- springContext = new ClassPathXmlApplicationContext("spring/spring-app.xml");`
	`32`	`+ springContext = new ClassPathXmlApplicationContext("spring/spring-app.xml", "spring/spring-db.xml");`
`33`	`33`	`mealController = springContext.getBean(MealRestController.class);`
`34`	`34`	`}`
`35`	`35`