topjava/3_13_fix_servlet.patch at master · AlbertoJava/topjava · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Index: src/main/java/ru/javawebinar/topjava/web/MealServlet.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/web/MealServlet.java	(date 1531055160000)
+++ src/main/java/ru/javawebinar/topjava/web/MealServlet.java	(date 1531055373733)
@@ -28,7 +28,7 @@
     @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);
     }

Index: src/main/java/ru/javawebinar/topjava/web/SecurityUtil.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/web/SecurityUtil.java	(date 1531055160000)
+++ src/main/java/ru/javawebinar/topjava/web/SecurityUtil.java	(date 1531055471005)
@@ -1,10 +1,12 @@
 package ru.javawebinar.topjava.web;

+import ru.javawebinar.topjava.model.AbstractBaseEntity;
+
 import static ru.javawebinar.topjava.util.MealsUtil.DEFAULT_CALORIES_PER_DAY;

 public class SecurityUtil {

-    private static int id = 1;
+    private static int id = AbstractBaseEntity.START_SEQ;

     public static int authUserId() {
         return id;
Index: src/main/webapp/index.html
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/webapp/index.html	(date 1531055160000)
+++ src/main/webapp/index.html	(date 1531055373749)
@@ -9,8 +9,8 @@
 <form method="post" action="users">
     <b>Meals 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>