alizalang 6 лет назад
Родитель
Сommit
bbee810815
36 измененных файлов: 1033 добавлений и 886 удалений
  1. Двоичные данные
      .DS_Store
  2. 394
    12
      .idea/workspace.xml
  3. Двоичные данные
      ZipTeamOrange/.DS_Store
  4. 25
    0
      ZipTeamOrange/.gitignore
  5. 4
    1
      ZipTeamOrange/.idea/compiler.xml
  6. 2
    3
      ZipTeamOrange/.idea/misc.xml
  7. 0
    124
      ZipTeamOrange/.idea/uiDesigner.xml
  8. 99
    604
      ZipTeamOrange/.idea/workspace.xml
  9. Двоичные данные
      ZipTeamOrange/.mvn/wrapper/maven-wrapper.jar
  10. 1
    0
      ZipTeamOrange/.mvn/wrapper/maven-wrapper.properties
  11. 0
    50
      ZipTeamOrange/Middleteir.uml
  12. 225
    0
      ZipTeamOrange/mvnw
  13. 143
    0
      ZipTeamOrange/mvnw.cmd
  14. 54
    61
      ZipTeamOrange/pom.xml
  15. Двоичные данные
      ZipTeamOrange/src/.DS_Store
  16. Двоичные данные
      ZipTeamOrange/src/main/.DS_Store
  17. Двоичные данные
      ZipTeamOrange/src/main/java/.DS_Store
  18. 0
    6
      ZipTeamOrange/src/main/java/Controller.java
  19. 0
    18
      ZipTeamOrange/src/main/java/MessageController.java
  20. 0
    7
      ZipTeamOrange/src/main/java/MessageRepository.java
  21. Двоичные данные
      ZipTeamOrange/src/main/java/com/.DS_Store
  22. 0
    0
      ZipTeamOrange/src/main/java/com/Chat.java
  23. 0
    0
      ZipTeamOrange/src/main/java/com/ChatController.java
  24. 0
    0
      ZipTeamOrange/src/main/java/com/ChatRepository.java
  25. 7
    0
      ZipTeamOrange/src/main/java/com/Controller.java
  26. 0
    0
      ZipTeamOrange/src/main/java/com/Main.java
  27. 7
    0
      ZipTeamOrange/src/main/java/com/Message.java
  28. 33
    0
      ZipTeamOrange/src/main/java/com/MessageController.java
  29. 11
    0
      ZipTeamOrange/src/main/java/com/MessageRepository.java
  30. 0
    0
      ZipTeamOrange/src/main/java/com/User.java
  31. 0
    0
      ZipTeamOrange/src/main/java/com/UserController.java
  32. 0
    0
      ZipTeamOrange/src/main/java/com/UserRepository.java
  33. Двоичные данные
      ZipTeamOrange/src/main/java/com/example/.DS_Store
  34. 12
    0
      ZipTeamOrange/src/main/java/com/example/demo/DemoApplication.java
  35. 0
    0
      ZipTeamOrange/src/main/resources/application.properties
  36. 16
    0
      ZipTeamOrange/src/test/java/com/example/demo/DemoApplicationTests.java

Двоичные данные
.DS_Store Просмотреть файл


+ 394
- 12
.idea/workspace.xml Просмотреть файл

@@ -1,7 +1,15 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="b17f0c7b-7b15-4e2a-9434-f5f9847c8e3b" name="Default" comment="" />
4
+    <list default="true" id="b17f0c7b-7b15-4e2a-9434-f5f9847c8e3b" name="Default" comment="">
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/ZipTeamOrange/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ZipTeamOrange/.idea/workspace.xml" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/ZipTeamOrange/Middleteir.uml" beforeDir="false" afterPath="$PROJECT_DIR$/ZipTeamOrange/Middleteir.uml" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/Controller.java" beforeDir="false" afterPath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/Controller.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageRepository.java" afterDir="false" />
12
+    </list>
5 13
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6 14
     <option name="TRACKING_ENABLED" value="true" />
7 15
     <option name="SHOW_DIALOG" value="false" />
@@ -9,23 +17,72 @@
9 17
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
10 18
     <option name="LAST_RESOLUTION" value="IGNORE" />
11 19
   </component>
20
+  <component name="FileEditorManager">
21
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
22
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
23
+        <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Main.java">
24
+          <provider selected="true" editor-type-id="text-editor">
25
+            <state relative-caret-position="30">
26
+              <caret line="2" selection-start-line="2" selection-end-line="2" />
27
+            </state>
28
+          </provider>
29
+        </entry>
30
+      </file>
31
+      <file leaf-file-name="Message.java" pinned="false" current-in-tab="true">
32
+        <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java">
33
+          <provider selected="true" editor-type-id="text-editor">
34
+            <state relative-caret-position="30">
35
+              <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
36
+            </state>
37
+          </provider>
38
+        </entry>
39
+      </file>
40
+      <file leaf-file-name="MessageController.java" pinned="false" current-in-tab="false">
41
+        <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java">
42
+          <provider selected="true" editor-type-id="text-editor" />
43
+        </entry>
44
+      </file>
45
+      <file leaf-file-name="MessageRepository.java" pinned="false" current-in-tab="false">
46
+        <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageRepository.java">
47
+          <provider selected="true" editor-type-id="text-editor">
48
+            <state>
49
+              <folding>
50
+                <element signature="imports" expanded="true" />
51
+              </folding>
52
+            </state>
53
+          </provider>
54
+        </entry>
55
+      </file>
56
+    </leaf>
57
+  </component>
12 58
   <component name="Git.Settings">
13 59
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
14 60
   </component>
61
+  <component name="IdeDocumentHistory">
62
+    <option name="CHANGED_PATHS">
63
+      <list>
64
+        <option value="$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java" />
65
+      </list>
66
+    </option>
67
+  </component>
15 68
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
16 69
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
17 70
   <component name="JsGulpfileManager">
18 71
     <detection-done>true</detection-done>
19 72
     <sorting>DEFINITION_ORDER</sorting>
20 73
   </component>
74
+  <component name="NodeModulesDirectoryManager">
75
+    <handled-path value="$PROJECT_DIR$/sample/node_modules" />
76
+  </component>
21 77
   <component name="NodePackageJsonFileManager">
22
-    <packageJsonPaths />
78
+    <packageJsonPaths>
79
+      <path value="$PROJECT_DIR$/sample/package.json" />
80
+    </packageJsonPaths>
23 81
   </component>
24 82
   <component name="ProjectFrameBounds">
25
-    <option name="x" value="442" />
26
-    <option name="y" value="115" />
27
-    <option name="width" value="1280" />
28
-    <option name="height" value="709" />
83
+    <option name="y" value="40" />
84
+    <option name="width" value="1368" />
85
+    <option name="height" value="742" />
29 86
   </component>
30 87
   <component name="ProjectView">
31 88
     <navigator proportions="" version="1">
@@ -33,6 +90,8 @@
33 90
     </navigator>
34 91
     <panes>
35 92
       <pane id="PackagesPane" />
93
+      <pane id="Scope" />
94
+      <pane id="AndroidView" />
36 95
       <pane id="ProjectPane">
37 96
         <subPane>
38 97
           <expand>
@@ -40,12 +99,42 @@
40 99
               <item name="ZipTeam" type="b2602c69:ProjectViewProjectNode" />
41 100
               <item name="ZipTeam" type="462c0819:PsiDirectoryNode" />
42 101
             </path>
102
+            <path>
103
+              <item name="ZipTeam" type="b2602c69:ProjectViewProjectNode" />
104
+              <item name="ZipTeam" type="462c0819:PsiDirectoryNode" />
105
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
106
+            </path>
107
+            <path>
108
+              <item name="ZipTeam" type="b2602c69:ProjectViewProjectNode" />
109
+              <item name="ZipTeam" type="462c0819:PsiDirectoryNode" />
110
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
111
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
112
+            </path>
113
+            <path>
114
+              <item name="ZipTeam" type="b2602c69:ProjectViewProjectNode" />
115
+              <item name="ZipTeam" type="462c0819:PsiDirectoryNode" />
116
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
117
+              <item name="src" type="462c0819:PsiDirectoryNode" />
118
+            </path>
119
+            <path>
120
+              <item name="ZipTeam" type="b2602c69:ProjectViewProjectNode" />
121
+              <item name="ZipTeam" type="462c0819:PsiDirectoryNode" />
122
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
123
+              <item name="src" type="462c0819:PsiDirectoryNode" />
124
+              <item name="main" type="462c0819:PsiDirectoryNode" />
125
+            </path>
126
+            <path>
127
+              <item name="ZipTeam" type="b2602c69:ProjectViewProjectNode" />
128
+              <item name="ZipTeam" type="462c0819:PsiDirectoryNode" />
129
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
130
+              <item name="src" type="462c0819:PsiDirectoryNode" />
131
+              <item name="main" type="462c0819:PsiDirectoryNode" />
132
+              <item name="java" type="462c0819:PsiDirectoryNode" />
133
+            </path>
43 134
           </expand>
44 135
           <select />
45 136
         </subPane>
46 137
       </pane>
47
-      <pane id="AndroidView" />
48
-      <pane id="Scope" />
49 138
     </panes>
50 139
   </component>
51 140
   <component name="PropertiesComponent">
@@ -55,7 +144,7 @@
55 144
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
56 145
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
57 146
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
58
-    <property name="project.structure.last.edited" value="Facets" />
147
+    <property name="project.structure.last.edited" value="Project" />
59 148
     <property name="project.structure.proportion" value="0.15" />
60 149
     <property name="project.structure.side.proportion" value="0.2" />
61 150
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
@@ -127,14 +216,22 @@
127 216
       <updated>1531074219472</updated>
128 217
       <workItem from="1531074221218" duration="56000" />
129 218
       <workItem from="1531074452837" duration="81000" />
219
+      <workItem from="1531083634426" duration="4376000" />
220
+      <workItem from="1531145478397" duration="154000" />
221
+      <workItem from="1531152301936" duration="46000" />
222
+      <workItem from="1531152367959" duration="43000" />
223
+      <workItem from="1531183666184" duration="91000" />
224
+      <workItem from="1531246825555" duration="6660000" />
225
+      <workItem from="1531493473232" duration="129000" />
226
+      <workItem from="1531679525061" duration="550000" />
130 227
     </task>
131 228
     <servers />
132 229
   </component>
133 230
   <component name="TimeTrackingManager">
134
-    <option name="totallyTimeSpent" value="137000" />
231
+    <option name="totallyTimeSpent" value="12186000" />
135 232
   </component>
136 233
   <component name="ToolWindowManager">
137
-    <frame x="442" y="115" width="1280" height="709" extended-state="0" />
234
+    <frame x="0" y="40" width="1368" height="742" extended-state="0" />
138 235
     <layout>
139 236
       <window_info anchor="right" id="Palette" order="3" />
140 237
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -149,7 +246,7 @@
149 246
       <window_info anchor="bottom" id="Terminal" order="7" />
150 247
       <window_info id="Capture Tool" order="2" />
151 248
       <window_info id="Designer" order="2" />
152
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
249
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29562595" />
153 250
       <window_info anchor="right" id="Database" order="3" />
154 251
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
155 252
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -171,6 +268,291 @@
171 268
   <component name="VcsContentAnnotationSettings">
172 269
     <option name="myLimit" value="2678400000" />
173 270
   </component>
271
+  <component name="editorHistoryManager">
272
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/pom.xml">
273
+      <provider selected="true" editor-type-id="text-editor" />
274
+    </entry>
275
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/UserController.java">
276
+      <provider selected="true" editor-type-id="text-editor">
277
+        <state relative-caret-position="180">
278
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
279
+        </state>
280
+      </provider>
281
+    </entry>
282
+    <entry file="file://$PROJECT_DIR$/IMG_20180709_105418-2.jpg">
283
+      <provider selected="true" editor-type-id="images" />
284
+    </entry>
285
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Main.java">
286
+      <provider selected="true" editor-type-id="text-editor">
287
+        <state relative-caret-position="30">
288
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
289
+        </state>
290
+      </provider>
291
+    </entry>
292
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/ChatController.java">
293
+      <provider selected="true" editor-type-id="text-editor" />
294
+    </entry>
295
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Controller.java">
296
+      <provider selected="true" editor-type-id="text-editor" />
297
+    </entry>
298
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java">
299
+      <provider selected="true" editor-type-id="text-editor" />
300
+    </entry>
301
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java">
302
+      <provider selected="true" editor-type-id="text-editor" />
303
+    </entry>
304
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/User.java">
305
+      <provider selected="true" editor-type-id="text-editor">
306
+        <state relative-caret-position="405">
307
+          <caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
308
+        </state>
309
+      </provider>
310
+    </entry>
311
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/pom.xml">
312
+      <provider selected="true" editor-type-id="text-editor" />
313
+    </entry>
314
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/UserController.java">
315
+      <provider selected="true" editor-type-id="text-editor">
316
+        <state relative-caret-position="180">
317
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
318
+        </state>
319
+      </provider>
320
+    </entry>
321
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Chat.java">
322
+      <provider selected="true" editor-type-id="text-editor">
323
+        <state relative-caret-position="165">
324
+          <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
325
+        </state>
326
+      </provider>
327
+    </entry>
328
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Main.java">
329
+      <provider selected="true" editor-type-id="text-editor">
330
+        <state relative-caret-position="30">
331
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
332
+        </state>
333
+      </provider>
334
+    </entry>
335
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Chat.java">
336
+      <provider selected="true" editor-type-id="text-editor" />
337
+    </entry>
338
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/ChatController.java">
339
+      <provider selected="true" editor-type-id="text-editor" />
340
+    </entry>
341
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Controller.java">
342
+      <provider selected="true" editor-type-id="text-editor" />
343
+    </entry>
344
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java">
345
+      <provider selected="true" editor-type-id="text-editor" />
346
+    </entry>
347
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java">
348
+      <provider selected="true" editor-type-id="text-editor" />
349
+    </entry>
350
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/User.java">
351
+      <provider selected="true" editor-type-id="text-editor">
352
+        <state relative-caret-position="405">
353
+          <caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
354
+        </state>
355
+      </provider>
356
+    </entry>
357
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/UserController.java">
358
+      <provider selected="true" editor-type-id="text-editor">
359
+        <state relative-caret-position="180">
360
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
361
+        </state>
362
+      </provider>
363
+    </entry>
364
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/pom.xml">
365
+      <provider selected="true" editor-type-id="text-editor" />
366
+    </entry>
367
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Main.java">
368
+      <provider selected="true" editor-type-id="text-editor">
369
+        <state relative-caret-position="30">
370
+          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
371
+        </state>
372
+      </provider>
373
+    </entry>
374
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Chat.java">
375
+      <provider selected="true" editor-type-id="text-editor" />
376
+    </entry>
377
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/ChatController.java">
378
+      <provider selected="true" editor-type-id="text-editor" />
379
+    </entry>
380
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java">
381
+      <provider selected="true" editor-type-id="text-editor" />
382
+    </entry>
383
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java">
384
+      <provider selected="true" editor-type-id="text-editor" />
385
+    </entry>
386
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/User.java">
387
+      <provider selected="true" editor-type-id="text-editor">
388
+        <state relative-caret-position="405">
389
+          <caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
390
+        </state>
391
+      </provider>
392
+    </entry>
393
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/pom.xml">
394
+      <provider selected="true" editor-type-id="text-editor" />
395
+    </entry>
396
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/UserController.java">
397
+      <provider selected="true" editor-type-id="text-editor">
398
+        <state relative-caret-position="180">
399
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
400
+        </state>
401
+      </provider>
402
+    </entry>
403
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Main.java">
404
+      <provider selected="true" editor-type-id="text-editor" />
405
+    </entry>
406
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Chat.java">
407
+      <provider selected="true" editor-type-id="text-editor" />
408
+    </entry>
409
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/ChatController.java">
410
+      <provider selected="true" editor-type-id="text-editor" />
411
+    </entry>
412
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java">
413
+      <provider selected="true" editor-type-id="text-editor" />
414
+    </entry>
415
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java">
416
+      <provider selected="true" editor-type-id="text-editor" />
417
+    </entry>
418
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/User.java">
419
+      <provider selected="true" editor-type-id="text-editor">
420
+        <state relative-caret-position="405">
421
+          <caret line="27" column="27" lean-forward="true" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
422
+        </state>
423
+      </provider>
424
+    </entry>
425
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/pom.xml">
426
+      <provider selected="true" editor-type-id="text-editor" />
427
+    </entry>
428
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/UserController.java">
429
+      <provider selected="true" editor-type-id="text-editor">
430
+        <state relative-caret-position="30">
431
+          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
432
+        </state>
433
+      </provider>
434
+    </entry>
435
+    <entry file="uml://JavaScript-modules-diagram//Users/alizalang/Labs/ZipTeam/ZipTeamOrange">
436
+      <provider selected="true" editor-type-id="UmlEditorProvider">
437
+        <state>
438
+          <ID>JavaScript-modules-diagram</ID>
439
+          <OriginalElement>$PROJECT_DIR$/ZipTeamOrange</OriginalElement>
440
+          <nodes />
441
+          <notes />
442
+          <edges />
443
+          <settings layout="Hierarchic Group" zoom="1.0" x="462.0" y="279.0" />
444
+          <SelectedNodes />
445
+          <Categories>
446
+            <Category>All</Category>
447
+          </Categories>
448
+          <SCOPE>All</SCOPE>
449
+          <VISIBILITY>Details</VISIBILITY>
450
+        </state>
451
+      </provider>
452
+    </entry>
453
+    <entry file="uml://JavaScript-modules-diagram//Users/alizalang/Labs/ZipTeam/ZipTeamOrange/src/main/java">
454
+      <provider selected="true" editor-type-id="UmlEditorProvider">
455
+        <state>
456
+          <ID>JavaScript-modules-diagram</ID>
457
+          <OriginalElement>$PROJECT_DIR$/ZipTeamOrange/src/main/java</OriginalElement>
458
+          <nodes />
459
+          <notes />
460
+          <edges />
461
+          <settings layout="Hierarchic Group" zoom="1.0" x="240.0" y="240.0" />
462
+          <SelectedNodes />
463
+          <Categories>
464
+            <Category>All</Category>
465
+          </Categories>
466
+          <SCOPE>All</SCOPE>
467
+          <VISIBILITY>Details</VISIBILITY>
468
+        </state>
469
+      </provider>
470
+    </entry>
471
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/Middleteir.uml">
472
+      <provider selected="true" editor-type-id="UmlEditorProvider">
473
+        <state>
474
+          <ID>JAVA</ID>
475
+          <OriginalElement />
476
+          <nodes />
477
+          <notes />
478
+          <edges />
479
+          <settings layout="Hierarchic Group" zoom="0.7576766555678875" x="174.0" y="256.0" />
480
+          <SelectedNodes />
481
+          <Categories>
482
+            <Category>Fields</Category>
483
+            <Category>Constructors</Category>
484
+            <Category>Methods</Category>
485
+            <Category>Properties</Category>
486
+          </Categories>
487
+          <SCOPE>Project Files</SCOPE>
488
+          <VISIBILITY>private</VISIBILITY>
489
+        </state>
490
+      </provider>
491
+    </entry>
492
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/pom.xml">
493
+      <provider selected="true" editor-type-id="text-editor" />
494
+    </entry>
495
+    <entry file="file://$PROJECT_DIR$/IMG_20180709_105418-2.jpg">
496
+      <provider selected="true" editor-type-id="images" />
497
+    </entry>
498
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Controller.java">
499
+      <provider selected="true" editor-type-id="text-editor" />
500
+    </entry>
501
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/ChatController.java">
502
+      <provider selected="true" editor-type-id="text-editor">
503
+        <state relative-caret-position="45">
504
+          <caret line="3" column="23" lean-forward="true" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
505
+        </state>
506
+      </provider>
507
+    </entry>
508
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/UserController.java">
509
+      <provider selected="true" editor-type-id="text-editor">
510
+        <state relative-caret-position="180">
511
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
512
+        </state>
513
+      </provider>
514
+    </entry>
515
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Chat.java">
516
+      <provider selected="true" editor-type-id="text-editor">
517
+        <state relative-caret-position="135">
518
+          <caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="33" />
519
+        </state>
520
+      </provider>
521
+    </entry>
522
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Main.java">
523
+      <provider selected="true" editor-type-id="text-editor">
524
+        <state relative-caret-position="30">
525
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
526
+        </state>
527
+      </provider>
528
+    </entry>
529
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/User.java">
530
+      <provider selected="true" editor-type-id="text-editor">
531
+        <state relative-caret-position="405">
532
+          <caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
533
+        </state>
534
+      </provider>
535
+    </entry>
536
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageController.java">
537
+      <provider selected="true" editor-type-id="text-editor" />
538
+    </entry>
539
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/MessageRepository.java">
540
+      <provider selected="true" editor-type-id="text-editor">
541
+        <state>
542
+          <folding>
543
+            <element signature="imports" expanded="true" />
544
+          </folding>
545
+        </state>
546
+      </provider>
547
+    </entry>
548
+    <entry file="file://$PROJECT_DIR$/ZipTeamOrange/src/main/java/Message.java">
549
+      <provider selected="true" editor-type-id="text-editor">
550
+        <state relative-caret-position="30">
551
+          <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
552
+        </state>
553
+      </provider>
554
+    </entry>
555
+  </component>
174 556
   <component name="masterDetails">
175 557
     <states>
176 558
       <state key="ArtifactsStructureConfigurable.UI">

Двоичные данные
ZipTeamOrange/.DS_Store Просмотреть файл


+ 25
- 0
ZipTeamOrange/.gitignore Просмотреть файл

@@ -0,0 +1,25 @@
1
+/target/
2
+!.mvn/wrapper/maven-wrapper.jar
3
+
4
+### STS ###
5
+.apt_generated
6
+.classpath
7
+.factorypath
8
+.project
9
+.settings
10
+.springBeans
11
+.sts4-cache
12
+
13
+### IntelliJ IDEA ###
14
+.idea
15
+*.iws
16
+*.iml
17
+*.ipr
18
+
19
+### NetBeans ###
20
+/nbproject/private/
21
+/build/
22
+/nbbuild/
23
+/dist/
24
+/nbdist/
25
+/.nb-gradle/

+ 4
- 1
ZipTeamOrange/.idea/compiler.xml Просмотреть файл

@@ -6,8 +6,11 @@
6 6
         <sourceOutputDir name="target/generated-sources/annotations" />
7 7
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8
         <outputRelativeToContentRoot value="true" />
9
-        <module name="ZipTeamOrange" />
9
+        <module name="demo" />
10 10
       </profile>
11 11
     </annotationProcessing>
12
+    <bytecodeTargetLevel>
13
+      <module name="demo" target="1.8" />
14
+    </bytecodeTargetLevel>
12 15
   </component>
13 16
 </project>

+ 2
- 3
ZipTeamOrange/.idea/misc.xml Просмотреть файл

@@ -1,6 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
4 3
   <component name="MavenProjectsManager">
5 4
     <option name="originalFiles">
6 5
       <list>
@@ -8,7 +7,7 @@
8 7
       </list>
9 8
     </option>
10 9
   </component>
11
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="10" project-jdk-type="JavaSDK">
12
-    <output url="file://$PROJECT_DIR$/out" />
10
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="10" project-jdk-type="JavaSDK">
11
+    <output url="file://$PROJECT_DIR$/classes" />
13 12
   </component>
14 13
 </project>

+ 0
- 124
ZipTeamOrange/.idea/uiDesigner.xml Просмотреть файл

@@ -1,124 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="Palette2">
4
-    <group name="Swing">
5
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
6
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
7
-      </item>
8
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
9
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
10
-      </item>
11
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
12
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
13
-      </item>
14
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
15
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
16
-      </item>
17
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
18
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
19
-        <initial-values>
20
-          <property name="text" value="Button" />
21
-        </initial-values>
22
-      </item>
23
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
24
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
25
-        <initial-values>
26
-          <property name="text" value="RadioButton" />
27
-        </initial-values>
28
-      </item>
29
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
30
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
31
-        <initial-values>
32
-          <property name="text" value="CheckBox" />
33
-        </initial-values>
34
-      </item>
35
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
36
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
37
-        <initial-values>
38
-          <property name="text" value="Label" />
39
-        </initial-values>
40
-      </item>
41
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
42
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
43
-          <preferred-size width="150" height="-1" />
44
-        </default-constraints>
45
-      </item>
46
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
47
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
48
-          <preferred-size width="150" height="-1" />
49
-        </default-constraints>
50
-      </item>
51
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
52
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
53
-          <preferred-size width="150" height="-1" />
54
-        </default-constraints>
55
-      </item>
56
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
57
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
58
-          <preferred-size width="150" height="50" />
59
-        </default-constraints>
60
-      </item>
61
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
62
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
63
-          <preferred-size width="150" height="50" />
64
-        </default-constraints>
65
-      </item>
66
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
67
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
68
-          <preferred-size width="150" height="50" />
69
-        </default-constraints>
70
-      </item>
71
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
72
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
73
-      </item>
74
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
75
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
76
-          <preferred-size width="150" height="50" />
77
-        </default-constraints>
78
-      </item>
79
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
80
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
81
-          <preferred-size width="150" height="50" />
82
-        </default-constraints>
83
-      </item>
84
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
85
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
86
-          <preferred-size width="150" height="50" />
87
-        </default-constraints>
88
-      </item>
89
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
90
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
91
-          <preferred-size width="200" height="200" />
92
-        </default-constraints>
93
-      </item>
94
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
95
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
96
-          <preferred-size width="200" height="200" />
97
-        </default-constraints>
98
-      </item>
99
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
100
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
101
-      </item>
102
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
103
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
104
-      </item>
105
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
106
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
107
-      </item>
108
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
109
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
110
-      </item>
111
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
112
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
113
-          <preferred-size width="-1" height="20" />
114
-        </default-constraints>
115
-      </item>
116
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
117
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
118
-      </item>
119
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
120
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
121
-      </item>
122
-    </group>
123
-  </component>
124
-</project>

+ 99
- 604
ZipTeamOrange/.idea/workspace.xml Просмотреть файл

@@ -1,8 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="f48951b5-87fa-4b37-a4ec-1fd4ca910d6a" name="Default" comment="" />
5
-    <ignored path="$PROJECT_DIR$/out/" />
4
+    <list default="true" id="67cd350c-ad7e-4562-9767-eda1efce40be" name="Default" comment="" />
6 5
     <ignored path="$PROJECT_DIR$/target/" />
7 6
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 7
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,119 +12,35 @@
13 12
   </component>
14 13
   <component name="FileEditorManager">
15 14
     <leaf>
16
-      <file leaf-file-name="JAVA/Chat" pinned="false" current-in-tab="false">
17
-        <entry file="uml://JAVA/Chat">
18
-          <provider selected="true" editor-type-id="UmlEditorProvider">
19
-            <state>
20
-              <ID>JAVA</ID>
21
-              <OriginalElement>Chat</OriginalElement>
22
-              <nodes>
23
-                <node x="-167.0" y="-196.0">Chat</node>
24
-              </nodes>
25
-              <notes />
26
-              <edges />
27
-              <settings layout="Hierarchic Group" zoom="1.0" x="-201.5" y="-37.0" />
28
-              <SelectedNodes>
29
-                <node>Chat</node>
30
-              </SelectedNodes>
31
-              <Categories>
32
-                <Category>Fields</Category>
33
-                <Category>Constructors</Category>
34
-                <Category>Methods</Category>
35
-              </Categories>
36
-              <SCOPE>Project Files</SCOPE>
37
-              <VISIBILITY>private</VISIBILITY>
15
+      <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
16
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/Message.java">
17
+          <provider selected="true" editor-type-id="text-editor">
18
+            <state relative-caret-position="30">
19
+              <caret line="5" selection-start-line="5" selection-end-line="43" selection-end-column="1" />
38 20
             </state>
39 21
           </provider>
40 22
         </entry>
41 23
       </file>
42
-      <file leaf-file-name="JAVA/" pinned="false" current-in-tab="true">
43
-        <entry file="uml://JAVA/">
44
-          <provider selected="true" editor-type-id="UmlEditorProvider">
45
-            <state>
46
-              <ID>JAVA</ID>
47
-              <OriginalElement />
48
-              <nodes>
49
-                <node x="335.0" y="308.0">User</node>
50
-                <node x="687.0" y="308.0">Message</node>
51
-                <node x="0.0" y="603.0">MessageRespository</node>
52
-                <node x="0.0" y="699.0">UserRespository</node>
53
-                <node x="0.0" y="308.0">Chat</node>
54
-                <node x="0.0" y="101.0">UserController</node>
55
-                <node x="410.0" y="101.0">MessageController</node>
56
-                <node x="0.0" y="795.0">ChatRespository</node>
57
-                <node x="235.0" y="0.0">Controller</node>
58
-                <node x="205.0" y="101.0">ChatController</node>
59
-                <node x="541.0" y="795.0">Main</node>
60
-              </nodes>
61
-              <notes />
62
-              <edges>
63
-                <edge source="UserController" target="Controller">
64
-                  <point x="0.0" y="-81.0" />
65
-                  <point x="92.5" y="76.0" />
66
-                  <point x="255.83333333333334" y="76.0" />
67
-                  <point x="-41.66666666666666" y="25.5" />
68
-                </edge>
69
-                <edge source="MessageController" target="Controller">
70
-                  <point x="0.0" y="-81.0" />
71
-                  <point x="502.5" y="76.0" />
72
-                  <point x="339.16666666666663" y="76.0" />
73
-                  <point x="41.66666666666663" y="25.5" />
74
-                </edge>
75
-                <edge source="ChatController" target="Controller">
76
-                  <point x="0.0" y="-81.0" />
77
-                  <point x="0.0" y="25.5" />
78
-                </edge>
79
-              </edges>
80
-              <settings layout="Hierarchic Group" zoom="1.0" x="423.5" y="433.5" />
81
-              <SelectedNodes>
82
-                <node>MessageRespository</node>
83
-              </SelectedNodes>
84
-              <Categories>
85
-                <Category>Fields</Category>
86
-                <Category>Constructors</Category>
87
-                <Category>Methods</Category>
88
-                <Category>Properties</Category>
89
-              </Categories>
90
-              <SCOPE>Project Files</SCOPE>
91
-              <VISIBILITY>private</VISIBILITY>
24
+      <file leaf-file-name="MessageController.java" pinned="false" current-in-tab="false">
25
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/MessageController.java">
26
+          <provider selected="true" editor-type-id="text-editor">
27
+            <state relative-caret-position="30">
28
+              <caret line="5" selection-start-line="5" selection-end-line="32" selection-end-column="1" />
29
+            </state>
30
+          </provider>
31
+        </entry>
32
+      </file>
33
+      <file leaf-file-name="MessageRepository.java" pinned="false" current-in-tab="true">
34
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/MessageRepository.java">
35
+          <provider selected="true" editor-type-id="text-editor">
36
+            <state relative-caret-position="30">
37
+              <caret line="6" selection-start-line="6" selection-end-line="10" selection-end-column="1" />
92 38
             </state>
93 39
           </provider>
94 40
         </entry>
95 41
       </file>
96 42
     </leaf>
97 43
   </component>
98
-  <component name="FileTemplateManagerImpl">
99
-    <option name="RECENT_TEMPLATES">
100
-      <list>
101
-        <option value="Class" />
102
-        <option value="Interface" />
103
-      </list>
104
-    </option>
105
-  </component>
106
-  <component name="IdeDocumentHistory">
107
-    <option name="CHANGED_PATHS">
108
-      <list>
109
-        <option value="$PROJECT_DIR$/src/main/java/Message.java" />
110
-        <option value="$PROJECT_DIR$/src/main/java/Controller.java" />
111
-        <option value="$PROJECT_DIR$/src/main/java/ChatController.java" />
112
-        <option value="$PROJECT_DIR$/src/main/java/MessageController.java" />
113
-        <option value="$PROJECT_DIR$/src/main/java/UserController.java" />
114
-        <option value="$PROJECT_DIR$/src/main/java/UserRepository.java" />
115
-        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/user/UserRepository.java" />
116
-        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/message/MessageRepository.java" />
117
-        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/chat/Chat.java" />
118
-        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/chat/ChatRepository.java" />
119
-        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/User.java" />
120
-        <option value="$PROJECT_DIR$/src/main/java/User.java" />
121
-        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/Chat.java" />
122
-        <option value="$PROJECT_DIR$/src/main/java/Chat.java" />
123
-        <option value="$PROJECT_DIR$/src/main/java/ChatRepository.java" />
124
-        <option value="$PROJECT_DIR$/src/main/java/MessageRepository.java" />
125
-        <option value="$PROJECT_DIR$/src/main/java/ChatRepository1.java" />
126
-      </list>
127
-    </option>
128
-  </component>
129 44
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
130 45
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
131 46
   <component name="JsGulpfileManager">
@@ -142,11 +57,11 @@
142 57
   <component name="NodePackageJsonFileManager">
143 58
     <packageJsonPaths />
144 59
   </component>
145
-  <component name="ProjectFrameBounds">
146
-    <option name="x" value="-170" />
147
-    <option name="y" value="-1049" />
148
-    <option name="width" value="1859" />
149
-    <option name="height" value="1043" />
60
+  <component name="ProjectFrameBounds" extendedState="1">
61
+    <option name="x" value="72" />
62
+    <option name="y" value="33" />
63
+    <option name="width" value="1368" />
64
+    <option name="height" value="742" />
150 65
   </component>
151 66
   <component name="ProjectView">
152 67
     <navigator proportions="" version="1">
@@ -154,55 +69,70 @@
154 69
     </navigator>
155 70
     <panes>
156 71
       <pane id="AndroidView" />
72
+      <pane id="Scope" />
157 73
       <pane id="ProjectPane">
158 74
         <subPane>
159 75
           <expand>
160 76
             <path>
161
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
162
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
77
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
78
+              <item name="ZipTeamOrangeOLD" type="462c0819:PsiDirectoryNode" />
79
+            </path>
80
+            <path>
81
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
82
+              <item name="ZipTeamOrangeOLD" type="462c0819:PsiDirectoryNode" />
83
+              <item name="src" type="462c0819:PsiDirectoryNode" />
84
+            </path>
85
+            <path>
86
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
87
+              <item name="ZipTeamOrangeOLD" type="462c0819:PsiDirectoryNode" />
88
+              <item name="src" type="462c0819:PsiDirectoryNode" />
89
+              <item name="main" type="462c0819:PsiDirectoryNode" />
163 90
             </path>
164 91
             <path>
165
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
166
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
92
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
93
+              <item name="ZipTeamOrangeOLD" type="462c0819:PsiDirectoryNode" />
167 94
               <item name="src" type="462c0819:PsiDirectoryNode" />
95
+              <item name="main" type="462c0819:PsiDirectoryNode" />
96
+              <item name="java" type="462c0819:PsiDirectoryNode" />
168 97
             </path>
169 98
             <path>
170
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
171
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
99
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
100
+              <item name="ZipTeamOrangeOLD" type="462c0819:PsiDirectoryNode" />
172 101
               <item name="src" type="462c0819:PsiDirectoryNode" />
173 102
               <item name="main" type="462c0819:PsiDirectoryNode" />
103
+              <item name="java" type="462c0819:PsiDirectoryNode" />
104
+              <item name="com" type="462c0819:PsiDirectoryNode" />
174 105
             </path>
175 106
             <path>
176
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
177
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
107
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
108
+              <item name="ZipTeamOrangeOLD" type="462c0819:PsiDirectoryNode" />
178 109
               <item name="src" type="462c0819:PsiDirectoryNode" />
179 110
               <item name="main" type="462c0819:PsiDirectoryNode" />
180 111
               <item name="java" type="462c0819:PsiDirectoryNode" />
112
+              <item name="com" type="462c0819:PsiDirectoryNode" />
113
+              <item name="MessageRepository.java" type="529ef68f:ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
114
+            </path>
115
+            <path>
116
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
117
+              <item name="ZipTeamOrangeOLD" type="462c0819:PsiDirectoryNode" />
118
+              <item name="src" type="462c0819:PsiDirectoryNode" />
119
+              <item name="main" type="462c0819:PsiDirectoryNode" />
120
+              <item name="java" type="462c0819:PsiDirectoryNode" />
121
+              <item name="demo" type="462c0819:PsiDirectoryNode" />
181 122
             </path>
182 123
           </expand>
183 124
           <select />
184 125
         </subPane>
185 126
       </pane>
186 127
       <pane id="PackagesPane" />
187
-      <pane id="Scope" />
188 128
     </panes>
189 129
   </component>
190 130
   <component name="PropertiesComponent">
191 131
     <property name="WebServerToolWindowFactoryState" value="false" />
192
-    <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
193 132
     <property name="aspect.path.notification.shown" value="true" />
194
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
133
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
195 134
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
196 135
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
197
-    <property name="project.structure.last.edited" value="Modules" />
198
-    <property name="project.structure.proportion" value="0.15" />
199
-    <property name="project.structure.side.proportion" value="0.2" />
200
-    <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
201
-  </component>
202
-  <component name="RecentsManager">
203
-    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
204
-      <recent name="" />
205
-    </key>
206 136
   </component>
207 137
   <component name="RunDashboard">
208 138
     <option name="ruleStates">
@@ -236,6 +166,10 @@
236 166
       </option>
237 167
       <patterns />
238 168
     </configuration>
169
+    <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
170
+      <module name="demo" />
171
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.example.demo.DemoApplication" />
172
+    </configuration>
239 173
     <configuration default="true" type="TestNG" factoryName="TestNG">
240 174
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
241 175
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -264,75 +198,53 @@
264 198
   </component>
265 199
   <component name="TaskManager">
266 200
     <task active="true" id="Default" summary="Default task">
267
-      <changelist id="f48951b5-87fa-4b37-a4ec-1fd4ca910d6a" name="Default" comment="" />
268
-      <created>1531074500034</created>
201
+      <changelist id="67cd350c-ad7e-4562-9767-eda1efce40be" name="Default" comment="" />
202
+      <created>1531680042543</created>
269 203
       <option name="number" value="Default" />
270 204
       <option name="presentableId" value="Default" />
271
-      <updated>1531074500034</updated>
272
-      <workItem from="1531074507186" duration="5313000" />
205
+      <updated>1531680042543</updated>
206
+      <workItem from="1531680046027" duration="22000" />
207
+      <workItem from="1531683763510" duration="273000" />
273 208
     </task>
274 209
     <servers />
275 210
   </component>
276 211
   <component name="TimeTrackingManager">
277
-    <option name="totallyTimeSpent" value="9446000" />
212
+    <option name="totallyTimeSpent" value="295000" />
278 213
   </component>
279 214
   <component name="ToolWindowManager">
280
-    <frame x="-170" y="-1049" width="1859" height="1043" extended-state="0" />
281
-    <editor active="true" />
215
+    <frame x="72" y="33" width="1368" height="742" extended-state="1" />
282 216
     <layout>
283
-      <window_info anchor="right" id="Palette" />
284
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
285
-      <window_info anchor="right" id="Maven Projects" />
286
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
287
-      <window_info id="Capture Tool" />
288
-      <window_info id="Designer" />
289
-      <window_info anchor="right" id="Database" />
217
+      <window_info anchor="right" id="Palette" order="3" />
218
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
219
+      <window_info anchor="right" id="Maven Projects" order="3" />
220
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
221
+      <window_info id="Capture Tool" order="2" />
222
+      <window_info id="Designer" order="2" />
223
+      <window_info anchor="right" id="Database" order="3" />
290 224
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
291 225
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
292
-      <window_info id="UI Designer" />
226
+      <window_info id="UI Designer" order="2" />
293 227
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
294 228
       <window_info anchor="bottom" id="TODO" order="6" />
295
-      <window_info anchor="right" id="Palette&#9;" />
296
-      <window_info id="Image Layers" />
297
-      <window_info anchor="bottom" id="Java Enterprise" />
298
-      <window_info anchor="right" id="Capture Analysis" />
299
-      <window_info anchor="bottom" id="Run" order="2" />
300
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
301
-      <window_info anchor="bottom" id="Spring" />
302
-      <window_info anchor="bottom" id="Terminal" />
303
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17213556" />
304
-      <window_info anchor="right" id="Bean Validation" />
305
-      <window_info id="Web" side_tool="true" />
306
-      <window_info anchor="right" id="Theme Preview" />
307
-      <window_info id="Favorites" side_tool="true" />
308
-      <window_info anchor="right" id="Palette" order="3" />
309
-      <window_info id="Designer" order="2" />
310
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
229
+      <window_info anchor="right" id="Palette&#9;" order="3" />
230
+      <window_info id="Image Layers" order="2" />
231
+      <window_info anchor="bottom" id="Java Enterprise" order="7" />
311 232
       <window_info anchor="right" id="Capture Analysis" order="3" />
312 233
       <window_info anchor="bottom" id="Run" order="2" />
313
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
314
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
315
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
316
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
317
-      <window_info anchor="bottom" id="TODO" order="6" />
318
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
319 234
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
320
-      <window_info id="Image Layers" order="2" />
321
-      <window_info id="Capture Tool" order="2" />
322
-      <window_info id="UI Designer" order="2" />
323
-      <window_info anchor="bottom" id="Find" order="1" />
324
-      <window_info anchor="right" id="Theme Preview" order="3" />
325
-      <window_info id="Learn" order="3" />
326
-      <window_info anchor="right" id="Palette&#9;" order="3" />
235
+      <window_info anchor="bottom" id="Spring" order="7" />
327 236
       <window_info anchor="bottom" id="Terminal" order="7" />
328
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
237
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25339368" />
238
+      <window_info anchor="right" id="Bean Validation" order="3" />
239
+      <window_info id="Web" order="2" side_tool="true" />
240
+      <window_info anchor="right" id="Theme Preview" order="3" />
241
+      <window_info id="Favorites" order="2" side_tool="true" />
329 242
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
243
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
330 244
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
331
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
332 245
       <window_info anchor="bottom" id="Message" order="0" />
333
-      <window_info anchor="right" id="Database" order="3" />
334
-      <window_info anchor="right" id="Maven Projects" order="3" />
335
-      <window_info id="Favorites" order="2" side_tool="true" />
246
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
247
+      <window_info anchor="bottom" id="Find" order="1" />
336 248
     </layout>
337 249
   </component>
338 250
   <component name="TypeScriptGeneratedFilesManager">
@@ -341,451 +253,34 @@
341 253
   <component name="VcsContentAnnotationSettings">
342 254
     <option name="myLimit" value="2678400000" />
343 255
   </component>
344
-  <component name="VcsManagerConfiguration">
345
-    <ignored-roots>
346
-      <path value="$PROJECT_DIR$/.." />
347
-    </ignored-roots>
348
-  </component>
349 256
   <component name="editorHistoryManager">
350
-    <entry file="file://$PROJECT_DIR$/pom.xml">
351
-      <provider selected="true" editor-type-id="text-editor" />
352
-    </entry>
353
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
354
-      <provider selected="true" editor-type-id="text-editor">
355
-        <state>
356
-          <caret column="30" selection-start-column="30" selection-end-column="30" />
357
-        </state>
358
-      </provider>
359
-    </entry>
360
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
361
-      <provider selected="true" editor-type-id="text-editor">
362
-        <state>
363
-          <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
364
-        </state>
365
-      </provider>
366
-    </entry>
367
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
368
-      <provider selected="true" editor-type-id="text-editor">
369
-        <state>
370
-          <caret column="17" selection-start-column="17" selection-end-column="17" />
371
-        </state>
372
-      </provider>
373
-    </entry>
374
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
375
-      <provider selected="true" editor-type-id="text-editor">
376
-        <state>
377
-          <caret column="27" selection-start-column="27" selection-end-column="27" />
378
-        </state>
379
-      </provider>
380
-    </entry>
381
-    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
382
-      <provider selected="true" editor-type-id="text-editor">
383
-        <state relative-caret-position="450">
384
-          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
385
-          <folding>
386
-            <element signature="e#140#141#0" expanded="true" />
387
-            <element signature="e#169#170#0" expanded="true" />
388
-            <element signature="e#200#201#0" expanded="true" />
389
-            <element signature="e#227#228#0" expanded="true" />
390
-            <element signature="e#259#260#0" expanded="true" />
391
-            <element signature="e#287#288#0" expanded="true" />
392
-            <element signature="e#322#323#0" expanded="true" />
393
-            <element signature="e#353#354#0" expanded="true" />
394
-            <element signature="e#387#388#0" expanded="true" />
395
-            <element signature="e#417#418#0" expanded="true" />
396
-          </folding>
397
-        </state>
398
-      </provider>
399
-    </entry>
400
-    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
401
-      <provider selected="true" editor-type-id="text-editor">
402
-        <state relative-caret-position="90">
403
-          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
404
-          <folding>
405
-            <element signature="e#134#135#0" expanded="true" />
406
-            <element signature="e#166#167#0" expanded="true" />
407
-            <element signature="e#197#198#0" expanded="true" />
408
-            <element signature="e#224#225#0" expanded="true" />
409
-            <element signature="e#258#259#0" expanded="true" />
410
-            <element signature="e#290#291#0" expanded="true" />
411
-            <element signature="e#580#581#0" expanded="true" />
412
-            <element signature="e#609#610#0" expanded="true" />
413
-            <element signature="e#639#640#0" expanded="true" />
414
-            <element signature="e#668#669#0" expanded="true" />
415
-          </folding>
416
-        </state>
417
-      </provider>
418
-    </entry>
419
-    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
420
-      <provider selected="true" editor-type-id="text-editor">
421
-        <state relative-caret-position="180">
422
-          <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
423
-          <folding>
424
-            <element signature="imports" expanded="true" />
425
-            <element signature="e#255#261#0" expanded="true" />
426
-          </folding>
427
-        </state>
428
-      </provider>
429
-    </entry>
430
-    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
431
-      <provider selected="true" editor-type-id="text-editor">
432
-        <state relative-caret-position="450">
433
-          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
434
-        </state>
435
-      </provider>
436
-    </entry>
437
-    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
438
-      <provider selected="true" editor-type-id="text-editor">
439
-        <state relative-caret-position="90">
440
-          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
441
-        </state>
442
-      </provider>
443
-    </entry>
444
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
445
-      <provider selected="true" editor-type-id="text-editor">
446
-        <state>
447
-          <caret column="27" selection-start-column="27" selection-end-column="27" />
448
-        </state>
449
-      </provider>
450
-    </entry>
451
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
452
-      <provider selected="true" editor-type-id="text-editor">
453
-        <state>
454
-          <caret column="30" selection-start-column="30" selection-end-column="30" />
455
-        </state>
456
-      </provider>
457
-    </entry>
458
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
459
-      <provider selected="true" editor-type-id="text-editor">
460
-        <state>
461
-          <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
462
-        </state>
463
-      </provider>
464
-    </entry>
465
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
466
-      <provider selected="true" editor-type-id="text-editor">
467
-        <state>
468
-          <caret column="17" selection-start-column="17" selection-end-column="17" />
469
-        </state>
470
-      </provider>
471
-    </entry>
472
-    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
473
-      <provider selected="true" editor-type-id="text-editor">
474
-        <state relative-caret-position="135">
475
-          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
476
-          <folding>
477
-            <element signature="imports" expanded="true" />
478
-            <element signature="e#255#261#0" expanded="true" />
479
-          </folding>
480
-        </state>
481
-      </provider>
482
-    </entry>
483
-    <entry file="file://$PROJECT_DIR$/pom.xml">
484
-      <provider selected="true" editor-type-id="text-editor">
485
-        <state relative-caret-position="120">
486
-          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
487
-        </state>
488
-      </provider>
489
-    </entry>
490
-    <entry file="uml://JAVA/User">
491
-      <provider selected="true" editor-type-id="UmlEditorProvider">
492
-        <state>
493
-          <ID>JAVA</ID>
494
-          <OriginalElement>User</OriginalElement>
495
-          <nodes>
496
-            <node x="" y="">User</node>
497
-          </nodes>
498
-          <notes />
499
-          <edges />
500
-          <settings layout="Hierarchic Group" zoom="1.0" x="38.5" y="14.5" />
501
-          <SelectedNodes />
502
-          <Categories />
503
-          <SCOPE>All</SCOPE>
504
-          <VISIBILITY>private</VISIBILITY>
505
-        </state>
506
-      </provider>
507
-    </entry>
508
-    <entry file="uml://JAVA/UserController">
509
-      <provider selected="true" editor-type-id="UmlEditorProvider">
510
-        <state>
511
-          <ID>JAVA</ID>
512
-          <OriginalElement>UserController</OriginalElement>
513
-          <nodes>
514
-            <node x="" y="">UserController</node>
515
-            <node x="" y="">Controller</node>
516
-          </nodes>
517
-          <notes />
518
-          <edges />
519
-          <settings layout="Hierarchic Group" zoom="1.0" x="69.0" y="54.0" />
520
-          <SelectedNodes />
521
-          <Categories />
522
-          <SCOPE>All</SCOPE>
523
-          <VISIBILITY>private</VISIBILITY>
524
-        </state>
525
-      </provider>
526
-    </entry>
527
-    <entry file="uml://JAVA/ChatController">
528
-      <provider selected="true" editor-type-id="UmlEditorProvider">
529
-        <state>
530
-          <ID>JAVA</ID>
531
-          <OriginalElement>ChatController</OriginalElement>
532
-          <nodes>
533
-            <node x="" y="">ChatController</node>
534
-            <node x="" y="">Controller</node>
535
-          </nodes>
536
-          <notes />
537
-          <edges />
538
-          <settings layout="Hierarchic Group" zoom="1.0" x="69.0" y="54.0" />
539
-          <SelectedNodes />
540
-          <Categories />
541
-          <SCOPE>All</SCOPE>
542
-          <VISIBILITY>private</VISIBILITY>
543
-        </state>
544
-      </provider>
545
-    </entry>
546
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
547
-      <provider selected="true" editor-type-id="text-editor">
548
-        <state relative-caret-position="105">
549
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
550
-          <folding>
551
-            <element signature="imports" expanded="true" />
552
-          </folding>
553
-        </state>
554
-      </provider>
555
-    </entry>
556
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
557
-      <provider selected="true" editor-type-id="text-editor">
558
-        <state relative-caret-position="15">
559
-          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
560
-        </state>
561
-      </provider>
562
-    </entry>
563
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository1.java">
564
-      <provider selected="true" editor-type-id="text-editor" />
565
-    </entry>
566
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
567
-      <provider selected="true" editor-type-id="text-editor">
568
-        <state relative-caret-position="120">
569
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
570
-          <folding>
571
-            <element signature="imports" expanded="true" />
572
-          </folding>
573
-        </state>
574
-      </provider>
575
-    </entry>
576
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
577
-      <provider selected="true" editor-type-id="text-editor">
578
-        <state>
579
-          <caret column="13" selection-start-column="13" selection-end-column="13" />
580
-        </state>
581
-      </provider>
582
-    </entry>
583
-    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
584
-      <provider selected="true" editor-type-id="text-editor">
585
-        <state>
586
-          <caret column="13" selection-start-column="13" selection-end-column="13" />
587
-        </state>
588
-      </provider>
589
-    </entry>
590
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
591
-      <provider selected="true" editor-type-id="text-editor">
592
-        <state>
593
-          <caret column="13" selection-start-column="13" selection-end-column="13" />
594
-        </state>
595
-      </provider>
596
-    </entry>
597
-    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
257
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/Message.java">
598 258
       <provider selected="true" editor-type-id="text-editor">
599 259
         <state relative-caret-position="30">
600
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
260
+          <caret line="5" selection-start-line="5" selection-end-line="43" selection-end-column="1" />
601 261
         </state>
602 262
       </provider>
603 263
     </entry>
604
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
605
-      <provider selected="true" editor-type-id="text-editor">
606
-        <state>
607
-          <caret column="13" selection-start-column="13" selection-end-column="13" />
608
-        </state>
609
-      </provider>
610
-    </entry>
611
-    <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
264
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/MessageController.java">
612 265
       <provider selected="true" editor-type-id="text-editor">
613 266
         <state relative-caret-position="30">
614
-          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
267
+          <caret line="5" selection-start-line="5" selection-end-line="32" selection-end-column="1" />
615 268
         </state>
616 269
       </provider>
617 270
     </entry>
618
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
271
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/MessageRepository.java">
619 272
       <provider selected="true" editor-type-id="text-editor">
620
-        <state>
621
-          <caret column="13" selection-start-column="13" selection-end-column="13" />
622
-        </state>
623
-      </provider>
624
-    </entry>
625
-    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
626
-      <provider selected="true" editor-type-id="text-editor">
627
-        <state relative-caret-position="135">
628
-          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
629
-          <folding>
630
-            <element signature="imports" expanded="true" />
631
-            <element signature="e#255#261#0" expanded="true" />
632
-          </folding>
633
-        </state>
634
-      </provider>
635
-    </entry>
636
-    <entry file="uml://JAVA/Chat">
637
-      <provider selected="true" editor-type-id="UmlEditorProvider">
638
-        <state>
639
-          <ID>JAVA</ID>
640
-          <OriginalElement>Chat</OriginalElement>
641
-          <nodes>
642
-            <node x="-167.0" y="-196.0">Chat</node>
643
-          </nodes>
644
-          <notes />
645
-          <edges />
646
-          <settings layout="Hierarchic Group" zoom="1.0" x="-201.5" y="-37.0" />
647
-          <SelectedNodes>
648
-            <node>Chat</node>
649
-          </SelectedNodes>
650
-          <Categories>
651
-            <Category>Fields</Category>
652
-            <Category>Constructors</Category>
653
-            <Category>Methods</Category>
654
-          </Categories>
655
-          <SCOPE>Project Files</SCOPE>
656
-          <VISIBILITY>private</VISIBILITY>
657
-        </state>
658
-      </provider>
659
-    </entry>
660
-    <entry file="uml://JAVA/">
661
-      <provider selected="true" editor-type-id="UmlEditorProvider">
662
-        <state>
663
-          <ID>JAVA</ID>
664
-          <OriginalElement />
665
-          <nodes>
666
-            <node x="335.0" y="308.0">User</node>
667
-            <node x="687.0" y="308.0">Message</node>
668
-            <node x="0.0" y="603.0">MessageRespository</node>
669
-            <node x="0.0" y="699.0">UserRespository</node>
670
-            <node x="0.0" y="308.0">Chat</node>
671
-            <node x="0.0" y="101.0">UserController</node>
672
-            <node x="410.0" y="101.0">MessageController</node>
673
-            <node x="0.0" y="795.0">ChatRespository</node>
674
-            <node x="235.0" y="0.0">Controller</node>
675
-            <node x="205.0" y="101.0">ChatController</node>
676
-            <node x="541.0" y="795.0">Main</node>
677
-          </nodes>
678
-          <notes />
679
-          <edges>
680
-            <edge source="UserController" target="Controller">
681
-              <point x="0.0" y="-81.0" />
682
-              <point x="92.5" y="76.0" />
683
-              <point x="255.83333333333334" y="76.0" />
684
-              <point x="-41.66666666666666" y="25.5" />
685
-            </edge>
686
-            <edge source="MessageController" target="Controller">
687
-              <point x="0.0" y="-81.0" />
688
-              <point x="502.5" y="76.0" />
689
-              <point x="339.16666666666663" y="76.0" />
690
-              <point x="41.66666666666663" y="25.5" />
691
-            </edge>
692
-            <edge source="ChatController" target="Controller">
693
-              <point x="0.0" y="-81.0" />
694
-              <point x="0.0" y="25.5" />
695
-            </edge>
696
-          </edges>
697
-          <settings layout="Hierarchic Group" zoom="1.0" x="423.5" y="433.5" />
698
-          <SelectedNodes>
699
-            <node>MessageRespository</node>
700
-          </SelectedNodes>
701
-          <Categories>
702
-            <Category>Fields</Category>
703
-            <Category>Constructors</Category>
704
-            <Category>Methods</Category>
705
-            <Category>Properties</Category>
706
-          </Categories>
707
-          <SCOPE>Project Files</SCOPE>
708
-          <VISIBILITY>private</VISIBILITY>
273
+        <state relative-caret-position="30">
274
+          <caret line="6" selection-start-line="6" selection-end-line="10" selection-end-column="1" />
709 275
         </state>
710 276
       </provider>
711 277
     </entry>
712 278
   </component>
713 279
   <component name="masterDetails">
714 280
     <states>
715
-      <state key="ArtifactsStructureConfigurable.UI">
716
-        <settings>
717
-          <artifact-editor />
718
-          <splitter-proportions>
719
-            <option name="proportions">
720
-              <list>
721
-                <option value="0.2" />
722
-              </list>
723
-            </option>
724
-          </splitter-proportions>
725
-        </settings>
726
-      </state>
727
-      <state key="FacetStructureConfigurable.UI">
728
-        <settings>
729
-          <last-edited>No facets are configured</last-edited>
730
-          <splitter-proportions>
731
-            <option name="proportions">
732
-              <list>
733
-                <option value="0.2" />
734
-              </list>
735
-            </option>
736
-          </splitter-proportions>
737
-        </settings>
738
-      </state>
739
-      <state key="GlobalLibrariesConfigurable.UI">
740
-        <settings>
741
-          <splitter-proportions>
742
-            <option name="proportions">
743
-              <list>
744
-                <option value="0.2" />
745
-              </list>
746
-            </option>
747
-          </splitter-proportions>
748
-        </settings>
749
-      </state>
750
-      <state key="JdkListConfigurable.UI">
751
-        <settings>
752
-          <last-edited>10</last-edited>
753
-          <splitter-proportions>
754
-            <option name="proportions">
755
-              <list>
756
-                <option value="0.2" />
757
-              </list>
758
-            </option>
759
-          </splitter-proportions>
760
-        </settings>
761
-      </state>
762
-      <state key="ModuleStructureConfigurable.UI">
763
-        <settings>
764
-          <last-edited>ZipTeamOrange</last-edited>
765
-          <splitter-proportions>
766
-            <option name="proportions">
767
-              <list>
768
-                <option value="0.2" />
769
-                <option value="0.6" />
770
-              </list>
771
-            </option>
772
-          </splitter-proportions>
773
-        </settings>
774
-      </state>
775 281
       <state key="ProjectJDKs.UI">
776 282
         <settings>
777
-          <last-edited>10</last-edited>
778
-          <splitter-proportions>
779
-            <option name="proportions">
780
-              <list>
781
-                <option value="0.2" />
782
-              </list>
783
-            </option>
784
-          </splitter-proportions>
785
-        </settings>
786
-      </state>
787
-      <state key="ProjectLibrariesConfigurable.UI">
788
-        <settings>
283
+          <last-edited>1.8</last-edited>
789 284
           <splitter-proportions>
790 285
             <option name="proportions">
791 286
               <list>

Двоичные данные
ZipTeamOrange/.mvn/wrapper/maven-wrapper.jar Просмотреть файл


+ 1
- 0
ZipTeamOrange/.mvn/wrapper/maven-wrapper.properties Просмотреть файл

@@ -0,0 +1 @@
1
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

+ 0
- 50
ZipTeamOrange/Middleteir.uml Просмотреть файл

@@ -1,50 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<Diagram>
3
-  <ID>JAVA</ID>
4
-  <OriginalElement />
5
-  <nodes>
6
-    <node x="335.0" y="308.0">User</node>
7
-    <node x="687.0" y="308.0">Message</node>
8
-    <node x="0.0" y="603.0">MessageRespository</node>
9
-    <node x="0.0" y="699.0">UserRespository</node>
10
-    <node x="0.0" y="308.0">Chat</node>
11
-    <node x="410.0" y="101.0">UserController</node>
12
-    <node x="205.0" y="101.0">MessageController</node>
13
-    <node x="0.0" y="795.0">ChatRespository</node>
14
-    <node x="235.0" y="0.0">Controller</node>
15
-    <node x="0.0" y="101.0">ChatController</node>
16
-    <node x="541.0" y="795.0">Main</node>
17
-  </nodes>
18
-  <notes />
19
-  <edges>
20
-    <edge source="UserController" target="Controller">
21
-      <point x="0.0" y="-81.0" />
22
-      <point x="502.5" y="76.0" />
23
-      <point x="339.16666666666663" y="76.0" />
24
-      <point x="41.66666666666663" y="25.5" />
25
-    </edge>
26
-    <edge source="MessageController" target="Controller">
27
-      <point x="0.0" y="-81.0" />
28
-      <point x="0.0" y="25.5" />
29
-    </edge>
30
-    <edge source="ChatController" target="Controller">
31
-      <point x="0.0" y="-81.0" />
32
-      <point x="92.5" y="76.0" />
33
-      <point x="255.83333333333334" y="76.0" />
34
-      <point x="-41.66666666666666" y="25.5" />
35
-    </edge>
36
-  </edges>
37
-  <settings layout="Hierarchic Group" zoom="1.0" x="454.0" y="423.0" />
38
-  <SelectedNodes>
39
-    <node>MessageRespository</node>
40
-  </SelectedNodes>
41
-  <Categories>
42
-    <Category>Fields</Category>
43
-    <Category>Constructors</Category>
44
-    <Category>Methods</Category>
45
-    <Category>Properties</Category>
46
-  </Categories>
47
-  <SCOPE>Project Files</SCOPE>
48
-  <VISIBILITY>private</VISIBILITY>
49
-</Diagram>
50
-

+ 225
- 0
ZipTeamOrange/mvnw Просмотреть файл

@@ -0,0 +1,225 @@
1
+#!/bin/sh
2
+# ----------------------------------------------------------------------------
3
+# Licensed to the Apache Software Foundation (ASF) under one
4
+# or more contributor license agreements.  See the NOTICE file
5
+# distributed with this work for additional information
6
+# regarding copyright ownership.  The ASF licenses this file
7
+# to you under the Apache License, Version 2.0 (the
8
+# "License"); you may not use this file except in compliance
9
+# with the License.  You may obtain a copy of the License at
10
+#
11
+#    http://www.apache.org/licenses/LICENSE-2.0
12
+#
13
+# Unless required by applicable law or agreed to in writing,
14
+# software distributed under the License is distributed on an
15
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16
+# KIND, either express or implied.  See the License for the
17
+# specific language governing permissions and limitations
18
+# under the License.
19
+# ----------------------------------------------------------------------------
20
+
21
+# ----------------------------------------------------------------------------
22
+# Maven2 Start Up Batch script
23
+#
24
+# Required ENV vars:
25
+# ------------------
26
+#   JAVA_HOME - location of a JDK home dir
27
+#
28
+# Optional ENV vars
29
+# -----------------
30
+#   M2_HOME - location of maven2's installed home dir
31
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
32
+#     e.g. to debug Maven itself, use
33
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
34
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
35
+# ----------------------------------------------------------------------------
36
+
37
+if [ -z "$MAVEN_SKIP_RC" ] ; then
38
+
39
+  if [ -f /etc/mavenrc ] ; then
40
+    . /etc/mavenrc
41
+  fi
42
+
43
+  if [ -f "$HOME/.mavenrc" ] ; then
44
+    . "$HOME/.mavenrc"
45
+  fi
46
+
47
+fi
48
+
49
+# OS specific support.  $var _must_ be set to either true or false.
50
+cygwin=false;
51
+darwin=false;
52
+mingw=false
53
+case "`uname`" in
54
+  CYGWIN*) cygwin=true ;;
55
+  MINGW*) mingw=true;;
56
+  Darwin*) darwin=true
57
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59
+    if [ -z "$JAVA_HOME" ]; then
60
+      if [ -x "/usr/libexec/java_home" ]; then
61
+        export JAVA_HOME="`/usr/libexec/java_home`"
62
+      else
63
+        export JAVA_HOME="/Library/Java/Home"
64
+      fi
65
+    fi
66
+    ;;
67
+esac
68
+
69
+if [ -z "$JAVA_HOME" ] ; then
70
+  if [ -r /etc/gentoo-release ] ; then
71
+    JAVA_HOME=`java-config --jre-home`
72
+  fi
73
+fi
74
+
75
+if [ -z "$M2_HOME" ] ; then
76
+  ## resolve links - $0 may be a link to maven's home
77
+  PRG="$0"
78
+
79
+  # need this for relative symlinks
80
+  while [ -h "$PRG" ] ; do
81
+    ls=`ls -ld "$PRG"`
82
+    link=`expr "$ls" : '.*-> \(.*\)$'`
83
+    if expr "$link" : '/.*' > /dev/null; then
84
+      PRG="$link"
85
+    else
86
+      PRG="`dirname "$PRG"`/$link"
87
+    fi
88
+  done
89
+
90
+  saveddir=`pwd`
91
+
92
+  M2_HOME=`dirname "$PRG"`/..
93
+
94
+  # make it fully qualified
95
+  M2_HOME=`cd "$M2_HOME" && pwd`
96
+
97
+  cd "$saveddir"
98
+  # echo Using m2 at $M2_HOME
99
+fi
100
+
101
+# For Cygwin, ensure paths are in UNIX format before anything is touched
102
+if $cygwin ; then
103
+  [ -n "$M2_HOME" ] &&
104
+    M2_HOME=`cygpath --unix "$M2_HOME"`
105
+  [ -n "$JAVA_HOME" ] &&
106
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
107
+  [ -n "$CLASSPATH" ] &&
108
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
109
+fi
110
+
111
+# For Migwn, ensure paths are in UNIX format before anything is touched
112
+if $mingw ; then
113
+  [ -n "$M2_HOME" ] &&
114
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
115
+  [ -n "$JAVA_HOME" ] &&
116
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
117
+  # TODO classpath?
118
+fi
119
+
120
+if [ -z "$JAVA_HOME" ]; then
121
+  javaExecutable="`which javac`"
122
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
123
+    # readlink(1) is not available as standard on Solaris 10.
124
+    readLink=`which readlink`
125
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
126
+      if $darwin ; then
127
+        javaHome="`dirname \"$javaExecutable\"`"
128
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
129
+      else
130
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
131
+      fi
132
+      javaHome="`dirname \"$javaExecutable\"`"
133
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
134
+      JAVA_HOME="$javaHome"
135
+      export JAVA_HOME
136
+    fi
137
+  fi
138
+fi
139
+
140
+if [ -z "$JAVACMD" ] ; then
141
+  if [ -n "$JAVA_HOME"  ] ; then
142
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
143
+      # IBM's JDK on AIX uses strange locations for the executables
144
+      JAVACMD="$JAVA_HOME/jre/sh/java"
145
+    else
146
+      JAVACMD="$JAVA_HOME/bin/java"
147
+    fi
148
+  else
149
+    JAVACMD="`which java`"
150
+  fi
151
+fi
152
+
153
+if [ ! -x "$JAVACMD" ] ; then
154
+  echo "Error: JAVA_HOME is not defined correctly." >&2
155
+  echo "  We cannot execute $JAVACMD" >&2
156
+  exit 1
157
+fi
158
+
159
+if [ -z "$JAVA_HOME" ] ; then
160
+  echo "Warning: JAVA_HOME environment variable is not set."
161
+fi
162
+
163
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
164
+
165
+# traverses directory structure from process work directory to filesystem root
166
+# first directory with .mvn subdirectory is considered project base directory
167
+find_maven_basedir() {
168
+
169
+  if [ -z "$1" ]
170
+  then
171
+    echo "Path not specified to find_maven_basedir"
172
+    return 1
173
+  fi
174
+
175
+  basedir="$1"
176
+  wdir="$1"
177
+  while [ "$wdir" != '/' ] ; do
178
+    if [ -d "$wdir"/.mvn ] ; then
179
+      basedir=$wdir
180
+      break
181
+    fi
182
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
183
+    if [ -d "${wdir}" ]; then
184
+      wdir=`cd "$wdir/.."; pwd`
185
+    fi
186
+    # end of workaround
187
+  done
188
+  echo "${basedir}"
189
+}
190
+
191
+# concatenates all lines of a file
192
+concat_lines() {
193
+  if [ -f "$1" ]; then
194
+    echo "$(tr -s '\n' ' ' < "$1")"
195
+  fi
196
+}
197
+
198
+BASE_DIR=`find_maven_basedir "$(pwd)"`
199
+if [ -z "$BASE_DIR" ]; then
200
+  exit 1;
201
+fi
202
+
203
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
204
+echo $MAVEN_PROJECTBASEDIR
205
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
206
+
207
+# For Cygwin, switch paths to Windows format before running java
208
+if $cygwin; then
209
+  [ -n "$M2_HOME" ] &&
210
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
211
+  [ -n "$JAVA_HOME" ] &&
212
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
213
+  [ -n "$CLASSPATH" ] &&
214
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
215
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
216
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
217
+fi
218
+
219
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
220
+
221
+exec "$JAVACMD" \
222
+  $MAVEN_OPTS \
223
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
224
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
225
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

+ 143
- 0
ZipTeamOrange/mvnw.cmd Просмотреть файл

@@ -0,0 +1,143 @@
1
+@REM ----------------------------------------------------------------------------
2
+@REM Licensed to the Apache Software Foundation (ASF) under one
3
+@REM or more contributor license agreements.  See the NOTICE file
4
+@REM distributed with this work for additional information
5
+@REM regarding copyright ownership.  The ASF licenses this file
6
+@REM to you under the Apache License, Version 2.0 (the
7
+@REM "License"); you may not use this file except in compliance
8
+@REM with the License.  You may obtain a copy of the License at
9
+@REM
10
+@REM    http://www.apache.org/licenses/LICENSE-2.0
11
+@REM
12
+@REM Unless required by applicable law or agreed to in writing,
13
+@REM software distributed under the License is distributed on an
14
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15
+@REM KIND, either express or implied.  See the License for the
16
+@REM specific language governing permissions and limitations
17
+@REM under the License.
18
+@REM ----------------------------------------------------------------------------
19
+
20
+@REM ----------------------------------------------------------------------------
21
+@REM Maven2 Start Up Batch script
22
+@REM
23
+@REM Required ENV vars:
24
+@REM JAVA_HOME - location of a JDK home dir
25
+@REM
26
+@REM Optional ENV vars
27
+@REM M2_HOME - location of maven2's installed home dir
28
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
29
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
30
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
31
+@REM     e.g. to debug Maven itself, use
32
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
33
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
34
+@REM ----------------------------------------------------------------------------
35
+
36
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
37
+@echo off
38
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
39
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
40
+
41
+@REM set %HOME% to equivalent of $HOME
42
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
43
+
44
+@REM Execute a user defined script before this one
45
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
46
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
47
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
48
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
49
+:skipRcPre
50
+
51
+@setlocal
52
+
53
+set ERROR_CODE=0
54
+
55
+@REM To isolate internal variables from possible post scripts, we use another setlocal
56
+@setlocal
57
+
58
+@REM ==== START VALIDATION ====
59
+if not "%JAVA_HOME%" == "" goto OkJHome
60
+
61
+echo.
62
+echo Error: JAVA_HOME not found in your environment. >&2
63
+echo Please set the JAVA_HOME variable in your environment to match the >&2
64
+echo location of your Java installation. >&2
65
+echo.
66
+goto error
67
+
68
+:OkJHome
69
+if exist "%JAVA_HOME%\bin\java.exe" goto init
70
+
71
+echo.
72
+echo Error: JAVA_HOME is set to an invalid directory. >&2
73
+echo JAVA_HOME = "%JAVA_HOME%" >&2
74
+echo Please set the JAVA_HOME variable in your environment to match the >&2
75
+echo location of your Java installation. >&2
76
+echo.
77
+goto error
78
+
79
+@REM ==== END VALIDATION ====
80
+
81
+:init
82
+
83
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
84
+@REM Fallback to current working directory if not found.
85
+
86
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
87
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
88
+
89
+set EXEC_DIR=%CD%
90
+set WDIR=%EXEC_DIR%
91
+:findBaseDir
92
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
93
+cd ..
94
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
95
+set WDIR=%CD%
96
+goto findBaseDir
97
+
98
+:baseDirFound
99
+set MAVEN_PROJECTBASEDIR=%WDIR%
100
+cd "%EXEC_DIR%"
101
+goto endDetectBaseDir
102
+
103
+:baseDirNotFound
104
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
105
+cd "%EXEC_DIR%"
106
+
107
+:endDetectBaseDir
108
+
109
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
110
+
111
+@setlocal EnableExtensions EnableDelayedExpansion
112
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
113
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
114
+
115
+:endReadAdditionalConfig
116
+
117
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
118
+
119
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
120
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
121
+
122
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
123
+if ERRORLEVEL 1 goto error
124
+goto end
125
+
126
+:error
127
+set ERROR_CODE=1
128
+
129
+:end
130
+@endlocal & set ERROR_CODE=%ERROR_CODE%
131
+
132
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
133
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
134
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
135
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
136
+:skipRcPost
137
+
138
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
139
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
140
+
141
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
142
+
143
+exit /B %ERROR_CODE%

+ 54
- 61
ZipTeamOrange/pom.xml Просмотреть файл

@@ -1,71 +1,64 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<project xmlns="http://maven.apache.org/POM/4.0.0"
3
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5
-    <modelVersion>4.0.0</modelVersion>
2
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
+	<modelVersion>4.0.0</modelVersion>
6 5
 
7
-    <groupId>com ZipTeam</groupId>
8
-    <artifactId>ZipTeamOrange</artifactId>
9
-    <version>1.0-SNAPSHOT</version>
6
+	<groupId>com.example</groupId>
7
+	<artifactId>demo</artifactId>
8
+	<version>0.0.1-SNAPSHOT</version>
9
+	<packaging>jar</packaging>
10 10
 
11
-    <parent>
12
-        <groupId>org.springframework.boot</groupId>
13
-        <artifactId>spring-boot-starter-parent</artifactId>
14
-        <version>2.0.3.RELEASE</version>
15
-    </parent>
11
+	<name>demo</name>
12
+	<description>Demo project for Spring Boot</description>
16 13
 
17
-    <dependencies>
18
-        <dependency>
19
-            <groupId>org.springframework.boot</groupId>
20
-            <artifactId>spring-boot-starter-web</artifactId>
21
-        </dependency>
22
-        <dependency>
23
-            <groupId>org.springframework.boot</groupId>
24
-            <artifactId>spring-boot-starter-test</artifactId>
25
-            <scope>test</scope>
26
-        </dependency>
27
-        <dependency>
28
-            <groupId>junit</groupId>
29
-            <artifactId>junit</artifactId>
30
-        </dependency>
31
-        <dependency>
32
-            <groupId>org.springframework.boot</groupId>
33
-            <artifactId>spring-boot-test-autoconfigure</artifactId>
34
-        </dependency>
35
-        <dependency>
36
-            <groupId>org.springframework</groupId>
37
-            <artifactId>spring-test</artifactId>
38
-            <version>5.0.7.RELEASE</version>
39
-            <scope>compile</scope>
40
-        </dependency>
41
-        <dependency>
42
-            <groupId>org.hamcrest</groupId>
43
-            <artifactId>hamcrest-library</artifactId>
44
-        </dependency>
45
-        <dependency>
46
-            <groupId>org.springframework.boot</groupId>
47
-            <artifactId>spring-boot-starter-actuator</artifactId>
48
-        </dependency>
14
+	<parent>
15
+		<groupId>org.springframework.boot</groupId>
16
+		<artifactId>spring-boot-starter-parent</artifactId>
17
+		<version>2.0.3.RELEASE</version>
18
+		<relativePath/> <!-- lookup parent from repository -->
19
+	</parent>
49 20
 
50
-        <dependency>
51
-            <groupId>org.springframework.boot</groupId>
52
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
53
-        </dependency>
54
-    </dependencies>
21
+	<properties>
22
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24
+		<java.version>1.8</java.version>
25
+	</properties>
55 26
 
56
-    <properties>
57
-        <java.version>1.8</java.version>
58
-    </properties>
27
+	<dependencies>
28
+		<dependency>
29
+			<groupId>org.springframework.boot</groupId>
30
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
31
+		</dependency>
32
+		<dependency>
33
+			<groupId>org.springframework.boot</groupId>
34
+			<artifactId>spring-boot-starter-web</artifactId>
35
+		</dependency>
59 36
 
60
-    <build>
61
-        <plugins>
62
-            <plugin>
63
-                <groupId>org.springframework.boot</groupId>
64
-                <artifactId>spring-boot-maven-plugin</artifactId>
65
-            </plugin>
66
-        </plugins>
67
-    </build>
37
+		<dependency>
38
+			<groupId>org.springframework.boot</groupId>
39
+			<artifactId>spring-boot-devtools</artifactId>
40
+			<scope>runtime</scope>
41
+		</dependency>
42
+		<dependency>
43
+			<groupId>mysql</groupId>
44
+			<artifactId>mysql-connector-java</artifactId>
45
+			<scope>runtime</scope>
46
+		</dependency>
47
+		<dependency>
48
+			<groupId>org.springframework.boot</groupId>
49
+			<artifactId>spring-boot-starter-test</artifactId>
50
+			<scope>test</scope>
51
+		</dependency>
52
+	</dependencies>
68 53
 
54
+	<build>
55
+		<plugins>
56
+			<plugin>
57
+				<groupId>org.springframework.boot</groupId>
58
+				<artifactId>spring-boot-maven-plugin</artifactId>
59
+			</plugin>
60
+		</plugins>
61
+	</build>
69 62
 
70 63
 
71
-</project>
64
+</project>

Двоичные данные
ZipTeamOrange/src/.DS_Store Просмотреть файл


Двоичные данные
ZipTeamOrange/src/main/.DS_Store Просмотреть файл


Двоичные данные
ZipTeamOrange/src/main/java/.DS_Store Просмотреть файл


+ 0
- 6
ZipTeamOrange/src/main/java/Controller.java Просмотреть файл

@@ -1,6 +0,0 @@
1
-
2
-
3
-public abstract class Controller {
4
-
5
-    private String url;
6
-}

+ 0
- 18
ZipTeamOrange/src/main/java/MessageController.java Просмотреть файл

@@ -1,18 +0,0 @@
1
-public class MessageController extends Controller {
2
-
3
-    private Message message;
4
-    private String uri;
5
-
6
-    public  String get(User user) {
7
-        return user.toString();
8
-    }
9
-    public String put(User user) {
10
-        return user.toString();
11
-    }
12
-
13
-    public String post(User user) {
14
-        return user.toString();
15
-    }
16
-
17
-    public String delete(User user) { return user.toString(); }
18
-}

+ 0
- 7
ZipTeamOrange/src/main/java/MessageRepository.java Просмотреть файл

@@ -1,7 +0,0 @@
1
-import org.springframework.data.jpa.repository.JpaRepository;
2
-import java.util.List;
3
-
4
-interface MessageRespository extends JpaRepository<User, Integer> {
5
-
6
-    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
7
-}

Двоичные данные
ZipTeamOrange/src/main/java/com/.DS_Store Просмотреть файл


ZipTeamOrange/src/main/java/Chat.java → ZipTeamOrange/src/main/java/com/Chat.java Просмотреть файл


ZipTeamOrange/src/main/java/ChatController.java → ZipTeamOrange/src/main/java/com/ChatController.java Просмотреть файл


ZipTeamOrange/src/main/java/ChatRepository.java → ZipTeamOrange/src/main/java/com/ChatRepository.java Просмотреть файл


+ 7
- 0
ZipTeamOrange/src/main/java/com/Controller.java Просмотреть файл

@@ -0,0 +1,7 @@
1
+import org.springframework.web.bind.annotation.RestController;
2
+
3
+@RestController
4
+public abstract class Controller {
5
+
6
+    private String url;
7
+}

ZipTeamOrange/src/main/java/Main.java → ZipTeamOrange/src/main/java/com/Main.java Просмотреть файл


ZipTeamOrange/src/main/java/Message.java → ZipTeamOrange/src/main/java/com/Message.java Просмотреть файл

@@ -1,7 +1,14 @@
1
+import javax.persistence.Entity;
2
+import javax.persistence.GeneratedValue;
3
+import javax.persistence.Id;
1 4
 import java.util.Date;
2 5
 
6
+@Entity
3 7
 public class Message {
8
+    @Id
9
+    @GeneratedValue
4 10
     private int messageId;
11
+
5 12
     private String text;
6 13
     private Date timestamp;
7 14
     private int userId;

+ 33
- 0
ZipTeamOrange/src/main/java/com/MessageController.java Просмотреть файл

@@ -0,0 +1,33 @@
1
+import org.springframework.beans.factory.annotation.Autowired;
2
+import org.springframework.web.bind.annotation.RequestMapping;
3
+import org.springframework.web.bind.annotation.RequestMethod;
4
+import org.springframework.web.bind.annotation.RestController;
5
+
6
+@RestController
7
+public class MessageController extends Controller {
8
+
9
+    private Message message;
10
+    private String uri;
11
+
12
+
13
+    @Autowired
14
+    private  MessageRespository messageRespository;
15
+
16
+    @RequestMapping(method = RequestMethod.GET, value = "/message")
17
+    public  String get(User user) {
18
+        return user.toString();
19
+    }
20
+
21
+    @RequestMapping(method = RequestMethod.PUT, value = "/message")
22
+    public String put(User user) {
23
+        return user.toString();
24
+    }
25
+
26
+    @RequestMapping(method = RequestMethod.POST, value = "/message")
27
+    public String post(User user) {
28
+        return user.toString();
29
+    }
30
+
31
+    @RequestMapping(method = RequestMethod.DELETE, value = "/message")
32
+    public String delete(User user) { return user.toString(); }
33
+}

+ 11
- 0
ZipTeamOrange/src/main/java/com/MessageRepository.java Просмотреть файл

@@ -0,0 +1,11 @@
1
+import org.springframework.data.jpa.repository.JpaRepository;
2
+import org.springframework.data.repository.CrudRepository;
3
+import org.springframework.stereotype.Repository;
4
+
5
+import java.util.List;
6
+
7
+@Repository
8
+interface MessageRespository extends CrudRepository<Message, Integer> {
9
+
10
+    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
11
+}

ZipTeamOrange/src/main/java/User.java → ZipTeamOrange/src/main/java/com/User.java Просмотреть файл


ZipTeamOrange/src/main/java/UserController.java → ZipTeamOrange/src/main/java/com/UserController.java Просмотреть файл


ZipTeamOrange/src/main/java/UserRepository.java → ZipTeamOrange/src/main/java/com/UserRepository.java Просмотреть файл


Двоичные данные
ZipTeamOrange/src/main/java/com/example/.DS_Store Просмотреть файл


+ 12
- 0
ZipTeamOrange/src/main/java/com/example/demo/DemoApplication.java Просмотреть файл

@@ -0,0 +1,12 @@
1
+package com.example.demo;
2
+
3
+import org.springframework.boot.SpringApplication;
4
+import org.springframework.boot.autoconfigure.SpringBootApplication;
5
+
6
+@SpringBootApplication
7
+public class DemoApplication {
8
+
9
+	public static void main(String[] args) {
10
+		SpringApplication.run(DemoApplication.class, args);
11
+	}
12
+}

+ 0
- 0
ZipTeamOrange/src/main/resources/application.properties Просмотреть файл


+ 16
- 0
ZipTeamOrange/src/test/java/com/example/demo/DemoApplicationTests.java Просмотреть файл

@@ -0,0 +1,16 @@
1
+package com.example.demo;
2
+
3
+import org.junit.Test;
4
+import org.junit.runner.RunWith;
5
+import org.springframework.boot.test.context.SpringBootTest;
6
+import org.springframework.test.context.junit4.SpringRunner;
7
+
8
+@RunWith(SpringRunner.class)
9
+@SpringBootTest
10
+public class DemoApplicationTests {
11
+
12
+	@Test
13
+	public void contextLoads() {
14
+	}
15
+
16
+}