Commit 87ff65bb5980b5626dfdb649091da0b6c9bed528
1 parent
2b1b78af
Reorganisation des modules
Showing
41 changed files
with
2099 additions
and
185 deletions
Show diff stats
PositioningServer/.idea/workspace.xml
@@ -18,117 +18,21 @@ | @@ -18,117 +18,21 @@ | ||
18 | <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> | 18 | <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> |
19 | <component name="FileEditorManager"> | 19 | <component name="FileEditorManager"> |
20 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 20 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
21 | - <file leaf-file-name="CalibrationServlet.java" pinned="false" current-in-tab="false"> | ||
22 | - <entry file="file://$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/CalibrationServlet.java"> | 21 | + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> |
22 | + <entry file="file://$PROJECT_DIR$/pom.xml"> | ||
23 | <provider selected="true" editor-type-id="text-editor"> | 23 | <provider selected="true" editor-type-id="text-editor"> |
24 | - <state relative-caret-position="0"> | ||
25 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> | 24 | + <state relative-caret-position="777"> |
25 | + <caret line="58" column="19" lean-forward="true" selection-start-line="22" selection-start-column="4" selection-end-line="58" selection-end-column="19" /> | ||
26 | <folding /> | 26 | <folding /> |
27 | </state> | 27 | </state> |
28 | </provider> | 28 | </provider> |
29 | </entry> | 29 | </entry> |
30 | </file> | 30 | </file> |
31 | - <file leaf-file-name="PositioningServlet.java" pinned="false" current-in-tab="false"> | ||
32 | - <entry file="file://$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/PositioningServlet.java"> | 31 | + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true"> |
32 | + <entry file="file://$PROJECT_DIR$/Server_Servlets/pom.xml"> | ||
33 | <provider selected="true" editor-type-id="text-editor"> | 33 | <provider selected="true" editor-type-id="text-editor"> |
34 | - <state relative-caret-position="128"> | ||
35 | - <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" /> | ||
36 | - <folding /> | ||
37 | - </state> | ||
38 | - </provider> | ||
39 | - </entry> | ||
40 | - </file> | ||
41 | - <file leaf-file-name="HibernateDao.java" pinned="false" current-in-tab="false"> | ||
42 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java"> | ||
43 | - <provider selected="true" editor-type-id="text-editor"> | ||
44 | - <state relative-caret-position="672"> | ||
45 | - <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" /> | ||
46 | - <folding> | ||
47 | - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" /> | ||
48 | - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" /> | ||
49 | - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" /> | ||
50 | - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" /> | ||
51 | - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" /> | ||
52 | - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" /> | ||
53 | - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" /> | ||
54 | - </folding> | ||
55 | - </state> | ||
56 | - </provider> | ||
57 | - </entry> | ||
58 | - </file> | ||
59 | - <file leaf-file-name="ServerApp.java" pinned="false" current-in-tab="false"> | ||
60 | - <entry file="file://$PROJECT_DIR$/src/main/java/ServerApp.java"> | ||
61 | - <provider selected="true" editor-type-id="text-editor"> | ||
62 | - <state relative-caret-position="208"> | ||
63 | - <caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" /> | ||
64 | - <folding> | ||
65 | - <element signature="imports" expanded="true" /> | ||
66 | - </folding> | ||
67 | - </state> | ||
68 | - </provider> | ||
69 | - </entry> | ||
70 | - </file> | ||
71 | - <file leaf-file-name="Mape.java" pinned="false" current-in-tab="false"> | ||
72 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Mape.java"> | ||
73 | - <provider selected="true" editor-type-id="text-editor"> | ||
74 | - <state relative-caret-position="128"> | ||
75 | - <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" /> | ||
76 | - <folding> | ||
77 | - <element signature="imports" expanded="true" /> | ||
78 | - </folding> | ||
79 | - </state> | ||
80 | - </provider> | ||
81 | - </entry> | ||
82 | - </file> | ||
83 | - <file leaf-file-name="web.xml" pinned="false" current-in-tab="false"> | ||
84 | - <entry file="file://$PROJECT_DIR$/Server_Servlets/src/WEB-INF/web.xml"> | ||
85 | - <provider selected="true" editor-type-id="text-editor"> | ||
86 | - <state relative-caret-position="272"> | ||
87 | - <caret line="17" column="29" lean-forward="false" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" /> | ||
88 | - <folding /> | ||
89 | - </state> | ||
90 | - </provider> | ||
91 | - </entry> | ||
92 | - </file> | ||
93 | - <file leaf-file-name="hibernate.cfg.xml" pinned="false" current-in-tab="true"> | ||
94 | - <entry file="file://$PROJECT_DIR$/src/main/resources/hibernate.cfg.xml"> | ||
95 | - <provider selected="true" editor-type-id="text-editor"> | ||
96 | - <state relative-caret-position="224"> | ||
97 | - <caret line="14" column="63" lean-forward="false" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" /> | ||
98 | - <folding /> | ||
99 | - </state> | ||
100 | - </provider> | ||
101 | - </entry> | ||
102 | - </file> | ||
103 | - <file leaf-file-name="AccessPoint.java" pinned="false" current-in-tab="false"> | ||
104 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/AccessPoint.java"> | ||
105 | - <provider selected="true" editor-type-id="text-editor"> | ||
106 | - <state relative-caret-position="192"> | ||
107 | - <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" /> | ||
108 | - <folding> | ||
109 | - <element signature="imports" expanded="true" /> | ||
110 | - </folding> | ||
111 | - </state> | ||
112 | - </provider> | ||
113 | - </entry> | ||
114 | - </file> | ||
115 | - <file leaf-file-name="Location.java" pinned="false" current-in-tab="false"> | ||
116 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Location.java"> | ||
117 | - <provider selected="true" editor-type-id="text-editor"> | ||
118 | - <state relative-caret-position="192"> | ||
119 | - <caret line="13" column="24" lean-forward="false" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" /> | ||
120 | - <folding> | ||
121 | - <element signature="imports" expanded="true" /> | ||
122 | - </folding> | ||
123 | - </state> | ||
124 | - </provider> | ||
125 | - </entry> | ||
126 | - </file> | ||
127 | - <file leaf-file-name="HibernateUtil.java" pinned="false" current-in-tab="false"> | ||
128 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/utils/HibernateUtil.java"> | ||
129 | - <provider selected="true" editor-type-id="text-editor"> | ||
130 | - <state relative-caret-position="96"> | ||
131 | - <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> | 34 | + <state relative-caret-position="255"> |
35 | + <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="23" selection-end-column="19" /> | ||
132 | <folding /> | 36 | <folding /> |
133 | </state> | 37 | </state> |
134 | </provider> | 38 | </provider> |
@@ -192,10 +96,10 @@ | @@ -192,10 +96,10 @@ | ||
192 | </option> | 96 | </option> |
193 | </component> | 97 | </component> |
194 | <component name="ProjectFrameBounds"> | 98 | <component name="ProjectFrameBounds"> |
195 | - <option name="x" value="54" /> | 99 | + <option name="x" value="-8" /> |
196 | <option name="y" value="-8" /> | 100 | <option name="y" value="-8" /> |
197 | - <option name="width" value="1320" /> | ||
198 | - <option name="height" value="784" /> | 101 | + <option name="width" value="1936" /> |
102 | + <option name="height" value="1056" /> | ||
199 | </component> | 103 | </component> |
200 | <component name="ProjectView"> | 104 | <component name="ProjectView"> |
201 | <navigator currentView="ProjectPane" proportions="" version="1"> | 105 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -237,20 +141,6 @@ | @@ -237,20 +141,6 @@ | ||
237 | <option name="myItemId" value="src" /> | 141 | <option name="myItemId" value="src" /> |
238 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 142 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
239 | </PATH_ELEMENT> | 143 | </PATH_ELEMENT> |
240 | - </PATH> | ||
241 | - <PATH> | ||
242 | - <PATH_ELEMENT> | ||
243 | - <option name="myItemId" value="PositioningServer" /> | ||
244 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
245 | - </PATH_ELEMENT> | ||
246 | - <PATH_ELEMENT> | ||
247 | - <option name="myItemId" value="PositioningServer" /> | ||
248 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
249 | - </PATH_ELEMENT> | ||
250 | - <PATH_ELEMENT> | ||
251 | - <option name="myItemId" value="src" /> | ||
252 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
253 | - </PATH_ELEMENT> | ||
254 | <PATH_ELEMENT> | 144 | <PATH_ELEMENT> |
255 | <option name="myItemId" value="main" /> | 145 | <option name="myItemId" value="main" /> |
256 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 146 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
@@ -402,24 +292,50 @@ | @@ -402,24 +292,50 @@ | ||
402 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 292 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
403 | </PATH_ELEMENT> | 293 | </PATH_ELEMENT> |
404 | </PATH> | 294 | </PATH> |
295 | + <PATH> | ||
296 | + <PATH_ELEMENT> | ||
297 | + <option name="myItemId" value="PositioningServer" /> | ||
298 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
299 | + </PATH_ELEMENT> | ||
300 | + <PATH_ELEMENT> | ||
301 | + <option name="myItemId" value="PositioningServer" /> | ||
302 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
303 | + </PATH_ELEMENT> | ||
304 | + <PATH_ELEMENT> | ||
305 | + <option name="myItemId" value="Server_Servlets" /> | ||
306 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
307 | + </PATH_ELEMENT> | ||
308 | + </PATH> | ||
405 | </subPane> | 309 | </subPane> |
406 | </pane> | 310 | </pane> |
311 | + <pane id="PackagesPane" /> | ||
407 | <pane id="Scope" /> | 312 | <pane id="Scope" /> |
408 | <pane id="Scratches" /> | 313 | <pane id="Scratches" /> |
409 | - <pane id="PackagesPane" /> | ||
410 | </panes> | 314 | </panes> |
411 | </component> | 315 | </component> |
412 | <component name="PropertiesComponent"> | 316 | <component name="PropertiesComponent"> |
413 | <property name="project.structure.last.edited" value="Modules" /> | 317 | <property name="project.structure.last.edited" value="Modules" /> |
414 | <property name="project.structure.proportion" value="0.15" /> | 318 | <property name="project.structure.proportion" value="0.15" /> |
415 | <property name="project.structure.side.proportion" value="0.2" /> | 319 | <property name="project.structure.side.proportion" value="0.2" /> |
416 | - <property name="last_opened_file_path" value="$USER_HOME$/Documents/LO54-JEE-MiniProjet" /> | 320 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../LO54-JEE-MiniProjet" /> |
417 | </component> | 321 | </component> |
418 | <component name="RecentsManager"> | 322 | <component name="RecentsManager"> |
419 | <key name="MoveFile.RECENT_KEYS"> | 323 | <key name="MoveFile.RECENT_KEYS"> |
420 | <recent name="C:\Users\Guillaume\Desktop\UTBM\cours-UV\GI04_P2017\LO53\PositioningServer\Server_Servlets\src\WEB-INF\servlets" /> | 324 | <recent name="C:\Users\Guillaume\Desktop\UTBM\cours-UV\GI04_P2017\LO53\PositioningServer\Server_Servlets\src\WEB-INF\servlets" /> |
421 | </key> | 325 | </key> |
422 | </component> | 326 | </component> |
327 | + <component name="RunDashboard"> | ||
328 | + <option name="ruleStates"> | ||
329 | + <list> | ||
330 | + <RuleState> | ||
331 | + <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> | ||
332 | + </RuleState> | ||
333 | + <RuleState> | ||
334 | + <option name="name" value="StatusDashboardGroupingRule" /> | ||
335 | + </RuleState> | ||
336 | + </list> | ||
337 | + </option> | ||
338 | + </component> | ||
423 | <component name="RunManager" selected="Application.ServerApp"> | 339 | <component name="RunManager" selected="Application.ServerApp"> |
424 | <configuration default="false" name="ServerApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> | 340 | <configuration default="false" name="ServerApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> |
425 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | 341 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> |
@@ -663,10 +579,9 @@ | @@ -663,10 +579,9 @@ | ||
663 | <servers /> | 579 | <servers /> |
664 | </component> | 580 | </component> |
665 | <component name="ToolWindowManager"> | 581 | <component name="ToolWindowManager"> |
666 | - <frame x="54" y="-8" width="1320" height="784" extended-state="6" /> | 582 | + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
667 | <editor active="true" /> | 583 | <editor active="true" /> |
668 | <layout> | 584 | <layout> |
669 | - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
670 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 585 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
671 | <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 586 | <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
672 | <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> | 587 | <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> |
@@ -680,14 +595,14 @@ | @@ -680,14 +595,14 @@ | ||
680 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> | 595 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> |
681 | <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | 596 | <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
682 | <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | 597 | <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
683 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2208589" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 598 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22083333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
684 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 599 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
685 | <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 600 | <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
686 | - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||
687 | <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 601 | <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
688 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> | 602 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> |
689 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.398773" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | 603 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.398773" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
690 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | 604 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
605 | + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
691 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 606 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
692 | <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | 607 | <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
693 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 608 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
@@ -695,6 +610,7 @@ | @@ -695,6 +610,7 @@ | ||
695 | <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> | 610 | <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> |
696 | <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> | 611 | <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> |
697 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> | 612 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> |
613 | + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||
698 | <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> | 614 | <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> |
699 | <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.65185183" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> | 615 | <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.65185183" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> |
700 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | 616 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
@@ -1020,28 +936,7 @@ | @@ -1020,28 +936,7 @@ | ||
1020 | </state> | 936 | </state> |
1021 | </provider> | 937 | </provider> |
1022 | </entry> | 938 | </entry> |
1023 | - <entry file="file://$PROJECT_DIR$/Server_Servlets/pom.xml"> | ||
1024 | - <provider selected="true" editor-type-id="text-editor"> | ||
1025 | - <state relative-caret-position="0"> | ||
1026 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
1027 | - </state> | ||
1028 | - </provider> | ||
1029 | - </entry> | ||
1030 | <entry file="file://$PROJECT_DIR$/src/main/resources/hbm/AccessPoint.hbm.xml" /> | 939 | <entry file="file://$PROJECT_DIR$/src/main/resources/hbm/AccessPoint.hbm.xml" /> |
1031 | - <entry file="file://$PROJECT_DIR$/pom.xml"> | ||
1032 | - <provider selected="true" editor-type-id="text-editor"> | ||
1033 | - <state relative-caret-position="112"> | ||
1034 | - <caret line="25" column="25" lean-forward="false" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" /> | ||
1035 | - </state> | ||
1036 | - </provider> | ||
1037 | - </entry> | ||
1038 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/DebianDao.java"> | ||
1039 | - <provider selected="true" editor-type-id="text-editor"> | ||
1040 | - <state relative-caret-position="112"> | ||
1041 | - <caret line="7" column="56" lean-forward="false" selection-start-line="7" selection-start-column="56" selection-end-line="7" selection-end-column="56" /> | ||
1042 | - </state> | ||
1043 | - </provider> | ||
1044 | - </entry> | ||
1045 | <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/RssiRecord.java"> | 940 | <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/RssiRecord.java"> |
1046 | <provider selected="true" editor-type-id="text-editor"> | 941 | <provider selected="true" editor-type-id="text-editor"> |
1047 | <state relative-caret-position="288"> | 942 | <state relative-caret-position="288"> |
@@ -1056,16 +951,10 @@ | @@ -1056,16 +951,10 @@ | ||
1056 | </state> | 951 | </state> |
1057 | </provider> | 952 | </provider> |
1058 | </entry> | 953 | </entry> |
1059 | - <entry file="jar://$MAVEN_REPOSITORY$/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar!/javax/servlet/http/HttpServlet.class"> | ||
1060 | - <provider selected="true" editor-type-id="text-editor"> | ||
1061 | - <state relative-caret-position="96"> | ||
1062 | - <caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" /> | ||
1063 | - </state> | ||
1064 | - </provider> | ||
1065 | - </entry> | 954 | + <entry file="jar://$MAVEN_REPOSITORY$/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar!/javax/servlet/http/HttpServlet.class" /> |
1066 | <entry file="file://$PROJECT_DIR$/Server_Servlets/src/WEB-INF/web.xml"> | 955 | <entry file="file://$PROJECT_DIR$/Server_Servlets/src/WEB-INF/web.xml"> |
1067 | <provider selected="true" editor-type-id="text-editor"> | 956 | <provider selected="true" editor-type-id="text-editor"> |
1068 | - <state relative-caret-position="272"> | 957 | + <state relative-caret-position="289"> |
1069 | <caret line="17" column="29" lean-forward="false" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" /> | 958 | <caret line="17" column="29" lean-forward="false" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" /> |
1070 | <folding /> | 959 | <folding /> |
1071 | </state> | 960 | </state> |
@@ -1075,55 +964,77 @@ | @@ -1075,55 +964,77 @@ | ||
1075 | <provider selected="true" editor-type-id="text-editor"> | 964 | <provider selected="true" editor-type-id="text-editor"> |
1076 | <state relative-caret-position="0"> | 965 | <state relative-caret-position="0"> |
1077 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> | 966 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> |
1078 | - <folding /> | 967 | + <folding> |
968 | + <element signature="imports" expanded="false" /> | ||
969 | + </folding> | ||
1079 | </state> | 970 | </state> |
1080 | </provider> | 971 | </provider> |
1081 | </entry> | 972 | </entry> |
1082 | <entry file="file://$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/PositioningServlet.java"> | 973 | <entry file="file://$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/PositioningServlet.java"> |
1083 | <provider selected="true" editor-type-id="text-editor"> | 974 | <provider selected="true" editor-type-id="text-editor"> |
1084 | - <state relative-caret-position="128"> | 975 | + <state relative-caret-position="136"> |
1085 | <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" /> | 976 | <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" /> |
1086 | - <folding /> | 977 | + <folding> |
978 | + <element signature="imports" expanded="false" /> | ||
979 | + </folding> | ||
980 | + </state> | ||
981 | + </provider> | ||
982 | + </entry> | ||
983 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java"> | ||
984 | + <provider selected="true" editor-type-id="text-editor"> | ||
985 | + <state relative-caret-position="213"> | ||
986 | + <caret line="23" column="39" lean-forward="false" selection-start-line="23" selection-start-column="39" selection-end-line="23" selection-end-column="39" /> | ||
987 | + <folding> | ||
988 | + <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" /> | ||
989 | + <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" /> | ||
990 | + <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" /> | ||
991 | + <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" /> | ||
992 | + <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" /> | ||
993 | + <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" /> | ||
994 | + <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" /> | ||
995 | + </folding> | ||
1087 | </state> | 996 | </state> |
1088 | </provider> | 997 | </provider> |
1089 | </entry> | 998 | </entry> |
1090 | <entry file="file://$PROJECT_DIR$/src/main/java/ServerApp.java"> | 999 | <entry file="file://$PROJECT_DIR$/src/main/java/ServerApp.java"> |
1091 | <provider selected="true" editor-type-id="text-editor"> | 1000 | <provider selected="true" editor-type-id="text-editor"> |
1092 | - <state relative-caret-position="208"> | ||
1093 | - <caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" /> | 1001 | + <state relative-caret-position="306"> |
1002 | + <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> | ||
1094 | <folding> | 1003 | <folding> |
1095 | <element signature="imports" expanded="true" /> | 1004 | <element signature="imports" expanded="true" /> |
1096 | </folding> | 1005 | </folding> |
1097 | </state> | 1006 | </state> |
1098 | </provider> | 1007 | </provider> |
1099 | </entry> | 1008 | </entry> |
1100 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/utils/HibernateUtil.java"> | 1009 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/DebianDao.java"> |
1101 | <provider selected="true" editor-type-id="text-editor"> | 1010 | <provider selected="true" editor-type-id="text-editor"> |
1102 | - <state relative-caret-position="96"> | ||
1103 | - <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> | 1011 | + <state relative-caret-position="119"> |
1012 | + <caret line="7" column="56" lean-forward="false" selection-start-line="7" selection-start-column="56" selection-end-line="7" selection-end-column="56" /> | ||
1104 | <folding /> | 1013 | <folding /> |
1105 | </state> | 1014 | </state> |
1106 | </provider> | 1015 | </provider> |
1107 | </entry> | 1016 | </entry> |
1108 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java"> | 1017 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Mape.java"> |
1109 | <provider selected="true" editor-type-id="text-editor"> | 1018 | <provider selected="true" editor-type-id="text-editor"> |
1110 | - <state relative-caret-position="672"> | ||
1111 | - <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" /> | 1019 | + <state relative-caret-position="128"> |
1020 | + <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" /> | ||
1112 | <folding> | 1021 | <folding> |
1113 | - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" /> | ||
1114 | - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" /> | ||
1115 | - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" /> | ||
1116 | - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" /> | ||
1117 | - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" /> | ||
1118 | - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" /> | ||
1119 | - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" /> | 1022 | + <element signature="imports" expanded="true" /> |
1120 | </folding> | 1023 | </folding> |
1121 | </state> | 1024 | </state> |
1122 | </provider> | 1025 | </provider> |
1123 | </entry> | 1026 | </entry> |
1027 | + <entry file="file://$PROJECT_DIR$/src/main/resources/hibernate.cfg.xml"> | ||
1028 | + <provider selected="true" editor-type-id="text-editor"> | ||
1029 | + <state relative-caret-position="238"> | ||
1030 | + <caret line="14" column="63" lean-forward="false" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" /> | ||
1031 | + <folding /> | ||
1032 | + </state> | ||
1033 | + </provider> | ||
1034 | + </entry> | ||
1124 | <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/AccessPoint.java"> | 1035 | <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/AccessPoint.java"> |
1125 | <provider selected="true" editor-type-id="text-editor"> | 1036 | <provider selected="true" editor-type-id="text-editor"> |
1126 | - <state relative-caret-position="192"> | 1037 | + <state relative-caret-position="221"> |
1127 | <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" /> | 1038 | <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" /> |
1128 | <folding> | 1039 | <folding> |
1129 | <element signature="imports" expanded="true" /> | 1040 | <element signature="imports" expanded="true" /> |
@@ -1133,7 +1044,7 @@ | @@ -1133,7 +1044,7 @@ | ||
1133 | </entry> | 1044 | </entry> |
1134 | <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Location.java"> | 1045 | <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Location.java"> |
1135 | <provider selected="true" editor-type-id="text-editor"> | 1046 | <provider selected="true" editor-type-id="text-editor"> |
1136 | - <state relative-caret-position="192"> | 1047 | + <state relative-caret-position="221"> |
1137 | <caret line="13" column="24" lean-forward="false" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" /> | 1048 | <caret line="13" column="24" lean-forward="false" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" /> |
1138 | <folding> | 1049 | <folding> |
1139 | <element signature="imports" expanded="true" /> | 1050 | <element signature="imports" expanded="true" /> |
@@ -1141,20 +1052,30 @@ | @@ -1141,20 +1052,30 @@ | ||
1141 | </state> | 1052 | </state> |
1142 | </provider> | 1053 | </provider> |
1143 | </entry> | 1054 | </entry> |
1144 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Mape.java"> | 1055 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/utils/HibernateUtil.java"> |
1145 | <provider selected="true" editor-type-id="text-editor"> | 1056 | <provider selected="true" editor-type-id="text-editor"> |
1146 | - <state relative-caret-position="128"> | ||
1147 | - <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" /> | 1057 | + <state relative-caret-position="102"> |
1058 | + <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> | ||
1148 | <folding> | 1059 | <folding> |
1149 | - <element signature="imports" expanded="true" /> | 1060 | + <element signature="imports" expanded="false" /> |
1061 | + <element signature="e#729#730#0" expanded="false" /> | ||
1062 | + <element signature="e#766#767#0" expanded="false" /> | ||
1150 | </folding> | 1063 | </folding> |
1151 | </state> | 1064 | </state> |
1152 | </provider> | 1065 | </provider> |
1153 | </entry> | 1066 | </entry> |
1154 | - <entry file="file://$PROJECT_DIR$/src/main/resources/hibernate.cfg.xml"> | 1067 | + <entry file="file://$PROJECT_DIR$/pom.xml"> |
1155 | <provider selected="true" editor-type-id="text-editor"> | 1068 | <provider selected="true" editor-type-id="text-editor"> |
1156 | - <state relative-caret-position="224"> | ||
1157 | - <caret line="14" column="63" lean-forward="false" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" /> | 1069 | + <state relative-caret-position="777"> |
1070 | + <caret line="58" column="19" lean-forward="true" selection-start-line="22" selection-start-column="4" selection-end-line="58" selection-end-column="19" /> | ||
1071 | + <folding /> | ||
1072 | + </state> | ||
1073 | + </provider> | ||
1074 | + </entry> | ||
1075 | + <entry file="file://$PROJECT_DIR$/Server_Servlets/pom.xml"> | ||
1076 | + <provider selected="true" editor-type-id="text-editor"> | ||
1077 | + <state relative-caret-position="255"> | ||
1078 | + <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="23" selection-end-column="19" /> | ||
1158 | <folding /> | 1079 | <folding /> |
1159 | </state> | 1080 | </state> |
1160 | </provider> | 1081 | </provider> |
PositioningServer/PositioningServer.iml
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> | 2 | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
3 | - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> | 3 | + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> |
4 | <output url="file://$MODULE_DIR$/target/classes" /> | 4 | <output url="file://$MODULE_DIR$/target/classes" /> |
5 | <output-test url="file://$MODULE_DIR$/target/test-classes" /> | 5 | <output-test url="file://$MODULE_DIR$/target/test-classes" /> |
6 | <content url="file://$MODULE_DIR$"> | 6 | <content url="file://$MODULE_DIR$"> |
PositioningServer/Server_Servlets/Server_Servlets.iml
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> | 2 | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
3 | - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> | 3 | + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6"> |
4 | <output url="file://$MODULE_DIR$/target/classes" /> | 4 | <output url="file://$MODULE_DIR$/target/classes" /> |
5 | <output-test url="file://$MODULE_DIR$/target/test-classes" /> | 5 | <output-test url="file://$MODULE_DIR$/target/test-classes" /> |
6 | <content url="file://$MODULE_DIR$"> | 6 | <content url="file://$MODULE_DIR$"> |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<project version="4"> | ||
3 | + <component name="CompilerConfiguration"> | ||
4 | + <annotationProcessing> | ||
5 | + <profile name="Maven default annotation processors profile" enabled="true"> | ||
6 | + <sourceOutputDir name="target/generated-sources/annotations" /> | ||
7 | + <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> | ||
8 | + <outputRelativeToContentRoot value="true" /> | ||
9 | + <module name="server_core" /> | ||
10 | + <module name="server_servlet" /> | ||
11 | + </profile> | ||
12 | + </annotationProcessing> | ||
13 | + <bytecodeTargetLevel> | ||
14 | + <module name="project" target="1.8" /> | ||
15 | + <module name="server_core" target="1.8" /> | ||
16 | + <module name="server_servlet" target="1.8" /> | ||
17 | + </bytecodeTargetLevel> | ||
18 | + </component> | ||
19 | +</project> | ||
0 | \ No newline at end of file | 20 | \ No newline at end of file |
project/.idea/libraries/Maven__antlr_antlr_2_7_6.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: antlr:antlr:2.7.6"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.6/antlr-2.7.6-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__commons_collections_commons_collections_3_1.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: commons-collections:commons-collections:3.1"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: dom4j:dom4j:1.6.1"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__javassist_javassist_3_9_0_GA.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: javassist:javassist:3.9.0.GA"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__javax_javaee_web_api_6_0.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: javax:javaee-web-api:6.0"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/javax/javaee-web-api/6.0/javaee-web-api-6.0-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/javax/javaee-web-api/6.0/javaee-web-api-6.0-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: javax.transaction:jta:1.1"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/jta/1.1/jta-1.1.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/jta/1.1/jta-1.1-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__log4j_log4j_1_2_14.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: log4j:log4j:1.2.14"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__org_hibernate_hibernate_annotations_3_5_6_Final.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-annotations/3.5.6-Final/hibernate-annotations-3.5.6-Final.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-annotations/3.5.6-Final/hibernate-annotations-3.5.6-Final-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-annotations/3.5.6-Final/hibernate-annotations-3.5.6-Final-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__org_hibernate_hibernate_core_3_5_6_Final.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: org.hibernate:hibernate-core:3.5.6-Final"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.5.6-Final/hibernate-core-3.5.6-Final.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.5.6-Final/hibernate-core-3.5.6-Final-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.5.6-Final/hibernate-core-3.5.6-Final-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1212.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: org.postgresql:postgresql:9.4.1212"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1212/postgresql-9.4.1212.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1212/postgresql-9.4.1212-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1212/postgresql-9.4.1212-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_8.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: org.slf4j:slf4j-api:1.5.8"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_8.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: org.slf4j:slf4j-log4j12:1.5.8"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
project/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
0 → 100644
1 | +<component name="libraryTable"> | ||
2 | + <library name="Maven: xml-apis:xml-apis:1.0.b2"> | ||
3 | + <CLASSES> | ||
4 | + <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" /> | ||
5 | + </CLASSES> | ||
6 | + <JAVADOC> | ||
7 | + <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" /> | ||
8 | + </JAVADOC> | ||
9 | + <SOURCES> | ||
10 | + <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" /> | ||
11 | + </SOURCES> | ||
12 | + </library> | ||
13 | +</component> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<project version="4"> | ||
3 | + <component name="MavenProjectsManager"> | ||
4 | + <option name="originalFiles"> | ||
5 | + <list> | ||
6 | + <option value="$PROJECT_DIR$/pom.xml" /> | ||
7 | + </list> | ||
8 | + </option> | ||
9 | + </component> | ||
10 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | ||
11 | + <output url="file://$PROJECT_DIR$/out" /> | ||
12 | + </component> | ||
13 | +</project> | ||
0 | \ No newline at end of file | 14 | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<project version="4"> | ||
3 | + <component name="ProjectModuleManager"> | ||
4 | + <modules> | ||
5 | + <module fileurl="file://$PROJECT_DIR$/project.iml" filepath="$PROJECT_DIR$/project.iml" /> | ||
6 | + <module fileurl="file://$PROJECT_DIR$/server_core/server_core.iml" filepath="$PROJECT_DIR$/server_core/server_core.iml" /> | ||
7 | + <module fileurl="file://$PROJECT_DIR$/server_servlet/server_servlet.iml" filepath="$PROJECT_DIR$/server_servlet/server_servlet.iml" /> | ||
8 | + </modules> | ||
9 | + </component> | ||
10 | +</project> | ||
0 | \ No newline at end of file | 11 | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<project version="4"> | ||
3 | + <component name="ChangeListManager"> | ||
4 | + <list default="true" id="405901ee-1a49-4b2c-aa2f-be7d7103021e" name="Default" comment="" /> | ||
5 | + <ignored path="$PROJECT_DIR$/out/" /> | ||
6 | + <ignored path="$PROJECT_DIR$/target/" /> | ||
7 | + <ignored path="$PROJECT_DIR$/server_core/target/" /> | ||
8 | + <ignored path="$PROJECT_DIR$/server_servlet/target/" /> | ||
9 | + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | ||
10 | + <option name="TRACKING_ENABLED" value="true" /> | ||
11 | + <option name="SHOW_DIALOG" value="false" /> | ||
12 | + <option name="HIGHLIGHT_CONFLICTS" value="true" /> | ||
13 | + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | ||
14 | + <option name="LAST_RESOLUTION" value="IGNORE" /> | ||
15 | + </component> | ||
16 | + <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> | ||
17 | + <component name="FileEditorManager"> | ||
18 | + <leaf> | ||
19 | + <file leaf-file-name="HibernateDao.java" pinned="false" current-in-tab="true"> | ||
20 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java"> | ||
21 | + <provider selected="true" editor-type-id="text-editor"> | ||
22 | + <state relative-caret-position="-613"> | ||
23 | + <caret line="3" column="27" lean-forward="true" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" /> | ||
24 | + <folding /> | ||
25 | + </state> | ||
26 | + </provider> | ||
27 | + </entry> | ||
28 | + </file> | ||
29 | + <file leaf-file-name="Location.java" pinned="false" current-in-tab="false"> | ||
30 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Location.java"> | ||
31 | + <provider selected="true" editor-type-id="text-editor"> | ||
32 | + <state relative-caret-position="0"> | ||
33 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
34 | + <folding> | ||
35 | + <element signature="imports" expanded="true" /> | ||
36 | + </folding> | ||
37 | + </state> | ||
38 | + </provider> | ||
39 | + </entry> | ||
40 | + </file> | ||
41 | + <file leaf-file-name="Mape.java" pinned="false" current-in-tab="false"> | ||
42 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Mape.java"> | ||
43 | + <provider selected="true" editor-type-id="text-editor"> | ||
44 | + <state relative-caret-position="-1"> | ||
45 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
46 | + <folding> | ||
47 | + <element signature="imports" expanded="true" /> | ||
48 | + </folding> | ||
49 | + </state> | ||
50 | + </provider> | ||
51 | + </entry> | ||
52 | + </file> | ||
53 | + <file leaf-file-name="RssiRecord.java" pinned="false" current-in-tab="false"> | ||
54 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java"> | ||
55 | + <provider selected="true" editor-type-id="text-editor"> | ||
56 | + <state relative-caret-position="0"> | ||
57 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
58 | + <folding> | ||
59 | + <element signature="imports" expanded="true" /> | ||
60 | + </folding> | ||
61 | + </state> | ||
62 | + </provider> | ||
63 | + </entry> | ||
64 | + </file> | ||
65 | + <file leaf-file-name="TempRssi.java" pinned="false" current-in-tab="false"> | ||
66 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java"> | ||
67 | + <provider selected="true" editor-type-id="text-editor"> | ||
68 | + <state relative-caret-position="0"> | ||
69 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
70 | + <folding /> | ||
71 | + </state> | ||
72 | + </provider> | ||
73 | + </entry> | ||
74 | + </file> | ||
75 | + <file leaf-file-name="CalibrationService.java" pinned="false" current-in-tab="false"> | ||
76 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java"> | ||
77 | + <provider selected="true" editor-type-id="text-editor"> | ||
78 | + <state relative-caret-position="68"> | ||
79 | + <caret line="4" column="7" lean-forward="false" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="7" /> | ||
80 | + <folding /> | ||
81 | + </state> | ||
82 | + </provider> | ||
83 | + </entry> | ||
84 | + </file> | ||
85 | + <file leaf-file-name="ConnectionService.java" pinned="false" current-in-tab="false"> | ||
86 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java"> | ||
87 | + <provider selected="true" editor-type-id="text-editor"> | ||
88 | + <state relative-caret-position="0"> | ||
89 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
90 | + <folding /> | ||
91 | + </state> | ||
92 | + </provider> | ||
93 | + </entry> | ||
94 | + </file> | ||
95 | + <file leaf-file-name="PositioningService.java" pinned="false" current-in-tab="false"> | ||
96 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | ||
97 | + <provider selected="true" editor-type-id="text-editor"> | ||
98 | + <state relative-caret-position="-583"> | ||
99 | + <caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" /> | ||
100 | + <folding> | ||
101 | + <element signature="imports" expanded="true" /> | ||
102 | + </folding> | ||
103 | + </state> | ||
104 | + </provider> | ||
105 | + </entry> | ||
106 | + </file> | ||
107 | + <file leaf-file-name="HibernateUtil.java" pinned="false" current-in-tab="false"> | ||
108 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java"> | ||
109 | + <provider selected="true" editor-type-id="text-editor"> | ||
110 | + <state relative-caret-position="170"> | ||
111 | + <caret line="10" column="63" lean-forward="true" selection-start-line="10" selection-start-column="63" selection-end-line="10" selection-end-column="63" /> | ||
112 | + <folding> | ||
113 | + <element signature="imports" expanded="true" /> | ||
114 | + </folding> | ||
115 | + </state> | ||
116 | + </provider> | ||
117 | + </entry> | ||
118 | + </file> | ||
119 | + </leaf> | ||
120 | + </component> | ||
121 | + <component name="GradleLocalSettings"> | ||
122 | + <option name="externalProjectsViewState"> | ||
123 | + <projects_view /> | ||
124 | + </option> | ||
125 | + </component> | ||
126 | + <component name="IdeDocumentHistory"> | ||
127 | + <option name="CHANGED_PATHS"> | ||
128 | + <list> | ||
129 | + <option value="$PROJECT_DIR$/server_core/pom.xml" /> | ||
130 | + <option value="$PROJECT_DIR$/pom.xml" /> | ||
131 | + <option value="$PROJECT_DIR$/server_servlet/pom.xml" /> | ||
132 | + <option value="$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java" /> | ||
133 | + <option value="$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java" /> | ||
134 | + <option value="$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java" /> | ||
135 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java" /> | ||
136 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Location.java" /> | ||
137 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Mape.java" /> | ||
138 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java" /> | ||
139 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java" /> | ||
140 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java" /> | ||
141 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java" /> | ||
142 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java" /> | ||
143 | + <option value="$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java" /> | ||
144 | + </list> | ||
145 | + </option> | ||
146 | + </component> | ||
147 | + <component name="MavenImportPreferences"> | ||
148 | + <option name="importingSettings"> | ||
149 | + <MavenImportingSettings> | ||
150 | + <option name="importAutomatically" value="true" /> | ||
151 | + </MavenImportingSettings> | ||
152 | + </option> | ||
153 | + </component> | ||
154 | + <component name="ProjectFrameBounds"> | ||
155 | + <option name="x" value="-8" /> | ||
156 | + <option name="y" value="-8" /> | ||
157 | + <option name="width" value="1936" /> | ||
158 | + <option name="height" value="1056" /> | ||
159 | + </component> | ||
160 | + <component name="ProjectView"> | ||
161 | + <navigator currentView="ProjectPane" proportions="" version="1"> | ||
162 | + <flattenPackages /> | ||
163 | + <showMembers /> | ||
164 | + <showModules /> | ||
165 | + <showLibraryContents /> | ||
166 | + <hideEmptyPackages /> | ||
167 | + <abbreviatePackageNames /> | ||
168 | + <autoscrollToSource /> | ||
169 | + <autoscrollFromSource /> | ||
170 | + <sortByType /> | ||
171 | + <manualOrder /> | ||
172 | + <foldersAlwaysOnTop value="true" /> | ||
173 | + </navigator> | ||
174 | + <panes> | ||
175 | + <pane id="PackagesPane" /> | ||
176 | + <pane id="ProjectPane"> | ||
177 | + <subPane> | ||
178 | + <PATH> | ||
179 | + <PATH_ELEMENT> | ||
180 | + <option name="myItemId" value="project" /> | ||
181 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
182 | + </PATH_ELEMENT> | ||
183 | + <PATH_ELEMENT> | ||
184 | + <option name="myItemId" value="project" /> | ||
185 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
186 | + </PATH_ELEMENT> | ||
187 | + </PATH> | ||
188 | + <PATH> | ||
189 | + <PATH_ELEMENT> | ||
190 | + <option name="myItemId" value="project" /> | ||
191 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
192 | + </PATH_ELEMENT> | ||
193 | + <PATH_ELEMENT> | ||
194 | + <option name="myItemId" value="project" /> | ||
195 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
196 | + </PATH_ELEMENT> | ||
197 | + <PATH_ELEMENT> | ||
198 | + <option name="myItemId" value="server_servlet" /> | ||
199 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
200 | + </PATH_ELEMENT> | ||
201 | + </PATH> | ||
202 | + <PATH> | ||
203 | + <PATH_ELEMENT> | ||
204 | + <option name="myItemId" value="project" /> | ||
205 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
206 | + </PATH_ELEMENT> | ||
207 | + <PATH_ELEMENT> | ||
208 | + <option name="myItemId" value="project" /> | ||
209 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
210 | + </PATH_ELEMENT> | ||
211 | + <PATH_ELEMENT> | ||
212 | + <option name="myItemId" value="server_servlet" /> | ||
213 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
214 | + </PATH_ELEMENT> | ||
215 | + <PATH_ELEMENT> | ||
216 | + <option name="myItemId" value="src" /> | ||
217 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
218 | + </PATH_ELEMENT> | ||
219 | + <PATH_ELEMENT> | ||
220 | + <option name="myItemId" value="test" /> | ||
221 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
222 | + </PATH_ELEMENT> | ||
223 | + </PATH> | ||
224 | + <PATH> | ||
225 | + <PATH_ELEMENT> | ||
226 | + <option name="myItemId" value="project" /> | ||
227 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
228 | + </PATH_ELEMENT> | ||
229 | + <PATH_ELEMENT> | ||
230 | + <option name="myItemId" value="project" /> | ||
231 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
232 | + </PATH_ELEMENT> | ||
233 | + <PATH_ELEMENT> | ||
234 | + <option name="myItemId" value="server_servlet" /> | ||
235 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
236 | + </PATH_ELEMENT> | ||
237 | + <PATH_ELEMENT> | ||
238 | + <option name="myItemId" value="src" /> | ||
239 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
240 | + </PATH_ELEMENT> | ||
241 | + <PATH_ELEMENT> | ||
242 | + <option name="myItemId" value="main" /> | ||
243 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
244 | + </PATH_ELEMENT> | ||
245 | + </PATH> | ||
246 | + <PATH> | ||
247 | + <PATH_ELEMENT> | ||
248 | + <option name="myItemId" value="project" /> | ||
249 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
250 | + </PATH_ELEMENT> | ||
251 | + <PATH_ELEMENT> | ||
252 | + <option name="myItemId" value="project" /> | ||
253 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
254 | + </PATH_ELEMENT> | ||
255 | + <PATH_ELEMENT> | ||
256 | + <option name="myItemId" value="server_servlet" /> | ||
257 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
258 | + </PATH_ELEMENT> | ||
259 | + <PATH_ELEMENT> | ||
260 | + <option name="myItemId" value="src" /> | ||
261 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
262 | + </PATH_ELEMENT> | ||
263 | + <PATH_ELEMENT> | ||
264 | + <option name="myItemId" value="main" /> | ||
265 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
266 | + </PATH_ELEMENT> | ||
267 | + <PATH_ELEMENT> | ||
268 | + <option name="myItemId" value="java" /> | ||
269 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
270 | + </PATH_ELEMENT> | ||
271 | + </PATH> | ||
272 | + <PATH> | ||
273 | + <PATH_ELEMENT> | ||
274 | + <option name="myItemId" value="project" /> | ||
275 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
276 | + </PATH_ELEMENT> | ||
277 | + <PATH_ELEMENT> | ||
278 | + <option name="myItemId" value="project" /> | ||
279 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
280 | + </PATH_ELEMENT> | ||
281 | + <PATH_ELEMENT> | ||
282 | + <option name="myItemId" value="server_core" /> | ||
283 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
284 | + </PATH_ELEMENT> | ||
285 | + </PATH> | ||
286 | + <PATH> | ||
287 | + <PATH_ELEMENT> | ||
288 | + <option name="myItemId" value="project" /> | ||
289 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
290 | + </PATH_ELEMENT> | ||
291 | + <PATH_ELEMENT> | ||
292 | + <option name="myItemId" value="project" /> | ||
293 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
294 | + </PATH_ELEMENT> | ||
295 | + <PATH_ELEMENT> | ||
296 | + <option name="myItemId" value="server_core" /> | ||
297 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
298 | + </PATH_ELEMENT> | ||
299 | + <PATH_ELEMENT> | ||
300 | + <option name="myItemId" value="src" /> | ||
301 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
302 | + </PATH_ELEMENT> | ||
303 | + <PATH_ELEMENT> | ||
304 | + <option name="myItemId" value="test" /> | ||
305 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
306 | + </PATH_ELEMENT> | ||
307 | + </PATH> | ||
308 | + <PATH> | ||
309 | + <PATH_ELEMENT> | ||
310 | + <option name="myItemId" value="project" /> | ||
311 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
312 | + </PATH_ELEMENT> | ||
313 | + <PATH_ELEMENT> | ||
314 | + <option name="myItemId" value="project" /> | ||
315 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
316 | + </PATH_ELEMENT> | ||
317 | + <PATH_ELEMENT> | ||
318 | + <option name="myItemId" value="server_core" /> | ||
319 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
320 | + </PATH_ELEMENT> | ||
321 | + <PATH_ELEMENT> | ||
322 | + <option name="myItemId" value="src" /> | ||
323 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
324 | + </PATH_ELEMENT> | ||
325 | + <PATH_ELEMENT> | ||
326 | + <option name="myItemId" value="main" /> | ||
327 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
328 | + </PATH_ELEMENT> | ||
329 | + </PATH> | ||
330 | + <PATH> | ||
331 | + <PATH_ELEMENT> | ||
332 | + <option name="myItemId" value="project" /> | ||
333 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
334 | + </PATH_ELEMENT> | ||
335 | + <PATH_ELEMENT> | ||
336 | + <option name="myItemId" value="project" /> | ||
337 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
338 | + </PATH_ELEMENT> | ||
339 | + <PATH_ELEMENT> | ||
340 | + <option name="myItemId" value="server_core" /> | ||
341 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
342 | + </PATH_ELEMENT> | ||
343 | + <PATH_ELEMENT> | ||
344 | + <option name="myItemId" value="src" /> | ||
345 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
346 | + </PATH_ELEMENT> | ||
347 | + <PATH_ELEMENT> | ||
348 | + <option name="myItemId" value="main" /> | ||
349 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
350 | + </PATH_ELEMENT> | ||
351 | + <PATH_ELEMENT> | ||
352 | + <option name="myItemId" value="java" /> | ||
353 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
354 | + </PATH_ELEMENT> | ||
355 | + <PATH_ELEMENT> | ||
356 | + <option name="myItemId" value="utils" /> | ||
357 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
358 | + </PATH_ELEMENT> | ||
359 | + </PATH> | ||
360 | + <PATH> | ||
361 | + <PATH_ELEMENT> | ||
362 | + <option name="myItemId" value="project" /> | ||
363 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
364 | + </PATH_ELEMENT> | ||
365 | + <PATH_ELEMENT> | ||
366 | + <option name="myItemId" value="project" /> | ||
367 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
368 | + </PATH_ELEMENT> | ||
369 | + <PATH_ELEMENT> | ||
370 | + <option name="myItemId" value="server_core" /> | ||
371 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
372 | + </PATH_ELEMENT> | ||
373 | + <PATH_ELEMENT> | ||
374 | + <option name="myItemId" value="src" /> | ||
375 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
376 | + </PATH_ELEMENT> | ||
377 | + <PATH_ELEMENT> | ||
378 | + <option name="myItemId" value="main" /> | ||
379 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
380 | + </PATH_ELEMENT> | ||
381 | + <PATH_ELEMENT> | ||
382 | + <option name="myItemId" value="java" /> | ||
383 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
384 | + </PATH_ELEMENT> | ||
385 | + <PATH_ELEMENT> | ||
386 | + <option name="myItemId" value="service" /> | ||
387 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
388 | + </PATH_ELEMENT> | ||
389 | + </PATH> | ||
390 | + <PATH> | ||
391 | + <PATH_ELEMENT> | ||
392 | + <option name="myItemId" value="project" /> | ||
393 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
394 | + </PATH_ELEMENT> | ||
395 | + <PATH_ELEMENT> | ||
396 | + <option name="myItemId" value="project" /> | ||
397 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
398 | + </PATH_ELEMENT> | ||
399 | + <PATH_ELEMENT> | ||
400 | + <option name="myItemId" value="server_core" /> | ||
401 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
402 | + </PATH_ELEMENT> | ||
403 | + <PATH_ELEMENT> | ||
404 | + <option name="myItemId" value="src" /> | ||
405 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
406 | + </PATH_ELEMENT> | ||
407 | + <PATH_ELEMENT> | ||
408 | + <option name="myItemId" value="main" /> | ||
409 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
410 | + </PATH_ELEMENT> | ||
411 | + <PATH_ELEMENT> | ||
412 | + <option name="myItemId" value="java" /> | ||
413 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
414 | + </PATH_ELEMENT> | ||
415 | + <PATH_ELEMENT> | ||
416 | + <option name="myItemId" value="repository" /> | ||
417 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
418 | + </PATH_ELEMENT> | ||
419 | + </PATH> | ||
420 | + <PATH> | ||
421 | + <PATH_ELEMENT> | ||
422 | + <option name="myItemId" value="project" /> | ||
423 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
424 | + </PATH_ELEMENT> | ||
425 | + <PATH_ELEMENT> | ||
426 | + <option name="myItemId" value="project" /> | ||
427 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
428 | + </PATH_ELEMENT> | ||
429 | + <PATH_ELEMENT> | ||
430 | + <option name="myItemId" value="server_core" /> | ||
431 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
432 | + </PATH_ELEMENT> | ||
433 | + <PATH_ELEMENT> | ||
434 | + <option name="myItemId" value="src" /> | ||
435 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
436 | + </PATH_ELEMENT> | ||
437 | + <PATH_ELEMENT> | ||
438 | + <option name="myItemId" value="main" /> | ||
439 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
440 | + </PATH_ELEMENT> | ||
441 | + <PATH_ELEMENT> | ||
442 | + <option name="myItemId" value="java" /> | ||
443 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
444 | + </PATH_ELEMENT> | ||
445 | + <PATH_ELEMENT> | ||
446 | + <option name="myItemId" value="dao" /> | ||
447 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
448 | + </PATH_ELEMENT> | ||
449 | + </PATH> | ||
450 | + </subPane> | ||
451 | + </pane> | ||
452 | + <pane id="Scope" /> | ||
453 | + <pane id="Scratches" /> | ||
454 | + </panes> | ||
455 | + </component> | ||
456 | + <component name="RunDashboard"> | ||
457 | + <option name="ruleStates"> | ||
458 | + <list> | ||
459 | + <RuleState> | ||
460 | + <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> | ||
461 | + </RuleState> | ||
462 | + <RuleState> | ||
463 | + <option name="name" value="StatusDashboardGroupingRule" /> | ||
464 | + </RuleState> | ||
465 | + </list> | ||
466 | + </option> | ||
467 | + </component> | ||
468 | + <component name="RunManager"> | ||
469 | + <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> | ||
470 | + <module name="" /> | ||
471 | + <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> | ||
472 | + <option name="PROGRAM_PARAMETERS" /> | ||
473 | + <predefined_log_file id="idea.log" enabled="true" /> | ||
474 | + <method /> | ||
475 | + </configuration> | ||
476 | + <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App"> | ||
477 | + <module name="" /> | ||
478 | + <option name="DEPLOY" value="true" /> | ||
479 | + <option name="ARTIFACT_NAME" value="" /> | ||
480 | + <option name="PM_INSTALL_OPTIONS" value="" /> | ||
481 | + <option name="ACTIVITY_EXTRA_FLAGS" value="" /> | ||
482 | + <option name="MODE" value="default_activity" /> | ||
483 | + <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> | ||
484 | + <option name="PREFERRED_AVD" value="" /> | ||
485 | + <option name="CLEAR_LOGCAT" value="false" /> | ||
486 | + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" /> | ||
487 | + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> | ||
488 | + <option name="FORCE_STOP_RUNNING_APP" value="true" /> | ||
489 | + <option name="DEBUGGER_TYPE" value="Java" /> | ||
490 | + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> | ||
491 | + <option name="PREFERRED_AVD" value="" /> | ||
492 | + <Java /> | ||
493 | + <Profilers> | ||
494 | + <option name="ENABLE_ADVANCED_PROFILING" value="true" /> | ||
495 | + <option name="GAPID_ENABLED" value="false" /> | ||
496 | + <option name="GAPID_DISABLE_PCS" value="false" /> | ||
497 | + <option name="SUPPORT_LIB_ENABLED" value="true" /> | ||
498 | + <option name="INSTRUMENTATION_ENABLED" value="true" /> | ||
499 | + </Profilers> | ||
500 | + <option name="DEEP_LINK" value="" /> | ||
501 | + <option name="ACTIVITY_CLASS" value="" /> | ||
502 | + <method /> | ||
503 | + </configuration> | ||
504 | + <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> | ||
505 | + <module name="" /> | ||
506 | + <option name="TESTING_TYPE" value="0" /> | ||
507 | + <option name="INSTRUMENTATION_RUNNER_CLASS" value="" /> | ||
508 | + <option name="METHOD_NAME" value="" /> | ||
509 | + <option name="CLASS_NAME" value="" /> | ||
510 | + <option name="PACKAGE_NAME" value="" /> | ||
511 | + <option name="EXTRA_OPTIONS" value="" /> | ||
512 | + <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> | ||
513 | + <option name="PREFERRED_AVD" value="" /> | ||
514 | + <option name="CLEAR_LOGCAT" value="false" /> | ||
515 | + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" /> | ||
516 | + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> | ||
517 | + <option name="FORCE_STOP_RUNNING_APP" value="true" /> | ||
518 | + <option name="DEBUGGER_TYPE" value="Java" /> | ||
519 | + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> | ||
520 | + <option name="PREFERRED_AVD" value="" /> | ||
521 | + <Java /> | ||
522 | + <Profilers> | ||
523 | + <option name="ENABLE_ADVANCED_PROFILING" value="true" /> | ||
524 | + <option name="GAPID_ENABLED" value="false" /> | ||
525 | + <option name="GAPID_DISABLE_PCS" value="false" /> | ||
526 | + <option name="SUPPORT_LIB_ENABLED" value="true" /> | ||
527 | + <option name="INSTRUMENTATION_ENABLED" value="true" /> | ||
528 | + </Profilers> | ||
529 | + <method /> | ||
530 | + </configuration> | ||
531 | + <configuration default="true" type="Applet" factoryName="Applet"> | ||
532 | + <option name="HTML_USED" value="false" /> | ||
533 | + <option name="WIDTH" value="400" /> | ||
534 | + <option name="HEIGHT" value="300" /> | ||
535 | + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> | ||
536 | + <module /> | ||
537 | + <method /> | ||
538 | + </configuration> | ||
539 | + <configuration default="true" type="Application" factoryName="Application"> | ||
540 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
541 | + <option name="MAIN_CLASS_NAME" /> | ||
542 | + <option name="VM_PARAMETERS" /> | ||
543 | + <option name="PROGRAM_PARAMETERS" /> | ||
544 | + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> | ||
545 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
546 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
547 | + <option name="ENABLE_SWING_INSPECTOR" value="false" /> | ||
548 | + <option name="ENV_VARIABLES" /> | ||
549 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
550 | + <module name="" /> | ||
551 | + <envs /> | ||
552 | + <method /> | ||
553 | + </configuration> | ||
554 | + <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle"> | ||
555 | + <ExternalSystemSettings> | ||
556 | + <option name="executionName" /> | ||
557 | + <option name="externalProjectPath" /> | ||
558 | + <option name="externalSystemIdString" value="GRADLE" /> | ||
559 | + <option name="scriptParameters" /> | ||
560 | + <option name="taskDescriptions"> | ||
561 | + <list /> | ||
562 | + </option> | ||
563 | + <option name="taskNames"> | ||
564 | + <list /> | ||
565 | + </option> | ||
566 | + <option name="vmOptions" /> | ||
567 | + </ExternalSystemSettings> | ||
568 | + <method /> | ||
569 | + </configuration> | ||
570 | + <configuration default="true" type="JUnit" factoryName="JUnit"> | ||
571 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
572 | + <module name="" /> | ||
573 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
574 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
575 | + <option name="PACKAGE_NAME" /> | ||
576 | + <option name="MAIN_CLASS_NAME" /> | ||
577 | + <option name="METHOD_NAME" /> | ||
578 | + <option name="TEST_OBJECT" value="class" /> | ||
579 | + <option name="VM_PARAMETERS" value="-ea" /> | ||
580 | + <option name="PARAMETERS" /> | ||
581 | + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> | ||
582 | + <option name="ENV_VARIABLES" /> | ||
583 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
584 | + <option name="TEST_SEARCH_SCOPE"> | ||
585 | + <value defaultName="singleModule" /> | ||
586 | + </option> | ||
587 | + <envs /> | ||
588 | + <patterns /> | ||
589 | + <method /> | ||
590 | + </configuration> | ||
591 | + <configuration default="true" type="JarApplication" factoryName="JAR Application"> | ||
592 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
593 | + <envs /> | ||
594 | + <method /> | ||
595 | + </configuration> | ||
596 | + <configuration default="true" type="Java Scratch" factoryName="Java Scratch"> | ||
597 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
598 | + <option name="SCRATCH_FILE_ID" value="0" /> | ||
599 | + <option name="MAIN_CLASS_NAME" /> | ||
600 | + <option name="VM_PARAMETERS" /> | ||
601 | + <option name="PROGRAM_PARAMETERS" /> | ||
602 | + <option name="WORKING_DIRECTORY" /> | ||
603 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
604 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
605 | + <option name="ENABLE_SWING_INSPECTOR" value="false" /> | ||
606 | + <option name="ENV_VARIABLES" /> | ||
607 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
608 | + <module name="" /> | ||
609 | + <envs /> | ||
610 | + <method /> | ||
611 | + </configuration> | ||
612 | + <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin"> | ||
613 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
614 | + <option name="MAIN_CLASS_NAME" /> | ||
615 | + <option name="VM_PARAMETERS" /> | ||
616 | + <option name="PROGRAM_PARAMETERS" /> | ||
617 | + <option name="WORKING_DIRECTORY" /> | ||
618 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
619 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
620 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
621 | + <module name="project" /> | ||
622 | + <envs /> | ||
623 | + <method /> | ||
624 | + </configuration> | ||
625 | + <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script"> | ||
626 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
627 | + <option name="filePath" /> | ||
628 | + <option name="vmParameters" /> | ||
629 | + <option name="alternativeJrePath" /> | ||
630 | + <option name="programParameters" /> | ||
631 | + <option name="passParentEnvs" value="true" /> | ||
632 | + <option name="workingDirectory" /> | ||
633 | + <option name="isAlternativeJrePathEnabled" value="false" /> | ||
634 | + <envs /> | ||
635 | + <method /> | ||
636 | + </configuration> | ||
637 | + <configuration default="true" type="Remote" factoryName="Remote"> | ||
638 | + <option name="USE_SOCKET_TRANSPORT" value="true" /> | ||
639 | + <option name="SERVER_MODE" value="false" /> | ||
640 | + <option name="SHMEM_ADDRESS" value="javadebug" /> | ||
641 | + <option name="HOST" value="localhost" /> | ||
642 | + <option name="PORT" value="5005" /> | ||
643 | + <method /> | ||
644 | + </configuration> | ||
645 | + <configuration default="true" type="TestNG" factoryName="TestNG"> | ||
646 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
647 | + <module name="" /> | ||
648 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
649 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
650 | + <option name="SUITE_NAME" /> | ||
651 | + <option name="PACKAGE_NAME" /> | ||
652 | + <option name="MAIN_CLASS_NAME" /> | ||
653 | + <option name="METHOD_NAME" /> | ||
654 | + <option name="GROUP_NAME" /> | ||
655 | + <option name="TEST_OBJECT" value="CLASS" /> | ||
656 | + <option name="VM_PARAMETERS" value="-ea" /> | ||
657 | + <option name="PARAMETERS" /> | ||
658 | + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> | ||
659 | + <option name="OUTPUT_DIRECTORY" /> | ||
660 | + <option name="ANNOTATION_TYPE" /> | ||
661 | + <option name="ENV_VARIABLES" /> | ||
662 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
663 | + <option name="TEST_SEARCH_SCOPE"> | ||
664 | + <value defaultName="singleModule" /> | ||
665 | + </option> | ||
666 | + <option name="USE_DEFAULT_REPORTERS" value="false" /> | ||
667 | + <option name="PROPERTIES_FILE" /> | ||
668 | + <envs /> | ||
669 | + <properties /> | ||
670 | + <listeners /> | ||
671 | + <method /> | ||
672 | + </configuration> | ||
673 | + <configuration default="true" type="executeSpecs" factoryName="Gauge Execution"> | ||
674 | + <setting name="environment" value="" /> | ||
675 | + <setting name="specsToExecute" value="" /> | ||
676 | + <setting name="tags" value="" /> | ||
677 | + <setting name="parallelNodes" value="" /> | ||
678 | + <setting name="execInParallel" value="false" /> | ||
679 | + <setting name="programParameters" value="" /> | ||
680 | + <setting name="workingDirectory" value="" /> | ||
681 | + <setting name="moduleName" value="" /> | ||
682 | + <envMap /> | ||
683 | + <setting name="rowsRange" value="" /> | ||
684 | + <method /> | ||
685 | + </configuration> | ||
686 | + </component> | ||
687 | + <component name="ShelveChangesManager" show_recycled="false"> | ||
688 | + <option name="remove_strategy" value="false" /> | ||
689 | + </component> | ||
690 | + <component name="TaskManager"> | ||
691 | + <task active="true" id="Default" summary="Default task"> | ||
692 | + <changelist id="405901ee-1a49-4b2c-aa2f-be7d7103021e" name="Default" comment="" /> | ||
693 | + <created>1495960020203</created> | ||
694 | + <option name="number" value="Default" /> | ||
695 | + <option name="presentableId" value="Default" /> | ||
696 | + <updated>1495960020203</updated> | ||
697 | + </task> | ||
698 | + <servers /> | ||
699 | + </component> | ||
700 | + <component name="ToolWindowManager"> | ||
701 | + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | ||
702 | + <editor active="true" /> | ||
703 | + <layout> | ||
704 | + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | ||
705 | + <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
706 | + <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
707 | + <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
708 | + <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
709 | + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> | ||
710 | + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
711 | + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | ||
712 | + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
713 | + <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
714 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
715 | + <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
716 | + <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
717 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | ||
718 | + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
719 | + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
720 | + <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
721 | + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
722 | + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> | ||
723 | + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | ||
724 | + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> | ||
725 | + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | ||
726 | + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | ||
727 | + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
728 | + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | ||
729 | + </layout> | ||
730 | + </component> | ||
731 | + <component name="VcsContentAnnotationSettings"> | ||
732 | + <option name="myLimit" value="2678400000" /> | ||
733 | + </component> | ||
734 | + <component name="XDebuggerManager"> | ||
735 | + <breakpoint-manager /> | ||
736 | + <watches-manager /> | ||
737 | + </component> | ||
738 | + <component name="editorHistoryManager"> | ||
739 | + <entry file="file://$PROJECT_DIR$/server_core/pom.xml"> | ||
740 | + <provider selected="true" editor-type-id="text-editor"> | ||
741 | + <state relative-caret-position="170"> | ||
742 | + <caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" /> | ||
743 | + <folding /> | ||
744 | + </state> | ||
745 | + </provider> | ||
746 | + </entry> | ||
747 | + <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml"> | ||
748 | + <provider selected="true" editor-type-id="text-editor"> | ||
749 | + <state relative-caret-position="357"> | ||
750 | + <caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> | ||
751 | + <folding /> | ||
752 | + </state> | ||
753 | + </provider> | ||
754 | + </entry> | ||
755 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java"> | ||
756 | + <provider selected="true" editor-type-id="text-editor"> | ||
757 | + <state relative-caret-position="136"> | ||
758 | + <caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" /> | ||
759 | + <folding> | ||
760 | + <element signature="imports" expanded="true" /> | ||
761 | + </folding> | ||
762 | + </state> | ||
763 | + </provider> | ||
764 | + </entry> | ||
765 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> | ||
766 | + <provider selected="true" editor-type-id="text-editor"> | ||
767 | + <state relative-caret-position="153"> | ||
768 | + <caret line="9" column="3" lean-forward="false" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" /> | ||
769 | + <folding> | ||
770 | + <element signature="imports" expanded="true" /> | ||
771 | + </folding> | ||
772 | + </state> | ||
773 | + </provider> | ||
774 | + </entry> | ||
775 | + <entry file="file://$PROJECT_DIR$/pom.xml"> | ||
776 | + <provider selected="true" editor-type-id="text-editor"> | ||
777 | + <state relative-caret-position="760"> | ||
778 | + <caret line="63" column="19" lean-forward="false" selection-start-line="63" selection-start-column="19" selection-end-line="63" selection-end-column="19" /> | ||
779 | + <folding /> | ||
780 | + </state> | ||
781 | + </provider> | ||
782 | + </entry> | ||
783 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/DebianDao.java"> | ||
784 | + <provider selected="true" editor-type-id="text-editor"> | ||
785 | + <state relative-caret-position="85"> | ||
786 | + <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> | ||
787 | + <folding /> | ||
788 | + </state> | ||
789 | + </provider> | ||
790 | + </entry> | ||
791 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java"> | ||
792 | + <provider selected="true" editor-type-id="text-editor"> | ||
793 | + <state relative-caret-position="0"> | ||
794 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
795 | + <folding /> | ||
796 | + </state> | ||
797 | + </provider> | ||
798 | + </entry> | ||
799 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Location.java"> | ||
800 | + <provider selected="true" editor-type-id="text-editor"> | ||
801 | + <state relative-caret-position="0"> | ||
802 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
803 | + <folding> | ||
804 | + <element signature="imports" expanded="true" /> | ||
805 | + </folding> | ||
806 | + </state> | ||
807 | + </provider> | ||
808 | + </entry> | ||
809 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Mape.java"> | ||
810 | + <provider selected="true" editor-type-id="text-editor"> | ||
811 | + <state relative-caret-position="-1"> | ||
812 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
813 | + <folding> | ||
814 | + <element signature="imports" expanded="true" /> | ||
815 | + </folding> | ||
816 | + </state> | ||
817 | + </provider> | ||
818 | + </entry> | ||
819 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java"> | ||
820 | + <provider selected="true" editor-type-id="text-editor"> | ||
821 | + <state relative-caret-position="0"> | ||
822 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
823 | + <folding> | ||
824 | + <element signature="imports" expanded="true" /> | ||
825 | + </folding> | ||
826 | + </state> | ||
827 | + </provider> | ||
828 | + </entry> | ||
829 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java"> | ||
830 | + <provider selected="true" editor-type-id="text-editor"> | ||
831 | + <state relative-caret-position="0"> | ||
832 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
833 | + <folding /> | ||
834 | + </state> | ||
835 | + </provider> | ||
836 | + </entry> | ||
837 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java"> | ||
838 | + <provider selected="true" editor-type-id="text-editor"> | ||
839 | + <state relative-caret-position="68"> | ||
840 | + <caret line="4" column="7" lean-forward="false" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="7" /> | ||
841 | + <folding /> | ||
842 | + </state> | ||
843 | + </provider> | ||
844 | + </entry> | ||
845 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java"> | ||
846 | + <provider selected="true" editor-type-id="text-editor"> | ||
847 | + <state relative-caret-position="0"> | ||
848 | + <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | ||
849 | + <folding /> | ||
850 | + </state> | ||
851 | + </provider> | ||
852 | + </entry> | ||
853 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | ||
854 | + <provider selected="true" editor-type-id="text-editor"> | ||
855 | + <state relative-caret-position="-583"> | ||
856 | + <caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" /> | ||
857 | + <folding> | ||
858 | + <element signature="imports" expanded="true" /> | ||
859 | + </folding> | ||
860 | + </state> | ||
861 | + </provider> | ||
862 | + </entry> | ||
863 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java"> | ||
864 | + <provider selected="true" editor-type-id="text-editor"> | ||
865 | + <state relative-caret-position="170"> | ||
866 | + <caret line="10" column="63" lean-forward="true" selection-start-line="10" selection-start-column="63" selection-end-line="10" selection-end-column="63" /> | ||
867 | + <folding> | ||
868 | + <element signature="imports" expanded="true" /> | ||
869 | + </folding> | ||
870 | + </state> | ||
871 | + </provider> | ||
872 | + </entry> | ||
873 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java"> | ||
874 | + <provider selected="true" editor-type-id="text-editor"> | ||
875 | + <state relative-caret-position="-613"> | ||
876 | + <caret line="3" column="27" lean-forward="true" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" /> | ||
877 | + <folding /> | ||
878 | + </state> | ||
879 | + </provider> | ||
880 | + </entry> | ||
881 | + </component> | ||
882 | +</project> | ||
0 | \ No newline at end of file | 883 | \ No newline at end of file |
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> | ||
6 | + | ||
7 | + <groupId>com.utbm.lo53</groupId> | ||
8 | + <artifactId>project</artifactId> | ||
9 | + <packaging>pom</packaging> | ||
10 | + <version>1.0-SNAPSHOT</version> | ||
11 | + <modules> | ||
12 | + <module>server_core</module> | ||
13 | + <module>server_servlet</module> | ||
14 | + </modules> | ||
15 | + | ||
16 | + <build> | ||
17 | + <plugins> | ||
18 | + <plugin> | ||
19 | + <groupId>org.apache.maven.plugins</groupId> | ||
20 | + <artifactId>maven-compiler-plugin</artifactId> | ||
21 | + <configuration> | ||
22 | + <source>1.8</source> | ||
23 | + <target>1.8</target> | ||
24 | + </configuration> | ||
25 | + </plugin> | ||
26 | + </plugins> | ||
27 | + </build> | ||
28 | + <dependencies> | ||
29 | + <!-- https://mvnrepository.com/artifact/postgresql/postgresql --> | ||
30 | + <dependency> | ||
31 | + <groupId>org.postgresql</groupId> | ||
32 | + <artifactId>postgresql</artifactId> | ||
33 | + <version>9.4.1212</version> | ||
34 | + </dependency> | ||
35 | + | ||
36 | + | ||
37 | + <dependency> | ||
38 | + <groupId>org.hibernate</groupId> | ||
39 | + <artifactId>hibernate-core</artifactId> | ||
40 | + <version>3.5.6-Final</version> | ||
41 | + </dependency> | ||
42 | + | ||
43 | + <!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-annotations --> | ||
44 | + <dependency> | ||
45 | + <groupId>org.hibernate</groupId> | ||
46 | + <artifactId>hibernate-annotations</artifactId> | ||
47 | + <version>3.5.6-Final</version> | ||
48 | + </dependency> | ||
49 | + | ||
50 | + | ||
51 | + <dependency> | ||
52 | + <groupId>org.slf4j</groupId> | ||
53 | + <artifactId>slf4j-log4j12</artifactId> | ||
54 | + <version>1.5.8</version> | ||
55 | + <scope>runtime</scope> | ||
56 | + </dependency> | ||
57 | + | ||
58 | + <dependency> | ||
59 | + <groupId>javassist</groupId> | ||
60 | + <artifactId>javassist</artifactId> | ||
61 | + <version>3.9.0.GA</version> | ||
62 | + <scope>runtime</scope> | ||
63 | + </dependency> | ||
64 | + </dependencies> | ||
65 | + | ||
66 | +</project> | ||
0 | \ No newline at end of file | 67 | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> | ||
3 | + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> | ||
4 | + <output url="file://$MODULE_DIR$/target/classes" /> | ||
5 | + <output-test url="file://$MODULE_DIR$/target/test-classes" /> | ||
6 | + <content url="file://$MODULE_DIR$"> | ||
7 | + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | ||
8 | + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | ||
9 | + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | ||
10 | + <excludeFolder url="file://$MODULE_DIR$/target" /> | ||
11 | + </content> | ||
12 | + <orderEntry type="inheritedJdk" /> | ||
13 | + <orderEntry type="sourceFolder" forTests="false" /> | ||
14 | + <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1212" level="project" /> | ||
15 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:3.5.6-Final" level="project" /> | ||
16 | + <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project" /> | ||
17 | + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.1" level="project" /> | ||
18 | + <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | ||
19 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
20 | + <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" /> | ||
21 | + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" /> | ||
22 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final" level="project" /> | ||
23 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final" level="project" /> | ||
24 | + <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final" level="project" /> | ||
25 | + <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.5.8" level="project" /> | ||
26 | + <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.14" level="project" /> | ||
27 | + <orderEntry type="library" scope="RUNTIME" name="Maven: javassist:javassist:3.9.0.GA" level="project" /> | ||
28 | + </component> | ||
29 | +</module> | ||
0 | \ No newline at end of file | 30 | \ No newline at end of file |
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 | + <parent> | ||
6 | + <artifactId>project</artifactId> | ||
7 | + <groupId>com.utbm.lo53</groupId> | ||
8 | + <version>1.0-SNAPSHOT</version> | ||
9 | + </parent> | ||
10 | + <packaging>jar</packaging> | ||
11 | + <modelVersion>4.0.0</modelVersion> | ||
12 | + | ||
13 | + <artifactId>server_core</artifactId> | ||
14 | + | ||
15 | + | ||
16 | +</project> | ||
0 | \ No newline at end of file | 17 | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> | ||
3 | + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> | ||
4 | + <output url="file://$MODULE_DIR$/target/classes" /> | ||
5 | + <output-test url="file://$MODULE_DIR$/target/test-classes" /> | ||
6 | + <content url="file://$MODULE_DIR$"> | ||
7 | + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | ||
8 | + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | ||
9 | + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | ||
10 | + <excludeFolder url="file://$MODULE_DIR$/target" /> | ||
11 | + </content> | ||
12 | + <orderEntry type="inheritedJdk" /> | ||
13 | + <orderEntry type="sourceFolder" forTests="false" /> | ||
14 | + <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1212" level="project" /> | ||
15 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:3.5.6-Final" level="project" /> | ||
16 | + <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project" /> | ||
17 | + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.1" level="project" /> | ||
18 | + <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | ||
19 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
20 | + <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" /> | ||
21 | + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" /> | ||
22 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final" level="project" /> | ||
23 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final" level="project" /> | ||
24 | + <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final" level="project" /> | ||
25 | + <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.5.8" level="project" /> | ||
26 | + <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.14" level="project" /> | ||
27 | + <orderEntry type="library" scope="RUNTIME" name="Maven: javassist:javassist:3.9.0.GA" level="project" /> | ||
28 | + </component> | ||
29 | +</module> | ||
0 | \ No newline at end of file | 30 | \ No newline at end of file |
project/server_core/src/main/java/dao/DebianDao.java
0 → 100644
project/server_core/src/main/java/dao/HibernateDao.java
0 → 100644
1 | +package dao; | ||
2 | + | ||
3 | +import repository.*; | ||
4 | +import utils.HibernateUtil; | ||
5 | +import org.hibernate.HibernateException; | ||
6 | +import org.hibernate.Query; | ||
7 | +import org.hibernate.Session; | ||
8 | + | ||
9 | +import java.util.ArrayList; | ||
10 | +import java.util.List; | ||
11 | + | ||
12 | +/** | ||
13 | + * Created by Guillaume on 09/05/2017. | ||
14 | + */ | ||
15 | +public class HibernateDao { | ||
16 | + | ||
17 | + public HibernateDao () { | ||
18 | + } | ||
19 | + | ||
20 | + private TransactionCallBack execTransactionProcess(ITransactionProcess itp) { | ||
21 | + Session session = HibernateUtil.getSessionFactory().openSession(); | ||
22 | + TransactionCallBack reply = new TransactionCallBack(); | ||
23 | + try { | ||
24 | + session.beginTransaction(); | ||
25 | + reply = itp.exec(session); | ||
26 | + session.getTransaction().commit(); | ||
27 | + reply.setStatus(true); | ||
28 | + return reply; | ||
29 | + } catch (HibernateException he) { | ||
30 | + he.printStackTrace(); | ||
31 | + if (session.getTransaction() != null) { | ||
32 | + try { | ||
33 | + session.getTransaction().rollback(); | ||
34 | + } catch (HibernateException he2) { | ||
35 | + he2.printStackTrace(); | ||
36 | + } | ||
37 | + } | ||
38 | + } finally { | ||
39 | + if (session != null) { | ||
40 | + try { | ||
41 | + session.close(); | ||
42 | + } catch (HibernateException ex) { | ||
43 | + ex.printStackTrace(); | ||
44 | + } | ||
45 | + } | ||
46 | + } | ||
47 | + return reply; | ||
48 | + } | ||
49 | + private <T> List<T> internal_getData(Class<T> clazz){ | ||
50 | + TransactionCallBack callBack = execTransactionProcess((session)->{ | ||
51 | + TransactionCallBack reply = new TransactionCallBack<T>(); | ||
52 | + Query query = session.createQuery("from "+clazz.getSimpleName()); | ||
53 | + List<Object> results = query.list(); | ||
54 | + for(Object result : results){ | ||
55 | + if(clazz.isInstance(result)) | ||
56 | + reply.getResults().add(result); | ||
57 | + } | ||
58 | + return reply; | ||
59 | + }); | ||
60 | + return callBack.getResults(); | ||
61 | + } | ||
62 | + private boolean internal_saveData(Object... objs){ | ||
63 | + TransactionCallBack callBack = execTransactionProcess((session)->{ | ||
64 | + TransactionCallBack reply = new TransactionCallBack(); | ||
65 | + for(Object obj : objs){ | ||
66 | + session.persist(obj); | ||
67 | + } | ||
68 | + return reply; | ||
69 | + }); | ||
70 | + | ||
71 | + return callBack!=null && callBack.isStatus(); | ||
72 | + } | ||
73 | + | ||
74 | + public boolean saveTempRssi(TempRssi... trs){ | ||
75 | + return internal_saveData(trs); | ||
76 | + } | ||
77 | + public List<TempRssi> getTempRssi(String macAddr){ | ||
78 | + if(macAddr == null) | ||
79 | + return new ArrayList<>(); | ||
80 | + | ||
81 | + TransactionCallBack callBack = execTransactionProcess((session)->{ | ||
82 | + TransactionCallBack reply = new TransactionCallBack<RssiRecord>(); | ||
83 | + Query query = session.createQuery("from TempRssi tr where tr.client_mac_addr = :mac_addr"); | ||
84 | + query.setParameter("mac_addr", macAddr); | ||
85 | + List<Object> results = query.list(); | ||
86 | + for(Object result : results){ | ||
87 | + if(result instanceof TempRssi) | ||
88 | + reply.getResults().add(result); | ||
89 | + } | ||
90 | + return reply; | ||
91 | + }); | ||
92 | + return callBack.getResults(); | ||
93 | + } | ||
94 | + | ||
95 | + public boolean saveRssiRecord(RssiRecord... rssis){ | ||
96 | + return internal_saveData(rssis); | ||
97 | + } | ||
98 | + public List<RssiRecord> getRssiRecord(){ | ||
99 | + return internal_getData(RssiRecord.class); | ||
100 | + } | ||
101 | + public List<RssiRecord> getRssiRecord(Integer locationID){ | ||
102 | + if(locationID == null) | ||
103 | + return getRssiRecord(); | ||
104 | + | ||
105 | + TransactionCallBack callBack = execTransactionProcess((session)->{ | ||
106 | + TransactionCallBack reply = new TransactionCallBack<RssiRecord>(); | ||
107 | + Query query = session.createQuery("from RssiRecord rr where rr.id = :id"); | ||
108 | + query.setParameter("id", locationID); | ||
109 | + List<Object> results = query.list(); | ||
110 | + for(Object result : results){ | ||
111 | + if(result instanceof RssiRecord) | ||
112 | + reply.getResults().add(result); | ||
113 | + } | ||
114 | + return reply; | ||
115 | + }); | ||
116 | + return callBack.getResults(); | ||
117 | + } | ||
118 | + | ||
119 | + public List<Location> getLocations(){ | ||
120 | + return internal_getData(Location.class); | ||
121 | + } | ||
122 | + | ||
123 | + public boolean saveAccessPoint (final AccessPoint... aps) { | ||
124 | + return internal_saveData(aps); | ||
125 | + } | ||
126 | + public List<AccessPoint> getAccessPoint () { | ||
127 | + return internal_getData(AccessPoint.class); | ||
128 | + } | ||
129 | + | ||
130 | + public boolean saveMap(final Mape mape){return internal_saveData(mape);} | ||
131 | + public Mape getMap(int mapId){ | ||
132 | + TransactionCallBack callBack = execTransactionProcess((session)->{ | ||
133 | + TransactionCallBack reply = new TransactionCallBack<RssiRecord>(); | ||
134 | + Query query = session.createQuery("from Mape m where m.id = :id"); | ||
135 | + query.setParameter("id", mapId); | ||
136 | + List<Object> results = query.list(); | ||
137 | + for(Object result : results){ | ||
138 | + if(result instanceof RssiRecord) | ||
139 | + reply.getResults().add(result); | ||
140 | + } | ||
141 | + return reply; | ||
142 | + }); | ||
143 | + return (callBack.getResults().isEmpty()?null:(Mape)callBack.getResults().get(0)); | ||
144 | + } | ||
145 | + | ||
146 | + private interface ITransactionProcess{ | ||
147 | + public TransactionCallBack exec(Session tr); | ||
148 | + } | ||
149 | + | ||
150 | + private class TransactionCallBack<T>{ | ||
151 | + private boolean status; | ||
152 | + private List<T> results; | ||
153 | + | ||
154 | + public TransactionCallBack () { | ||
155 | + status = false; | ||
156 | + results = new ArrayList<T>(); | ||
157 | + } | ||
158 | + | ||
159 | + public boolean isStatus () { | ||
160 | + return status; | ||
161 | + } | ||
162 | + | ||
163 | + public void setStatus (final boolean status) { | ||
164 | + this.status = status; | ||
165 | + } | ||
166 | + | ||
167 | + public List<T> getResults () { | ||
168 | + return results; | ||
169 | + } | ||
170 | + | ||
171 | + public void setResults (final List<T> results) { | ||
172 | + this.results = results; | ||
173 | + } | ||
174 | + } | ||
175 | +} |
project/server_core/src/main/java/repository/AccessPoint.java
0 → 100644
1 | +package repository; | ||
2 | + | ||
3 | +import java.io.Serializable; | ||
4 | +import javax.persistence.*; | ||
5 | + | ||
6 | +/** | ||
7 | + * Created by Guillaume on 09/05/2017. | ||
8 | + */ | ||
9 | +@Entity | ||
10 | +@Table(name ="ACCESS_POINT") | ||
11 | +public class AccessPoint implements Serializable{ | ||
12 | + @Id @GeneratedValue | ||
13 | + private Integer id; | ||
14 | + | ||
15 | + private String mac_addr; | ||
16 | + | ||
17 | + public AccessPoint () { | ||
18 | + } | ||
19 | + | ||
20 | + public AccessPoint(Integer id, String mac_addr){ | ||
21 | + this.mac_addr = mac_addr; | ||
22 | + } | ||
23 | + | ||
24 | + public Integer getId(){return id;} | ||
25 | + | ||
26 | + public void setId(Integer id){this.id = id;} | ||
27 | + | ||
28 | + public String getMac_addr () { | ||
29 | + return mac_addr; | ||
30 | + } | ||
31 | + | ||
32 | + public void setMac_addr (final String mac_addr) { | ||
33 | + this.mac_addr = mac_addr; | ||
34 | + } | ||
35 | +} |
project/server_core/src/main/java/repository/Location.java
0 → 100644
1 | +package repository; | ||
2 | + | ||
3 | +import javax.persistence.*; | ||
4 | +import java.io.Serializable; | ||
5 | + | ||
6 | +/** | ||
7 | + * Created by Guillaume on 09/05/2017. | ||
8 | + */ | ||
9 | +@Entity | ||
10 | +@Table(name = "LOCATION") | ||
11 | +public class Location implements Serializable { | ||
12 | + @Id @GeneratedValue | ||
13 | + private Integer id; | ||
14 | + private Double x, y; | ||
15 | + | ||
16 | + @OneToOne(fetch = FetchType.LAZY) | ||
17 | + @JoinColumn(name = "id", nullable = false) | ||
18 | + private Mape mape; | ||
19 | + | ||
20 | + public Location () { | ||
21 | + } | ||
22 | + | ||
23 | + public Integer getId(){return id;} | ||
24 | + | ||
25 | + public void setId(Integer id){this.id = id;} | ||
26 | + | ||
27 | + public Double getX () { | ||
28 | + return x; | ||
29 | + } | ||
30 | + | ||
31 | + public void setX (final Double x) { | ||
32 | + this.x = x; | ||
33 | + } | ||
34 | + | ||
35 | + public Double getY () { | ||
36 | + return y; | ||
37 | + } | ||
38 | + | ||
39 | + public void setY (final Double y) { | ||
40 | + this.y = y; | ||
41 | + } | ||
42 | + | ||
43 | + public Mape getMape () { | ||
44 | + return mape; | ||
45 | + } | ||
46 | + | ||
47 | + public void setMape (final Mape mape) { | ||
48 | + this.mape = mape; | ||
49 | + } | ||
50 | +} |
project/server_core/src/main/java/repository/Mape.java
0 → 100644
1 | +package repository; | ||
2 | + | ||
3 | +import javax.persistence.*; | ||
4 | +import java.io.Serializable; | ||
5 | + | ||
6 | +/** | ||
7 | + * Created by Guillaume on 09/05/2017. | ||
8 | + */ | ||
9 | +@Entity | ||
10 | +@Table(name = "MAPE") | ||
11 | +public class Mape implements Serializable{ | ||
12 | + @Id @GeneratedValue | ||
13 | + private Integer id; | ||
14 | + private Integer px_width, px_height; | ||
15 | + private Byte[] content; | ||
16 | + private String desc; | ||
17 | + private Double m_width, m_height; | ||
18 | + | ||
19 | + public Mape () { | ||
20 | + } | ||
21 | + | ||
22 | + public Integer getId () { | ||
23 | + return id; | ||
24 | + } | ||
25 | + | ||
26 | + public void setId (final Integer id) { | ||
27 | + this.id = id; | ||
28 | + } | ||
29 | + | ||
30 | + public Integer getPx_width () { | ||
31 | + return px_width; | ||
32 | + } | ||
33 | + | ||
34 | + public void setPx_width (final Integer px_width) { | ||
35 | + this.px_width = px_width; | ||
36 | + } | ||
37 | + | ||
38 | + public Integer getPx_height () { | ||
39 | + return px_height; | ||
40 | + } | ||
41 | + | ||
42 | + public void setPx_height (final Integer px_height) { | ||
43 | + this.px_height = px_height; | ||
44 | + } | ||
45 | + | ||
46 | + public Byte[] getContent () { | ||
47 | + return content; | ||
48 | + } | ||
49 | + | ||
50 | + public void setContent (final Byte[] content) { | ||
51 | + this.content = content; | ||
52 | + } | ||
53 | + | ||
54 | + public String getDesc () { | ||
55 | + return desc; | ||
56 | + } | ||
57 | + | ||
58 | + public void setDesc (final String desc) { | ||
59 | + this.desc = desc; | ||
60 | + } | ||
61 | + | ||
62 | + public Double getM_width () { | ||
63 | + return m_width; | ||
64 | + } | ||
65 | + | ||
66 | + public void setM_width (final Double m_width) { | ||
67 | + this.m_width = m_width; | ||
68 | + } | ||
69 | + | ||
70 | + public Double getM_height () { | ||
71 | + return m_height; | ||
72 | + } | ||
73 | + | ||
74 | + public void setM_height (final Double m_height) { | ||
75 | + this.m_height = m_height; | ||
76 | + } | ||
77 | +} |
project/server_core/src/main/java/repository/RssiRecord.java
0 → 100644
1 | +package repository; | ||
2 | + | ||
3 | +import javax.persistence.*; | ||
4 | +import java.io.Serializable; | ||
5 | + | ||
6 | +/** | ||
7 | + * Created by Guillaume on 09/05/2017. | ||
8 | + */ | ||
9 | +@Entity | ||
10 | +@Table (name = "RSSI_RECORD") | ||
11 | +public class RssiRecord implements Serializable { | ||
12 | + @Id @GeneratedValue | ||
13 | + private Integer id; | ||
14 | + | ||
15 | + | ||
16 | + @OneToOne(fetch = FetchType.LAZY) | ||
17 | + @JoinColumn(name = "id", nullable = false) | ||
18 | + private Location loc; | ||
19 | + | ||
20 | + @OneToOne(fetch = FetchType.LAZY) | ||
21 | + @JoinColumn(name = "id", nullable = false) | ||
22 | + private AccessPoint ap; | ||
23 | + | ||
24 | + private Double avg; | ||
25 | + private Double stdDev; | ||
26 | + | ||
27 | + public RssiRecord () { | ||
28 | + } | ||
29 | + | ||
30 | + public RssiRecord(Location loc, AccessPoint ap, Double avg, Double stdDev){ | ||
31 | + id = null; | ||
32 | + this.loc = loc; | ||
33 | + this.ap = ap; | ||
34 | + this.avg = avg; | ||
35 | + this.stdDev = stdDev; | ||
36 | + } | ||
37 | + | ||
38 | + public Location getLoc () { | ||
39 | + return loc; | ||
40 | + } | ||
41 | + | ||
42 | + public void setLoc (final Location loc) { | ||
43 | + this.loc = loc; | ||
44 | + } | ||
45 | + | ||
46 | + public AccessPoint getAp () { | ||
47 | + return ap; | ||
48 | + } | ||
49 | + | ||
50 | + public void setAp (final AccessPoint ap) { | ||
51 | + this.ap = ap; | ||
52 | + } | ||
53 | + | ||
54 | + public Double getAvg () { | ||
55 | + return avg; | ||
56 | + } | ||
57 | + | ||
58 | + public void setAvg (final Double avg) { | ||
59 | + this.avg = avg; | ||
60 | + } | ||
61 | + | ||
62 | + public Double getStdDev () { | ||
63 | + return stdDev; | ||
64 | + } | ||
65 | + | ||
66 | + public void setStdDev (final Double stdDev) { | ||
67 | + this.stdDev = stdDev; | ||
68 | + } | ||
69 | +} |
project/server_core/src/main/java/repository/TempRssi.java
0 → 100644
1 | +package repository; | ||
2 | + | ||
3 | +import javax.persistence.*; | ||
4 | + | ||
5 | +/** | ||
6 | + * Created by Guillaume on 09/05/2017. | ||
7 | + */ | ||
8 | +@Entity | ||
9 | +@Table (name = "TEMP_RSSI") | ||
10 | +public class TempRssi { | ||
11 | + @Id @GeneratedValue | ||
12 | + private Integer id; | ||
13 | + | ||
14 | + @OneToOne(fetch = FetchType.LAZY) | ||
15 | + @JoinColumn(name = "id", nullable = false) | ||
16 | + private AccessPoint ap; | ||
17 | + | ||
18 | + private String client_mac_addr; | ||
19 | + private Double avg, stdDev; | ||
20 | + | ||
21 | + public TempRssi () {} | ||
22 | + | ||
23 | + public AccessPoint getAp () { | ||
24 | + return ap; | ||
25 | + } | ||
26 | + | ||
27 | + public void setAp (final AccessPoint ap) { | ||
28 | + this.ap = ap; | ||
29 | + } | ||
30 | + | ||
31 | + public String getClient_mac_addr () { | ||
32 | + return client_mac_addr; | ||
33 | + } | ||
34 | + | ||
35 | + public void setClient_mac_addr (final String client_mac_addr) { | ||
36 | + this.client_mac_addr = client_mac_addr; | ||
37 | + } | ||
38 | + | ||
39 | + public Double getAvg () { | ||
40 | + return avg; | ||
41 | + } | ||
42 | + | ||
43 | + public void setAvg (final Double avg) { | ||
44 | + this.avg = avg; | ||
45 | + } | ||
46 | + | ||
47 | + public Double getStdDev () { | ||
48 | + return stdDev; | ||
49 | + } | ||
50 | + | ||
51 | + public void setStdDev (final Double stdDev) { | ||
52 | + this.stdDev = stdDev; | ||
53 | + } | ||
54 | +} |
project/server_core/src/main/java/service/CalibrationService.java
0 → 100644
1 | +package service; | ||
2 | + | ||
3 | +import dao.HibernateDao; | ||
4 | +import repository.AccessPoint; | ||
5 | +import repository.RssiRecord; | ||
6 | + | ||
7 | +import java.util.List; | ||
8 | + | ||
9 | +/** | ||
10 | + * Created by Guillaume on 09/05/2017. | ||
11 | + */ | ||
12 | +public class CalibrationService { | ||
13 | + | ||
14 | + private HibernateDao dao; | ||
15 | + | ||
16 | + public CalibrationService(){this.dao = new HibernateDao();} | ||
17 | + public CalibrationService(HibernateDao dao){this.dao = dao;} | ||
18 | + | ||
19 | + public boolean registerCalibrationData(RssiRecord... records){ | ||
20 | + return dao.saveRssiRecord(records); | ||
21 | + } | ||
22 | + public boolean registerAp(AccessPoint ap){ | ||
23 | + return dao.saveAccessPoint(ap); | ||
24 | + } | ||
25 | + public List<AccessPoint> getAllAccessPoints(){return dao.getAccessPoint();} | ||
26 | +} |
project/server_core/src/main/java/service/ConnectionService.java
0 → 100644
project/server_core/src/main/java/service/PositioningService.java
0 → 100644
1 | +package service; | ||
2 | + | ||
3 | +import dao.HibernateDao; | ||
4 | +import repository.Location; | ||
5 | +import repository.RssiRecord; | ||
6 | +import repository.TempRssi; | ||
7 | + | ||
8 | +import java.util.ArrayList; | ||
9 | +import java.util.List; | ||
10 | + | ||
11 | +/** | ||
12 | + * Created by Guillaume on 09/05/2017. | ||
13 | + */ | ||
14 | +public class PositioningService { | ||
15 | + | ||
16 | + private static final double DEFAULT_POSITIONING_PRECISION = 7.5; | ||
17 | + | ||
18 | + private HibernateDao dao; | ||
19 | + | ||
20 | + public PositioningService () { | ||
21 | + this.dao = new HibernateDao(); | ||
22 | + } | ||
23 | + public PositioningService (HibernateDao dao) { | ||
24 | + this.dao = dao; | ||
25 | + } | ||
26 | + | ||
27 | + public Location getLocation (String clientMacAddr) { | ||
28 | + Location bestLoc = null; | ||
29 | + double bestLocProbability = -1; | ||
30 | + for(Location loc : dao.getLocations()) { | ||
31 | + //Liste des RSSISample pour une position donnée, chaque RSSISample étant | ||
32 | + //assossié à un AccessPoint | ||
33 | + List<RssiRecord> rssis = dao.getRssiRecord(loc.getId()); | ||
34 | + | ||
35 | + //Liste des RSSISample associé à un ap, mesuré pour un client | ||
36 | + List<TempRssi> clientRssi = dao.getTempRssi(clientMacAddr); | ||
37 | + | ||
38 | + double currentLocProbability = probability(clientRssi, rssis, DEFAULT_POSITIONING_PRECISION); | ||
39 | + if(bestLocProbability == -1 || currentLocProbability > bestLocProbability){ | ||
40 | + bestLoc = loc; | ||
41 | + bestLocProbability = currentLocProbability; | ||
42 | + } | ||
43 | + } | ||
44 | + return bestLoc; | ||
45 | + } | ||
46 | + | ||
47 | + private double probability(List<TempRssi> temps, List<RssiRecord> rssis, double precision){ | ||
48 | + try { | ||
49 | + double probability = 1; | ||
50 | + for (TempRssi temp : temps) { | ||
51 | + RssiRecord rssi = find(temp.getAp().getMac_addr(), rssis); | ||
52 | + probability*=gauss_probability(temp.getAvg(), temp.getStdDev(), rssi.getAvg(), rssi.getStdDev(), precision); | ||
53 | + } | ||
54 | + return probability; | ||
55 | + }catch(IllegalArgumentException e){ | ||
56 | + e.printStackTrace(); | ||
57 | + return -1; | ||
58 | + } | ||
59 | + } | ||
60 | + private double gauss_probability(double avg1, double std1, double avg2, double std2, double precision){ | ||
61 | + final double | ||
62 | + valDebut = Math.min(avg1-3*std1, avg2-3*std2), | ||
63 | + valFin = Math.max(avg1+3*std1, avg2+3*std2); | ||
64 | + double | ||
65 | + rectDebut = valDebut, | ||
66 | + rectFin = valDebut+precision, | ||
67 | + probabilite = 0; | ||
68 | + | ||
69 | + do{ | ||
70 | + probabilite+=Math.min( gauss(avg1, std1, (rectDebut+rectFin)/2), gauss(avg2, std2, (rectDebut+rectFin)/2)); | ||
71 | + rectDebut = rectFin; | ||
72 | + rectFin+=precision; | ||
73 | + }while(rectFin<valFin); | ||
74 | + | ||
75 | + return probabilite; | ||
76 | + } | ||
77 | + private double gauss (final double avg, final double std, final double x) { | ||
78 | + return (1/(std*Math.sqrt(2*Math.PI)))*Math.exp(-(Math.pow(x-avg, 2)/(2*Math.pow(std, 2)))); | ||
79 | + } | ||
80 | + private RssiRecord find(String macAddr, List<RssiRecord> rrs){ | ||
81 | + final List<RssiRecord> results = new ArrayList<>(); | ||
82 | + rrs.stream().filter(rr->rr.getAp().getMac_addr().equals(macAddr)).forEach(rr->results.add(rr)); | ||
83 | + | ||
84 | + switch(results.size()){ | ||
85 | + case 0: | ||
86 | + throw new IllegalArgumentException("No matching RssiRecord for mac address <"+macAddr+">"); | ||
87 | + case 1: | ||
88 | + return results.get(0); | ||
89 | + default : | ||
90 | + throw new IllegalArgumentException("Several("+results.size()+") matching RssiRecord for mac address <"+macAddr+">"); | ||
91 | + } | ||
92 | + } | ||
93 | + | ||
94 | + | ||
95 | +} |
project/server_core/src/main/java/utils/HibernateUtil.java
0 → 100644
1 | +package utils; | ||
2 | + | ||
3 | +import org.hibernate.SessionFactory; | ||
4 | +import org.hibernate.cfg.AnnotationConfiguration; | ||
5 | + | ||
6 | +public class HibernateUtil { | ||
7 | + | ||
8 | + private static final SessionFactory sessionFactory = buildSessionFactory(); | ||
9 | + private static SessionFactory buildSessionFactory() { | ||
10 | + try { | ||
11 | + // Create the SessionFactory from hibernate.cfg.xml | ||
12 | + return new AnnotationConfiguration().configure().buildSessionFactory(); | ||
13 | + } catch (Exception ex) { | ||
14 | + System.err.println("Initial SessionFactory creation failed." + ex); | ||
15 | + throw new ExceptionInInitializerError(ex); | ||
16 | + } | ||
17 | + } | ||
18 | + public static SessionFactory getSessionFactory() { | ||
19 | + return sessionFactory; | ||
20 | + } | ||
21 | +} | ||
0 | \ No newline at end of file | 22 | \ No newline at end of file |
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 | + <parent> | ||
6 | + <artifactId>project</artifactId> | ||
7 | + <groupId>com.utbm.lo53</groupId> | ||
8 | + <version>1.0-SNAPSHOT</version> | ||
9 | + </parent> | ||
10 | + <packaging>war</packaging> | ||
11 | + <modelVersion>4.0.0</modelVersion> | ||
12 | + | ||
13 | + <artifactId>server_servlet</artifactId> | ||
14 | + | ||
15 | + <dependencies> | ||
16 | + <dependency> | ||
17 | + <groupId>javax</groupId> | ||
18 | + <artifactId>javaee-web-api</artifactId> | ||
19 | + <version>6.0</version> | ||
20 | + <scope>provided</scope> | ||
21 | + </dependency> | ||
22 | + </dependencies> | ||
23 | + | ||
24 | +</project> | ||
0 | \ No newline at end of file | 25 | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> | ||
3 | + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> | ||
4 | + <output url="file://$MODULE_DIR$/target/classes" /> | ||
5 | + <output-test url="file://$MODULE_DIR$/target/test-classes" /> | ||
6 | + <content url="file://$MODULE_DIR$"> | ||
7 | + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | ||
8 | + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | ||
9 | + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | ||
10 | + <excludeFolder url="file://$MODULE_DIR$/target" /> | ||
11 | + </content> | ||
12 | + <orderEntry type="inheritedJdk" /> | ||
13 | + <orderEntry type="sourceFolder" forTests="false" /> | ||
14 | + <orderEntry type="library" scope="PROVIDED" name="Maven: javax:javaee-web-api:6.0" level="project" /> | ||
15 | + <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1212" level="project" /> | ||
16 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:3.5.6-Final" level="project" /> | ||
17 | + <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project" /> | ||
18 | + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.1" level="project" /> | ||
19 | + <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | ||
20 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
21 | + <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" /> | ||
22 | + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" /> | ||
23 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final" level="project" /> | ||
24 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final" level="project" /> | ||
25 | + <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final" level="project" /> | ||
26 | + <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.5.8" level="project" /> | ||
27 | + <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.14" level="project" /> | ||
28 | + <orderEntry type="library" scope="RUNTIME" name="Maven: javassist:javassist:3.9.0.GA" level="project" /> | ||
29 | + </component> | ||
30 | +</module> | ||
0 | \ No newline at end of file | 31 | \ No newline at end of file |
project/server_servlet/src/main/java/CalibrationServlet.java
0 → 100644
1 | +import javax.servlet.ServletException; | ||
2 | +import javax.servlet.http.HttpServlet; | ||
3 | +import javax.servlet.http.HttpServletRequest; | ||
4 | +import javax.servlet.http.HttpServletResponse; | ||
5 | +import java.io.IOException; | ||
6 | + | ||
7 | +/** | ||
8 | + * Created by Guillaume on 15/05/2017. | ||
9 | + */ | ||
10 | +public class CalibrationServlet extends HttpServlet{ | ||
11 | + @Override | ||
12 | + public void service (final HttpServletRequest servletRequest, final HttpServletResponse servletResponse) | ||
13 | + throws ServletException, IOException { | ||
14 | + //TODO | ||
15 | + } | ||
16 | + | ||
17 | + @Override | ||
18 | + public void doGet(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse) | ||
19 | + throws ServletException, IOException { | ||
20 | + service(servletRequest, servletResponse); | ||
21 | + } | ||
22 | + | ||
23 | + @Override | ||
24 | + public void doPost(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse) | ||
25 | + throws ServletException, IOException { | ||
26 | + service(servletRequest, servletResponse); | ||
27 | + } | ||
28 | +} |
project/server_servlet/src/main/java/PositioningServlet.java
0 → 100644
1 | + | ||
2 | +import javax.servlet.ServletException; | ||
3 | +import javax.servlet.http.HttpServlet; | ||
4 | +import javax.servlet.http.HttpServletRequest; | ||
5 | +import javax.servlet.http.HttpServletResponse; | ||
6 | +import java.io.IOException; | ||
7 | + | ||
8 | +/** | ||
9 | + * Created by Guillaume on 15/05/2017. | ||
10 | + */ | ||
11 | +public class PositioningServlet extends HttpServlet{ | ||
12 | + @Override | ||
13 | + public void service (final HttpServletRequest servletRequest, final HttpServletResponse servletResponse) | ||
14 | + throws ServletException, IOException { | ||
15 | + //TODO | ||
16 | + } | ||
17 | + | ||
18 | + @Override | ||
19 | + public void doGet(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse) | ||
20 | + throws ServletException, IOException { | ||
21 | + service(servletRequest, servletResponse); | ||
22 | + } | ||
23 | + | ||
24 | + @Override | ||
25 | + public void doPost(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse) | ||
26 | + throws ServletException, IOException { | ||
27 | + service(servletRequest, servletResponse); | ||
28 | + } | ||
29 | +} |