LO53-PositioningApplication-BBPS / LO53-PositioningServer

Commit acb139601a5658545d3b8493bcec771aa637a2db

Authored by Notmoo-PC\Notmoo
1 parent a860c805

Refactor structure projet

Showing 108 changed files with 242 additions and 4092 deletions   Show diff stats
Inline Side-by-side
.idea/Positionning_server.iml
  Show/Hide comments   View file @acb1396
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <module type="JAVA_MODULE" version="4">
  3 + <component name="FacetManager">
  4 + <facet type="hibernate" name="Hibernate">
  5 + <configuration>
  6 + <datasource-map />
  7 + <naming-strategy-map />
  8 + <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/PositioningServer/src/main/resources/hibernate.cfg.xml" />
  9 + <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/PositioningServer/target/classes/hibernate.cfg.xml" />
  10 + <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/project/server_core/src/main/resources/hibernate.cfg.xml" />
  11 + <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/project/server_core/target/classes/hibernate.cfg.xml" />
  12 + </configuration>
  13 + </facet>
  14 + <facet type="web" name="Web">
  15 + <configuration>
  16 + <descriptors>
  17 + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/project/server_servlet/src/main/webapp/WEB-INF/web.xml" />
  18 + </descriptors>
  19 + <webroots>
  20 + <root url="file://$MODULE_DIR$/project/server_servlet/src/main/webapp" relative="/" />
  21 + </webroots>
  22 + <sourceRoots />
  23 + </configuration>
  24 + </facet>
  25 + <facet type="web" name="Web2">
  26 + <configuration>
  27 + <descriptors>
  28 + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/PositioningServer/Server_Servlets/src/WEB-INF/web.xml" />
  29 + </descriptors>
  30 + <webroots>
  31 + <root url="file://$MODULE_DIR$/PositioningServer/Server_Servlets/src" relative="/" />
  32 + </webroots>
  33 + <sourceRoots />
  34 + </configuration>
  35 + </facet>
  36 + </component>
3 37 <component name="NewModuleRootManager" inherit-compiler-output="true">
4 38 <exclude-output />
5   - <content url="file://$MODULE_DIR$" />
  39 + <content url="file://$MODULE_DIR$">
  40 + <sourceFolder url="file://$MODULE_DIR$/project/server_core/src" isTestSource="false" />
  41 + <sourceFolder url="file://$MODULE_DIR$/project/server_servlet/src" isTestSource="false" />
  42 + </content>
6 43 <orderEntry type="inheritedJdk" />
7 44 <orderEntry type="sourceFolder" forTests="false" />
8 45 </component>
... ...
.idea/artifacts/positioning_server_war.xml 0 → 100644
  Show/Hide comments   View file @acb1396
  1 +<component name="ArtifactManager">
  2 + <artifact type="war" name="positioning_server:war">
  3 + <output-path>$PROJECT_DIR$/target</output-path>
  4 + <root id="archive" name="positioning_server.war">
  5 + <element id="artifact" artifact-name="positioning_server:war exploded" />
  6 + </root>
  7 + </artifact>
  8 +</component>
0 9 \ No newline at end of file
... ...
.idea/artifacts/positioning_server_war_exploded.xml 0 → 100644
  Show/Hide comments   View file @acb1396
  1 +<component name="ArtifactManager">
  2 + <artifact type="exploded-war" name="positioning_server:war exploded">
  3 + <output-path>$PROJECT_DIR$/target/positioning_server</output-path>
  4 + <root id="root">
  5 + <element id="directory" name="WEB-INF">
  6 + <element id="directory" name="classes">
  7 + <element id="module-output" name="positioning_server" />
  8 + </element>
  9 + <element id="directory" name="lib">
  10 + <element id="library" level="project" name="Maven: org.postgresql:postgresql:9.4.1212" />
  11 + <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:3.5.6-Final" />
  12 + <element id="library" level="project" name="Maven: antlr:antlr:2.7.6" />
  13 + <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.1" />
  14 + <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
  15 + <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" />
  16 + <element id="library" level="project" name="Maven: javax.transaction:jta:1.1" />
  17 + <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.5.8" />
  18 + <element id="library" level="project" name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final" />
  19 + <element id="library" level="project" name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final" />
  20 + <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final" />
  21 + <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.5.8" />
  22 + <element id="library" level="project" name="Maven: log4j:log4j:1.2.14" />
  23 + <element id="library" level="project" name="Maven: javassist:javassist:3.9.0.GA" />
  24 + </element>
  25 + </element>
  26 + <element id="javaee-facet-resources" facet="positioning_server/web/Web" />
  27 + </root>
  28 + </artifact>
  29 +</component>
0 30 \ No newline at end of file
... ...
PositioningServer/.idea/compiler.xml renamed to .idea/compiler.xml
  Show/Hide comments   View file @acb1396
... ... @@ -6,13 +6,11 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="PositioningServer" />
10   - <module name="Server_Servlets" />
  9 + <module name="positioning_server" />
11 10 </profile>
12 11 </annotationProcessing>
13 12 <bytecodeTargetLevel>
14   - <module name="PositioningServer" target="1.8" />
15   - <module name="Server_Servlets" target="1.6" />
  13 + <module name="positioning_server" target="1.8" />
16 14 </bytecodeTargetLevel>
17 15 </component>
18 16 </project>
19 17 \ No newline at end of file
... ...
project/.idea/misc.xml renamed to .idea/misc.xml
  Show/Hide comments   View file @acb1396
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
  3 + <component name="FrameworkDetectionExcludesConfiguration">
  4 + <file type="web" url="file://$PROJECT_DIR$" />
  5 + </component>
3 6 <component name="MavenProjectsManager">
4 7 <option name="originalFiles">
5 8 <list>
... ...
.idea/modules.xml
  Show/Hide comments   View file @acb1396
... ... @@ -2,7 +2,7 @@
2 2 <project version="4">
3 3 <component name="ProjectModuleManager">
4 4 <modules>
5   - <module fileurl="file://$PROJECT_DIR$/.idea/Positionning_server.iml" filepath="$PROJECT_DIR$/.idea/Positionning_server.iml" />
  5 + <module fileurl="file://$PROJECT_DIR$/positioning_server.iml" filepath="$PROJECT_DIR$/positioning_server.iml" />
6 6 </modules>
7 7 </component>
8 8 </project>
9 9 \ No newline at end of file
... ...
PositioningServer/.idea/encodings.xml deleted
View file @a860c80
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project version="4">
3   - <component name="Encoding">
4   - <file url="file://$PROJECT_DIR$/Server_Servlets" charset="UTF-8" />
5   - </component>
6   -</project>
7 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__antlr_antlr_2_7_6.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__commons_collections_commons_collections_3_1.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__javassist_javassist_3_9_0_GA.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__javax_javaee_web_api_6_0.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__javax_transaction_jta_1_1.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__log4j_log4j_1_2_14.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__org_hibernate_hibernate_annotations_3_5_6_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__org_hibernate_hibernate_core_3_5_6_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1212.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_8.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_8.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
PositioningServer/.idea/misc.xml deleted
View file @a860c80
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project version="4">
3   - <component name="ClientPropertiesManager">
4   - <properties class="javax.swing.AbstractButton">
5   - <property name="hideActionText" class="java.lang.Boolean" />
6   - </properties>
7   - <properties class="javax.swing.JComponent">
8   - <property name="html.disable" class="java.lang.Boolean" />
9   - </properties>
10   - <properties class="javax.swing.JEditorPane">
11   - <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
12   - <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
13   - <property name="charset" class="java.lang.String" />
14   - </properties>
15   - <properties class="javax.swing.JList">
16   - <property name="List.isFileList" class="java.lang.Boolean" />
17   - </properties>
18   - <properties class="javax.swing.JPasswordField">
19   - <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
20   - </properties>
21   - <properties class="javax.swing.JSlider">
22   - <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
23   - <property name="JSlider.isFilled" class="java.lang.Boolean" />
24   - </properties>
25   - <properties class="javax.swing.JTable">
26   - <property name="Table.isFileList" class="java.lang.Boolean" />
27   - <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
28   - <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
29   - </properties>
30   - <properties class="javax.swing.JToolBar">
31   - <property name="JToolBar.isRollover" class="java.lang.Boolean" />
32   - </properties>
33   - <properties class="javax.swing.JTree">
34   - <property name="JTree.lineStyle" class="java.lang.String" />
35   - </properties>
36   - <properties class="javax.swing.text.JTextComponent">
37   - <property name="caretAspectRatio" class="java.lang.Double" />
38   - <property name="caretWidth" class="java.lang.Integer" />
39   - </properties>
40   - </component>
41   - <component name="MavenProjectsManager">
42   - <option name="originalFiles">
43   - <list>
44   - <option value="$PROJECT_DIR$/pom.xml" />
45   - <option value="$PROJECT_DIR$/Server_Servlets/pom.xml" />
46   - </list>
47   - </option>
48   - </component>
49   - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
50   - <output url="file://$PROJECT_DIR$/out" />
51   - </component>
52   -</project>
53 0 \ No newline at end of file
PositioningServer/.idea/modules.xml deleted
View file @a860c80
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project version="4">
3   - <component name="ProjectModuleManager">
4   - <modules>
5   - <module fileurl="file://$PROJECT_DIR$/PositioningServer.iml" filepath="$PROJECT_DIR$/PositioningServer.iml" />
6   - <module fileurl="file://$PROJECT_DIR$/Server_Servlets/Server_Servlets.iml" filepath="$PROJECT_DIR$/Server_Servlets/Server_Servlets.iml" />
7   - </modules>
8   - </component>
9   -</project>
10 0 \ No newline at end of file
PositioningServer/.idea/uiDesigner.xml deleted
View file @a860c80
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project version="4">
3   - <component name="Palette2">
4   - <group name="Swing">
5   - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
6   - <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
7   - </item>
8   - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
9   - <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
10   - </item>
11   - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
12   - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
13   - </item>
14   - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
15   - <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
16   - </item>
17   - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
18   - <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
19   - <initial-values>
20   - <property name="text" value="Button" />
21   - </initial-values>
22   - </item>
23   - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
24   - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
25   - <initial-values>
26   - <property name="text" value="RadioButton" />
27   - </initial-values>
28   - </item>
29   - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
30   - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
31   - <initial-values>
32   - <property name="text" value="CheckBox" />
33   - </initial-values>
34   - </item>
35   - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
36   - <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
37   - <initial-values>
38   - <property name="text" value="Label" />
39   - </initial-values>
40   - </item>
41   - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
42   - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
43   - <preferred-size width="150" height="-1" />
44   - </default-constraints>
45   - </item>
46   - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
47   - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
48   - <preferred-size width="150" height="-1" />
49   - </default-constraints>
50   - </item>
51   - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
52   - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
53   - <preferred-size width="150" height="-1" />
54   - </default-constraints>
55   - </item>
56   - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
57   - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
58   - <preferred-size width="150" height="50" />
59   - </default-constraints>
60   - </item>
61   - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
62   - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
63   - <preferred-size width="150" height="50" />
64   - </default-constraints>
65   - </item>
66   - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
67   - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
68   - <preferred-size width="150" height="50" />
69   - </default-constraints>
70   - </item>
71   - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
72   - <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
73   - </item>
74   - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
75   - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
76   - <preferred-size width="150" height="50" />
77   - </default-constraints>
78   - </item>
79   - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
80   - <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
81   - <preferred-size width="150" height="50" />
82   - </default-constraints>
83   - </item>
84   - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
85   - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
86   - <preferred-size width="150" height="50" />
87   - </default-constraints>
88   - </item>
89   - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
90   - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
91   - <preferred-size width="200" height="200" />
92   - </default-constraints>
93   - </item>
94   - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
95   - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
96   - <preferred-size width="200" height="200" />
97   - </default-constraints>
98   - </item>
99   - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
100   - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
101   - </item>
102   - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
103   - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
104   - </item>
105   - <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
106   - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
107   - </item>
108   - <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
109   - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
110   - </item>
111   - <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
112   - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
113   - <preferred-size width="-1" height="20" />
114   - </default-constraints>
115   - </item>
116   - <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
117   - <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
118   - </item>
119   - <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
120   - <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
121   - </item>
122   - </group>
123   - </component>
124   -</project>
125 0 \ No newline at end of file
PositioningServer/.idea/workspace.xml deleted
View file @a860c80
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project version="4">
3   - <component name="ChangeListManager">
4   - <list default="true" id="209b1df3-1cb3-426d-b94b-5421569c712a" name="Default" comment="" />
5   - <ignored path="$PROJECT_DIR$/out/" />
6   - <ignored path="$PROJECT_DIR$/target/" />
7   - <ignored path="$PROJECT_DIR$/Server_Servlets/target/" />
8   - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9   - <option name="TRACKING_ENABLED" value="true" />
10   - <option name="SHOW_DIALOG" value="false" />
11   - <option name="HIGHLIGHT_CONFLICTS" value="true" />
12   - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13   - <option name="LAST_RESOLUTION" value="IGNORE" />
14   - </component>
15   - <component name="CreatePatchCommitExecutor">
16   - <option name="PATCH_PATH" value="" />
17   - </component>
18   - <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
19   - <component name="FileEditorManager">
20   - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
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">
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 />
27   - </state>
28   - </provider>
29   - </entry>
30   - </file>
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">
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" />
36   - <folding />
37   - </state>
38   - </provider>
39   - </entry>
40   - </file>
41   - </leaf>
42   - </component>
43   - <component name="FileTemplateManagerImpl">
44   - <option name="RECENT_TEMPLATES">
45   - <list>
46   - <option value="XSLT Stylesheet" />
47   - <option value="Class" />
48   - </list>
49   - </option>
50   - </component>
51   - <component name="GradleLocalSettings">
52   - <option name="externalProjectsViewState">
53   - <projects_view />
54   - </option>
55   - </component>
56   - <component name="IdeDocumentHistory">
57   - <option name="CHANGED_PATHS">
58   - <list>
59   - <option value="$PROJECT_DIR$/src/main/resources/hbm/Location.hbm.xml" />
60   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/IConnectionService.java" />
61   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/ConnectionService.java" />
62   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalculationService.java" />
63   - <option value="$PROJECT_DIR$/src/main/resources/hbm/RSSIRecord.hbm.xml" />
64   - <option value="$PROJECT_DIR$/src/main/resources/hbm/Map.hbm.xml" />
65   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/DebianArpDao.java" />
66   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/DebianDao.java" />
67   - <option value="$PROJECT_DIR$/src/main/resources/hbm/TempRSSI.hbm.xml" />
68   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/PositioningService.java" />
69   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalibrationService.java" />
70   - <option value="$PROJECT_DIR$/Server_Servlets/pom.xml" />
71   - <option value="$PROJECT_DIR$/src/main/resources/hbm/AccessPoint.hbm.xml" />
72   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/AccessPoint.java" />
73   - <option value="$PROJECT_DIR$/pom.xml" />
74   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/utils/HibernateUtil.java" />
75   - <option value="$PROJECT_DIR$/src/main/resources/hibernate.cfg.xml" />
76   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Location.java" />
77   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/RssiRecord.java" />
78   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/TempRssi.java" />
79   - <option value="$PROJECT_DIR$/Server_Servlets/src/WEB-INF/servlets/CalibrationServlet.java" />
80   - <option value="$PROJECT_DIR$/Server_Servlets/src/WEB-INF/web.xml" />
81   - <option value="$PROJECT_DIR$/Server_Servlets/src/main/java/CalibrationServlet.java" />
82   - <option value="$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/CalibrationServlet.java" />
83   - <option value="$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/PositioningServlet.java" />
84   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java" />
85   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Map.java" />
86   - <option value="$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Mape.java" />
87   - <option value="$PROJECT_DIR$/src/main/java/ServerApp.java" />
88   - </list>
89   - </option>
90   - </component>
91   - <component name="MavenImportPreferences">
92   - <option name="importingSettings">
93   - <MavenImportingSettings>
94   - <option name="importAutomatically" value="true" />
95   - </MavenImportingSettings>
96   - </option>
97   - </component>
98   - <component name="ProjectFrameBounds">
99   - <option name="x" value="-8" />
100   - <option name="y" value="-8" />
101   - <option name="width" value="1936" />
102   - <option name="height" value="1056" />
103   - </component>
104   - <component name="ProjectView">
105   - <navigator currentView="ProjectPane" proportions="" version="1">
106   - <flattenPackages />
107   - <showMembers />
108   - <showModules />
109   - <showLibraryContents />
110   - <hideEmptyPackages />
111   - <abbreviatePackageNames />
112   - <autoscrollToSource />
113   - <autoscrollFromSource />
114   - <sortByType />
115   - <manualOrder />
116   - <foldersAlwaysOnTop value="true" />
117   - </navigator>
118   - <panes>
119   - <pane id="ProjectPane">
120   - <subPane>
121   - <PATH>
122   - <PATH_ELEMENT>
123   - <option name="myItemId" value="PositioningServer" />
124   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
125   - </PATH_ELEMENT>
126   - <PATH_ELEMENT>
127   - <option name="myItemId" value="PositioningServer" />
128   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
129   - </PATH_ELEMENT>
130   - </PATH>
131   - <PATH>
132   - <PATH_ELEMENT>
133   - <option name="myItemId" value="PositioningServer" />
134   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
135   - </PATH_ELEMENT>
136   - <PATH_ELEMENT>
137   - <option name="myItemId" value="PositioningServer" />
138   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
139   - </PATH_ELEMENT>
140   - <PATH_ELEMENT>
141   - <option name="myItemId" value="src" />
142   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
143   - </PATH_ELEMENT>
144   - <PATH_ELEMENT>
145   - <option name="myItemId" value="main" />
146   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
147   - </PATH_ELEMENT>
148   - <PATH_ELEMENT>
149   - <option name="myItemId" value="resources" />
150   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
151   - </PATH_ELEMENT>
152   - </PATH>
153   - <PATH>
154   - <PATH_ELEMENT>
155   - <option name="myItemId" value="PositioningServer" />
156   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
157   - </PATH_ELEMENT>
158   - <PATH_ELEMENT>
159   - <option name="myItemId" value="PositioningServer" />
160   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
161   - </PATH_ELEMENT>
162   - <PATH_ELEMENT>
163   - <option name="myItemId" value="src" />
164   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
165   - </PATH_ELEMENT>
166   - <PATH_ELEMENT>
167   - <option name="myItemId" value="main" />
168   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
169   - </PATH_ELEMENT>
170   - <PATH_ELEMENT>
171   - <option name="myItemId" value="java" />
172   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
173   - </PATH_ELEMENT>
174   - </PATH>
175   - <PATH>
176   - <PATH_ELEMENT>
177   - <option name="myItemId" value="PositioningServer" />
178   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
179   - </PATH_ELEMENT>
180   - <PATH_ELEMENT>
181   - <option name="myItemId" value="PositioningServer" />
182   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
183   - </PATH_ELEMENT>
184   - <PATH_ELEMENT>
185   - <option name="myItemId" value="src" />
186   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
187   - </PATH_ELEMENT>
188   - <PATH_ELEMENT>
189   - <option name="myItemId" value="main" />
190   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
191   - </PATH_ELEMENT>
192   - <PATH_ELEMENT>
193   - <option name="myItemId" value="java" />
194   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
195   - </PATH_ELEMENT>
196   - <PATH_ELEMENT>
197   - <option name="myItemId" value="lo53" />
198   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
199   - </PATH_ELEMENT>
200   - <PATH_ELEMENT>
201   - <option name="myItemId" value="utils" />
202   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
203   - </PATH_ELEMENT>
204   - </PATH>
205   - <PATH>
206   - <PATH_ELEMENT>
207   - <option name="myItemId" value="PositioningServer" />
208   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
209   - </PATH_ELEMENT>
210   - <PATH_ELEMENT>
211   - <option name="myItemId" value="PositioningServer" />
212   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
213   - </PATH_ELEMENT>
214   - <PATH_ELEMENT>
215   - <option name="myItemId" value="src" />
216   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
217   - </PATH_ELEMENT>
218   - <PATH_ELEMENT>
219   - <option name="myItemId" value="main" />
220   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
221   - </PATH_ELEMENT>
222   - <PATH_ELEMENT>
223   - <option name="myItemId" value="java" />
224   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
225   - </PATH_ELEMENT>
226   - <PATH_ELEMENT>
227   - <option name="myItemId" value="lo53" />
228   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
229   - </PATH_ELEMENT>
230   - <PATH_ELEMENT>
231   - <option name="myItemId" value="service" />
232   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
233   - </PATH_ELEMENT>
234   - </PATH>
235   - <PATH>
236   - <PATH_ELEMENT>
237   - <option name="myItemId" value="PositioningServer" />
238   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
239   - </PATH_ELEMENT>
240   - <PATH_ELEMENT>
241   - <option name="myItemId" value="PositioningServer" />
242   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
243   - </PATH_ELEMENT>
244   - <PATH_ELEMENT>
245   - <option name="myItemId" value="src" />
246   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
247   - </PATH_ELEMENT>
248   - <PATH_ELEMENT>
249   - <option name="myItemId" value="main" />
250   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
251   - </PATH_ELEMENT>
252   - <PATH_ELEMENT>
253   - <option name="myItemId" value="java" />
254   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
255   - </PATH_ELEMENT>
256   - <PATH_ELEMENT>
257   - <option name="myItemId" value="lo53" />
258   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
259   - </PATH_ELEMENT>
260   - <PATH_ELEMENT>
261   - <option name="myItemId" value="repository" />
262   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
263   - </PATH_ELEMENT>
264   - </PATH>
265   - <PATH>
266   - <PATH_ELEMENT>
267   - <option name="myItemId" value="PositioningServer" />
268   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
269   - </PATH_ELEMENT>
270   - <PATH_ELEMENT>
271   - <option name="myItemId" value="PositioningServer" />
272   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
273   - </PATH_ELEMENT>
274   - <PATH_ELEMENT>
275   - <option name="myItemId" value="src" />
276   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
277   - </PATH_ELEMENT>
278   - <PATH_ELEMENT>
279   - <option name="myItemId" value="main" />
280   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
281   - </PATH_ELEMENT>
282   - <PATH_ELEMENT>
283   - <option name="myItemId" value="java" />
284   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
285   - </PATH_ELEMENT>
286   - <PATH_ELEMENT>
287   - <option name="myItemId" value="lo53" />
288   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
289   - </PATH_ELEMENT>
290   - <PATH_ELEMENT>
291   - <option name="myItemId" value="dao" />
292   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
293   - </PATH_ELEMENT>
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>
309   - </subPane>
310   - </pane>
311   - <pane id="PackagesPane" />
312   - <pane id="Scope" />
313   - <pane id="Scratches" />
314   - </panes>
315   - </component>
316   - <component name="PropertiesComponent">
317   - <property name="project.structure.last.edited" value="Modules" />
318   - <property name="project.structure.proportion" value="0.15" />
319   - <property name="project.structure.side.proportion" value="0.2" />
320   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../LO54-JEE-MiniProjet" />
321   - </component>
322   - <component name="RecentsManager">
323   - <key name="MoveFile.RECENT_KEYS">
324   - <recent name="C:\Users\Guillaume\Desktop\UTBM\cours-UV\GI04_P2017\LO53\PositioningServer\Server_Servlets\src\WEB-INF\servlets" />
325   - </key>
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>
339   - <component name="RunManager" selected="Application.ServerApp">
340   - <configuration default="false" name="ServerApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
341   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
342   - <option name="MAIN_CLASS_NAME" value="ServerApp" />
343   - <option name="VM_PARAMETERS" />
344   - <option name="PROGRAM_PARAMETERS" />
345   - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
346   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
347   - <option name="ALTERNATIVE_JRE_PATH" />
348   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
349   - <option name="ENV_VARIABLES" />
350   - <option name="PASS_PARENT_ENVS" value="true" />
351   - <module name="PositioningServer" />
352   - <envs />
353   - <method />
354   - </configuration>
355   - <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
356   - <module name="" />
357   - <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
358   - <option name="PROGRAM_PARAMETERS" />
359   - <predefined_log_file id="idea.log" enabled="true" />
360   - <method />
361   - </configuration>
362   - <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
363   - <module name="" />
364   - <option name="DEPLOY" value="true" />
365   - <option name="ARTIFACT_NAME" value="" />
366   - <option name="PM_INSTALL_OPTIONS" value="" />
367   - <option name="ACTIVITY_EXTRA_FLAGS" value="" />
368   - <option name="MODE" value="default_activity" />
369   - <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
370   - <option name="PREFERRED_AVD" value="" />
371   - <option name="CLEAR_LOGCAT" value="false" />
372   - <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
373   - <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
374   - <option name="FORCE_STOP_RUNNING_APP" value="true" />
375   - <option name="DEBUGGER_TYPE" value="Java" />
376   - <option name="USE_LAST_SELECTED_DEVICE" value="false" />
377   - <option name="PREFERRED_AVD" value="" />
378   - <Java />
379   - <Profilers>
380   - <option name="ENABLE_ADVANCED_PROFILING" value="true" />
381   - <option name="GAPID_ENABLED" value="false" />
382   - <option name="GAPID_DISABLE_PCS" value="false" />
383   - <option name="SUPPORT_LIB_ENABLED" value="true" />
384   - <option name="INSTRUMENTATION_ENABLED" value="true" />
385   - </Profilers>
386   - <option name="DEEP_LINK" value="" />
387   - <option name="ACTIVITY_CLASS" value="" />
388   - <method />
389   - </configuration>
390   - <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
391   - <module name="" />
392   - <option name="TESTING_TYPE" value="0" />
393   - <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
394   - <option name="METHOD_NAME" value="" />
395   - <option name="CLASS_NAME" value="" />
396   - <option name="PACKAGE_NAME" value="" />
397   - <option name="EXTRA_OPTIONS" value="" />
398   - <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
399   - <option name="PREFERRED_AVD" value="" />
400   - <option name="CLEAR_LOGCAT" value="false" />
401   - <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
402   - <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
403   - <option name="FORCE_STOP_RUNNING_APP" value="true" />
404   - <option name="DEBUGGER_TYPE" value="Java" />
405   - <option name="USE_LAST_SELECTED_DEVICE" value="false" />
406   - <option name="PREFERRED_AVD" value="" />
407   - <Java />
408   - <Profilers>
409   - <option name="ENABLE_ADVANCED_PROFILING" value="true" />
410   - <option name="GAPID_ENABLED" value="false" />
411   - <option name="GAPID_DISABLE_PCS" value="false" />
412   - <option name="SUPPORT_LIB_ENABLED" value="true" />
413   - <option name="INSTRUMENTATION_ENABLED" value="true" />
414   - </Profilers>
415   - <method />
416   - </configuration>
417   - <configuration default="true" type="Applet" factoryName="Applet">
418   - <option name="HTML_USED" value="false" />
419   - <option name="WIDTH" value="400" />
420   - <option name="HEIGHT" value="300" />
421   - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
422   - <module />
423   - <method />
424   - </configuration>
425   - <configuration default="true" type="Application" factoryName="Application">
426   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
427   - <option name="MAIN_CLASS_NAME" />
428   - <option name="VM_PARAMETERS" />
429   - <option name="PROGRAM_PARAMETERS" />
430   - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
431   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
432   - <option name="ALTERNATIVE_JRE_PATH" />
433   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
434   - <option name="ENV_VARIABLES" />
435   - <option name="PASS_PARENT_ENVS" value="true" />
436   - <module name="" />
437   - <envs />
438   - <method />
439   - </configuration>
440   - <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
441   - <ExternalSystemSettings>
442   - <option name="executionName" />
443   - <option name="externalProjectPath" />
444   - <option name="externalSystemIdString" value="GRADLE" />
445   - <option name="scriptParameters" />
446   - <option name="taskDescriptions">
447   - <list />
448   - </option>
449   - <option name="taskNames">
450   - <list />
451   - </option>
452   - <option name="vmOptions" />
453   - </ExternalSystemSettings>
454   - <method />
455   - </configuration>
456   - <configuration default="true" type="JUnit" factoryName="JUnit">
457   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
458   - <module name="" />
459   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
460   - <option name="ALTERNATIVE_JRE_PATH" />
461   - <option name="PACKAGE_NAME" />
462   - <option name="MAIN_CLASS_NAME" />
463   - <option name="METHOD_NAME" />
464   - <option name="TEST_OBJECT" value="class" />
465   - <option name="VM_PARAMETERS" value="-ea" />
466   - <option name="PARAMETERS" />
467   - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
468   - <option name="ENV_VARIABLES" />
469   - <option name="PASS_PARENT_ENVS" value="true" />
470   - <option name="TEST_SEARCH_SCOPE">
471   - <value defaultName="singleModule" />
472   - </option>
473   - <envs />
474   - <patterns />
475   - <method />
476   - </configuration>
477   - <configuration default="true" type="JarApplication" factoryName="JAR Application">
478   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
479   - <envs />
480   - <method />
481   - </configuration>
482   - <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
483   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
484   - <option name="SCRATCH_FILE_ID" value="0" />
485   - <option name="MAIN_CLASS_NAME" />
486   - <option name="VM_PARAMETERS" />
487   - <option name="PROGRAM_PARAMETERS" />
488   - <option name="WORKING_DIRECTORY" />
489   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
490   - <option name="ALTERNATIVE_JRE_PATH" />
491   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
492   - <option name="ENV_VARIABLES" />
493   - <option name="PASS_PARENT_ENVS" value="true" />
494   - <module name="" />
495   - <envs />
496   - <method />
497   - </configuration>
498   - <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
499   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
500   - <option name="MAIN_CLASS_NAME" />
501   - <option name="VM_PARAMETERS" />
502   - <option name="PROGRAM_PARAMETERS" />
503   - <option name="WORKING_DIRECTORY" />
504   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
505   - <option name="ALTERNATIVE_JRE_PATH" />
506   - <option name="PASS_PARENT_ENVS" value="true" />
507   - <module name="PositioningServer" />
508   - <envs />
509   - <method />
510   - </configuration>
511   - <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
512   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
513   - <option name="filePath" />
514   - <option name="vmParameters" />
515   - <option name="alternativeJrePath" />
516   - <option name="programParameters" />
517   - <option name="passParentEnvs" value="true" />
518   - <option name="workingDirectory" />
519   - <option name="isAlternativeJrePathEnabled" value="false" />
520   - <envs />
521   - <method />
522   - </configuration>
523   - <configuration default="true" type="Remote" factoryName="Remote">
524   - <option name="USE_SOCKET_TRANSPORT" value="true" />
525   - <option name="SERVER_MODE" value="false" />
526   - <option name="SHMEM_ADDRESS" value="javadebug" />
527   - <option name="HOST" value="localhost" />
528   - <option name="PORT" value="5005" />
529   - <method />
530   - </configuration>
531   - <configuration default="true" type="TestNG" factoryName="TestNG">
532   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
533   - <module name="" />
534   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
535   - <option name="ALTERNATIVE_JRE_PATH" />
536   - <option name="SUITE_NAME" />
537   - <option name="PACKAGE_NAME" />
538   - <option name="MAIN_CLASS_NAME" />
539   - <option name="METHOD_NAME" />
540   - <option name="GROUP_NAME" />
541   - <option name="TEST_OBJECT" value="CLASS" />
542   - <option name="VM_PARAMETERS" value="-ea" />
543   - <option name="PARAMETERS" />
544   - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
545   - <option name="OUTPUT_DIRECTORY" />
546   - <option name="ANNOTATION_TYPE" />
547   - <option name="ENV_VARIABLES" />
548   - <option name="PASS_PARENT_ENVS" value="true" />
549   - <option name="TEST_SEARCH_SCOPE">
550   - <value defaultName="singleModule" />
551   - </option>
552   - <option name="USE_DEFAULT_REPORTERS" value="false" />
553   - <option name="PROPERTIES_FILE" />
554   - <envs />
555   - <properties />
556   - <listeners />
557   - <method />
558   - </configuration>
559   - <list size="1">
560   - <item index="0" class="java.lang.String" itemvalue="Application.ServerApp" />
561   - </list>
562   - <recent_temporary>
563   - <list size="1">
564   - <item index="0" class="java.lang.String" itemvalue="Application.ServerApp" />
565   - </list>
566   - </recent_temporary>
567   - </component>
568   - <component name="ShelveChangesManager" show_recycled="false">
569   - <option name="remove_strategy" value="false" />
570   - </component>
571   - <component name="TaskManager">
572   - <task active="true" id="Default" summary="Default task">
573   - <changelist id="209b1df3-1cb3-426d-b94b-5421569c712a" name="Default" comment="" />
574   - <created>1494341366447</created>
575   - <option name="number" value="Default" />
576   - <option name="presentableId" value="Default" />
577   - <updated>1494341366447</updated>
578   - </task>
579   - <servers />
580   - </component>
581   - <component name="ToolWindowManager">
582   - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
583   - <editor active="true" />
584   - <layout>
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" />
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" />
587   - <window_info id="Palette&#9;" 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" />
588   - <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="5" side_tool="false" content_ui="tabs" />
589   - <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="6" side_tool="false" content_ui="tabs" />
590   - <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.22074074" sideWeight="0.5122699" order="7" side_tool="true" content_ui="tabs" />
591   - <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="8" side_tool="false" content_ui="tabs" />
592   - <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="10" side_tool="false" content_ui="tabs" />
593   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6992593" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
594   - <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="5" 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" />
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" />
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" />
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" />
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" />
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" />
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" />
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" />
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" />
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" />
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" />
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" />
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" />
609   - <window_info id="Application Servers" 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="8" side_tool="false" content_ui="tabs" />
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" />
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" />
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" />
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" />
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" />
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" />
617   - <window_info id="IDEtalk Messages" 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="13" side_tool="false" content_ui="tabs" />
618   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3288889" sideWeight="0.48773006" order="1" side_tool="false" content_ui="tabs" />
619   - </layout>
620   - </component>
621   - <component name="VcsContentAnnotationSettings">
622   - <option name="myLimit" value="2678400000" />
623   - </component>
624   - <component name="XDebuggerManager">
625   - <breakpoint-manager>
626   - <breakpoints>
627   - <line-breakpoint enabled="true" type="java-line">
628   - <url>file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java</url>
629   - <line>77</line>
630   - <properties />
631   - <option name="timeStamp" value="5" />
632   - </line-breakpoint>
633   - </breakpoints>
634   - <option name="time" value="6" />
635   - </breakpoint-manager>
636   - <watches-manager />
637   - </component>
638   - <component name="antWorkspaceConfiguration">
639   - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
640   - <option name="FILTER_TARGETS" value="false" />
641   - </component>
642   - <component name="editorHistoryManager">
643   - <entry file="file://$PROJECT_DIR$/src/main/java/ServerApp.java">
644   - <provider selected="true" editor-type-id="text-editor">
645   - <state relative-caret-position="0">
646   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
647   - <folding>
648   - <element signature="imports" expanded="true" />
649   - </folding>
650   - </state>
651   - </provider>
652   - </entry>
653   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Mape.java">
654   - <provider selected="true" editor-type-id="text-editor">
655   - <state relative-caret-position="128">
656   - <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
657   - <folding>
658   - <element signature="imports" expanded="true" />
659   - </folding>
660   - </state>
661   - </provider>
662   - </entry>
663   - <entry file="file://$PROJECT_DIR$/Server_Servlets/src/WEB-INF/web.xml">
664   - <provider selected="true" editor-type-id="text-editor">
665   - <state relative-caret-position="272">
666   - <caret line="17" column="29" lean-forward="false" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
667   - <folding />
668   - </state>
669   - </provider>
670   - </entry>
671   - <entry file="file://$PROJECT_DIR$/src/main/resources/hibernate.cfg.xml">
672   - <provider selected="true" editor-type-id="text-editor">
673   - <state relative-caret-position="256">
674   - <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
675   - <folding />
676   - </state>
677   - </provider>
678   - </entry>
679   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalibrationService.java">
680   - <provider selected="true" editor-type-id="text-editor">
681   - <state relative-caret-position="0">
682   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
683   - </state>
684   - </provider>
685   - </entry>
686   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Location.java">
687   - <provider selected="true" editor-type-id="text-editor">
688   - <state relative-caret-position="272">
689   - <caret line="17" column="47" lean-forward="false" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
690   - <folding>
691   - <element signature="imports" expanded="true" />
692   - </folding>
693   - </state>
694   - </provider>
695   - </entry>
696   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java">
697   - <provider selected="true" editor-type-id="text-editor">
698   - <state relative-caret-position="384">
699   - <caret line="128" column="5" lean-forward="false" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
700   - <folding>
701   - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" />
702   - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" />
703   - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" />
704   - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" />
705   - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" />
706   - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" />
707   - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" />
708   - </folding>
709   - </state>
710   - </provider>
711   - </entry>
712   - <entry file="file://$PROJECT_DIR$/src/main/java/ServerApp.java">
713   - <provider selected="true" editor-type-id="text-editor">
714   - <state relative-caret-position="64">
715   - <caret line="6" column="5" lean-forward="false" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
716   - <folding>
717   - <element signature="imports" expanded="true" />
718   - </folding>
719   - </state>
720   - </provider>
721   - </entry>
722   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/ConnectionService.java">
723   - <provider selected="true" editor-type-id="text-editor">
724   - <state relative-caret-position="80">
725   - <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
726   - </state>
727   - </provider>
728   - </entry>
729   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalibrationService.java">
730   - <provider selected="true" editor-type-id="text-editor">
731   - <state relative-caret-position="176">
732   - <caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
733   - </state>
734   - </provider>
735   - </entry>
736   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/PositioningService.java">
737   - <provider selected="true" editor-type-id="text-editor">
738   - <state relative-caret-position="0">
739   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
740   - <folding>
741   - <element signature="imports" expanded="false" />
742   - <element signature="method#getLocation#0;class#PositioningService#0" expanded="false" />
743   - <element signature="method#probability#0;class#PositioningService#0" expanded="false" />
744   - <element signature="method#gauss_probability#0;class#PositioningService#0" expanded="false" />
745   - <element signature="method#gauss#0;class#PositioningService#0" expanded="false" />
746   - <element signature="method#find#0;class#PositioningService#0" expanded="false" />
747   - </folding>
748   - </state>
749   - </provider>
750   - </entry>
751   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java">
752   - <provider selected="true" editor-type-id="text-editor">
753   - <state relative-caret-position="176">
754   - <caret line="20" column="80" lean-forward="false" selection-start-line="20" selection-start-column="80" selection-end-line="20" selection-end-column="80" />
755   - <folding>
756   - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" />
757   - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" />
758   - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" />
759   - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" />
760   - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" />
761   - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" />
762   - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" />
763   - </folding>
764   - </state>
765   - </provider>
766   - </entry>
767   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalibrationService.java">
768   - <provider selected="true" editor-type-id="text-editor">
769   - <state relative-caret-position="224">
770   - <caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
771   - </state>
772   - </provider>
773   - </entry>
774   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/PositioningService.java">
775   - <provider selected="true" editor-type-id="text-editor">
776   - <state relative-caret-position="0">
777   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
778   - <folding>
779   - <element signature="imports" expanded="false" />
780   - <element signature="method#getLocation#0;class#PositioningService#0" expanded="false" />
781   - <element signature="method#probability#0;class#PositioningService#0" expanded="false" />
782   - <element signature="method#gauss_probability#0;class#PositioningService#0" expanded="false" />
783   - <element signature="method#gauss#0;class#PositioningService#0" expanded="false" />
784   - <element signature="method#find#0;class#PositioningService#0" expanded="false" />
785   - </folding>
786   - </state>
787   - </provider>
788   - </entry>
789   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java">
790   - <provider selected="true" editor-type-id="text-editor">
791   - <state relative-caret-position="176">
792   - <caret line="20" column="80" lean-forward="false" selection-start-line="20" selection-start-column="80" selection-end-line="20" selection-end-column="80" />
793   - <folding>
794   - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" />
795   - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" />
796   - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" />
797   - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" />
798   - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" />
799   - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" />
800   - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" />
801   - </folding>
802   - </state>
803   - </provider>
804   - </entry>
805   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalibrationService.java">
806   - <provider selected="true" editor-type-id="text-editor">
807   - <state relative-caret-position="176">
808   - <caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
809   - </state>
810   - </provider>
811   - </entry>
812   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/PositioningService.java">
813   - <provider selected="true" editor-type-id="text-editor">
814   - <state relative-caret-position="160">
815   - <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
816   - <folding>
817   - <element signature="imports" expanded="false" />
818   - <element signature="method#getLocation#0;class#PositioningService#0" expanded="false" />
819   - <element signature="method#probability#0;class#PositioningService#0" expanded="false" />
820   - <element signature="method#gauss_probability#0;class#PositioningService#0" expanded="false" />
821   - <element signature="method#gauss#0;class#PositioningService#0" expanded="false" />
822   - <element signature="method#find#0;class#PositioningService#0" expanded="false" />
823   - </folding>
824   - </state>
825   - </provider>
826   - </entry>
827   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/ConnectionService.java">
828   - <provider selected="true" editor-type-id="text-editor">
829   - <state relative-caret-position="0">
830   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
831   - </state>
832   - </provider>
833   - </entry>
834   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Mape.java">
835   - <provider selected="true" editor-type-id="text-editor">
836   - <state relative-caret-position="224">
837   - <caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
838   - </state>
839   - </provider>
840   - </entry>
841   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Location.java">
842   - <provider selected="true" editor-type-id="text-editor">
843   - <state relative-caret-position="224">
844   - <caret line="14" column="4" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
845   - </state>
846   - </provider>
847   - </entry>
848   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/RssiRecord.java">
849   - <provider selected="true" editor-type-id="text-editor">
850   - <state relative-caret-position="336">
851   - <caret line="21" column="5" lean-forward="false" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
852   - </state>
853   - </provider>
854   - </entry>
855   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/AccessPoint.java">
856   - <provider selected="true" editor-type-id="text-editor">
857   - <state relative-caret-position="208">
858   - <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
859   - </state>
860   - </provider>
861   - </entry>
862   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/HibernateDao.java">
863   - <provider selected="true" editor-type-id="text-editor">
864   - <state relative-caret-position="848">
865   - <caret line="77" column="4" lean-forward="false" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
866   - <folding>
867   - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" />
868   - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" />
869   - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" />
870   - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" />
871   - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" />
872   - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" />
873   - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" />
874   - </folding>
875   - </state>
876   - </provider>
877   - </entry>
878   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalibrationService.java">
879   - <provider selected="true" editor-type-id="text-editor">
880   - <state relative-caret-position="0">
881   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
882   - </state>
883   - </provider>
884   - </entry>
885   - <entry file="file://$PROJECT_DIR$/pom.xml">
886   - <provider selected="true" editor-type-id="text-editor">
887   - <state relative-caret-position="0">
888   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
889   - </state>
890   - </provider>
891   - </entry>
892   - <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.5.6-Final/hibernate-core-3.5.6-Final.jar!/org/hibernate/Transaction.class">
893   - <provider selected="true" editor-type-id="text-editor">
894   - <state relative-caret-position="128">
895   - <caret line="9" column="9" lean-forward="false" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
896   - </state>
897   - </provider>
898   - </entry>
899   - <entry file="file://$PROJECT_DIR$/src/main/resources/hbm/Location.hbm.xml" />
900   - <entry file="file://$PROJECT_DIR$/src/main/resources/hbm/Map.hbm.xml" />
901   - <entry file="file://$PROJECT_DIR$/src/main/resources/hbm/TempRSSI.hbm.xml" />
902   - <entry file="file://$PROJECT_DIR$/src/main/resources/hbm/RSSIRecord.hbm.xml" />
903   - <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.5.6-Final/hibernate-core-3.5.6-Final.jar!/org/hibernate/Session.class">
904   - <provider selected="true" editor-type-id="text-editor">
905   - <state relative-caret-position="141">
906   - <caret line="139" column="10" lean-forward="false" selection-start-line="139" selection-start-column="10" selection-end-line="139" selection-end-column="10" />
907   - </state>
908   - </provider>
909   - </entry>
910   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/ConnectionService.java">
911   - <provider selected="true" editor-type-id="text-editor">
912   - <state relative-caret-position="80">
913   - <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
914   - </state>
915   - </provider>
916   - </entry>
917   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/PositioningService.java">
918   - <provider selected="true" editor-type-id="text-editor">
919   - <state relative-caret-position="233">
920   - <caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
921   - <folding>
922   - <element signature="imports" expanded="false" />
923   - <element signature="method#getLocation#0;class#PositioningService#0" expanded="false" />
924   - <element signature="method#probability#0;class#PositioningService#0" expanded="false" />
925   - <element signature="method#gauss_probability#0;class#PositioningService#0" expanded="false" />
926   - <element signature="method#gauss#0;class#PositioningService#0" expanded="false" />
927   - <element signature="method#find#0;class#PositioningService#0" expanded="false" />
928   - </folding>
929   - </state>
930   - </provider>
931   - </entry>
932   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/service/CalibrationService.java">
933   - <provider selected="true" editor-type-id="text-editor">
934   - <state relative-caret-position="288">
935   - <caret line="20" column="5" lean-forward="false" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
936   - </state>
937   - </provider>
938   - </entry>
939   - <entry file="file://$PROJECT_DIR$/src/main/resources/hbm/AccessPoint.hbm.xml" />
940   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/RssiRecord.java">
941   - <provider selected="true" editor-type-id="text-editor">
942   - <state relative-caret-position="288">
943   - <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
944   - </state>
945   - </provider>
946   - </entry>
947   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/TempRssi.java">
948   - <provider selected="true" editor-type-id="text-editor">
949   - <state relative-caret-position="208">
950   - <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
951   - </state>
952   - </provider>
953   - </entry>
954   - <entry file="jar://$MAVEN_REPOSITORY$/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar!/javax/servlet/http/HttpServlet.class" />
955   - <entry file="file://$PROJECT_DIR$/Server_Servlets/src/WEB-INF/web.xml">
956   - <provider selected="true" editor-type-id="text-editor">
957   - <state relative-caret-position="289">
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" />
959   - <folding />
960   - </state>
961   - </provider>
962   - </entry>
963   - <entry file="file://$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/CalibrationServlet.java">
964   - <provider selected="true" editor-type-id="text-editor">
965   - <state relative-caret-position="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" />
967   - <folding>
968   - <element signature="imports" expanded="false" />
969   - </folding>
970   - </state>
971   - </provider>
972   - </entry>
973   - <entry file="file://$PROJECT_DIR$/Server_Servlets/src/main/java/com/utbm/lo53/PositioningServlet.java">
974   - <provider selected="true" editor-type-id="text-editor">
975   - <state relative-caret-position="136">
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" />
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>
996   - </state>
997   - </provider>
998   - </entry>
999   - <entry file="file://$PROJECT_DIR$/src/main/java/ServerApp.java">
1000   - <provider selected="true" editor-type-id="text-editor">
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" />
1003   - <folding>
1004   - <element signature="imports" expanded="true" />
1005   - </folding>
1006   - </state>
1007   - </provider>
1008   - </entry>
1009   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/dao/DebianDao.java">
1010   - <provider selected="true" editor-type-id="text-editor">
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" />
1013   - <folding />
1014   - </state>
1015   - </provider>
1016   - </entry>
1017   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Mape.java">
1018   - <provider selected="true" editor-type-id="text-editor">
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" />
1021   - <folding>
1022   - <element signature="imports" expanded="true" />
1023   - </folding>
1024   - </state>
1025   - </provider>
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>
1035   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/AccessPoint.java">
1036   - <provider selected="true" editor-type-id="text-editor">
1037   - <state relative-caret-position="221">
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" />
1039   - <folding>
1040   - <element signature="imports" expanded="true" />
1041   - </folding>
1042   - </state>
1043   - </provider>
1044   - </entry>
1045   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/repository/Location.java">
1046   - <provider selected="true" editor-type-id="text-editor">
1047   - <state relative-caret-position="221">
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" />
1049   - <folding>
1050   - <element signature="imports" expanded="true" />
1051   - </folding>
1052   - </state>
1053   - </provider>
1054   - </entry>
1055   - <entry file="file://$PROJECT_DIR$/src/main/java/com/utbm/lo53/utils/HibernateUtil.java">
1056   - <provider selected="true" editor-type-id="text-editor">
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" />
1059   - <folding>
1060   - <element signature="imports" expanded="false" />
1061   - <element signature="e#729#730#0" expanded="false" />
1062   - <element signature="e#766#767#0" expanded="false" />
1063   - </folding>
1064   - </state>
1065   - </provider>
1066   - </entry>
1067   - <entry file="file://$PROJECT_DIR$/pom.xml">
1068   - <provider selected="true" editor-type-id="text-editor">
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" />
1079   - <folding />
1080   - </state>
1081   - </provider>
1082   - </entry>
1083   - </component>
1084   - <component name="masterDetails">
1085   - <states>
1086   - <state key="ArtifactsStructureConfigurable.UI">
1087   - <settings>
1088   - <artifact-editor />
1089   - <splitter-proportions>
1090   - <option name="proportions">
1091   - <list>
1092   - <option value="0.2" />
1093   - </list>
1094   - </option>
1095   - </splitter-proportions>
1096   - </settings>
1097   - </state>
1098   - <state key="FacetStructureConfigurable.UI">
1099   - <settings>
1100   - <last-edited>No facets are configured</last-edited>
1101   - <splitter-proportions>
1102   - <option name="proportions">
1103   - <list>
1104   - <option value="0.2" />
1105   - </list>
1106   - </option>
1107   - </splitter-proportions>
1108   - </settings>
1109   - </state>
1110   - <state key="GlobalLibrariesConfigurable.UI">
1111   - <settings>
1112   - <splitter-proportions>
1113   - <option name="proportions">
1114   - <list>
1115   - <option value="0.2" />
1116   - </list>
1117   - </option>
1118   - </splitter-proportions>
1119   - </settings>
1120   - </state>
1121   - <state key="JdkListConfigurable.UI">
1122   - <settings>
1123   - <last-edited>1.8</last-edited>
1124   - <splitter-proportions>
1125   - <option name="proportions">
1126   - <list>
1127   - <option value="0.2" />
1128   - </list>
1129   - </option>
1130   - </splitter-proportions>
1131   - </settings>
1132   - </state>
1133   - <state key="ModuleStructureConfigurable.UI">
1134   - <settings>
1135   - <last-edited>PositioningServer</last-edited>
1136   - <splitter-proportions>
1137   - <option name="proportions">
1138   - <list>
1139   - <option value="0.2" />
1140   - <option value="0.6" />
1141   - </list>
1142   - </option>
1143   - </splitter-proportions>
1144   - </settings>
1145   - </state>
1146   - <state key="ProjectLibrariesConfigurable.UI">
1147   - <settings>
1148   - <splitter-proportions>
1149   - <option name="proportions">
1150   - <list>
1151   - <option value="0.2" />
1152   - </list>
1153   - </option>
1154   - </splitter-proportions>
1155   - </settings>
1156   - </state>
1157   - </states>
1158   - </component>
1159   -</project>
1160 0 \ No newline at end of file
PositioningServer/PositioningServer.iml deleted
View file @a860c80
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>
30 0 \ No newline at end of file
PositioningServer/Server_Servlets/Server_Servlets.iml deleted
View file @a860c80
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_6">
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   - <excludeFolder url="file://$MODULE_DIR$/target" />
9   - </content>
10   - <orderEntry type="inheritedJdk" />
11   - <orderEntry type="sourceFolder" forTests="false" />
12   - <orderEntry type="library" scope="PROVIDED" name="Maven: javax:javaee-web-api:6.0" level="project" />
13   - </component>
14   -</module>
15 0 \ No newline at end of file
PositioningServer/Server_Servlets/pom.xml deleted
View file @a860c80
1   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2   - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3   - <modelVersion>4.0.0</modelVersion>
4   -
5   - <groupId>com.utbm.lo53</groupId>
6   - <artifactId>Server_Servlet</artifactId>
7   - <version>1.0-SNAPSHOT</version>
8   - <packaging>war</packaging>
9   -
10   - <name>Server_Servlet</name>
11   -
12   - <properties>
13   - <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
14   - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15   - </properties>
16   -
17   - <dependencies>
18   - <dependency>
19   - <groupId>javax</groupId>
20   - <artifactId>javaee-web-api</artifactId>
21   - <version>6.0</version>
22   - <scope>provided</scope>
23   - </dependency>
24   - </dependencies>
25   -
26   - <build>
27   - <plugins>
28   - <plugin>
29   - <groupId>org.apache.maven.plugins</groupId>
30   - <artifactId>maven-compiler-plugin</artifactId>
31   - <version>2.3.2</version>
32   - <configuration>
33   - <source>1.6</source>
34   - <target>1.6</target>
35   - <compilerArguments>
36   - <endorseddirs>${endorsed.dir}</endorseddirs>
37   - </compilerArguments>
38   - </configuration>
39   - </plugin>
40   - <plugin>
41   - <groupId>org.apache.maven.plugins</groupId>
42   - <artifactId>maven-war-plugin</artifactId>
43   - <version>2.1.1</version>
44   - <configuration>
45   - <failOnMissingWebXml>false</failOnMissingWebXml>
46   - </configuration>
47   - </plugin>
48   - <plugin>
49   - <groupId>org.apache.maven.plugins</groupId>
50   - <artifactId>maven-dependency-plugin</artifactId>
51   - <version>2.1</version>
52   - <executions>
53   - <execution>
54   - <phase>validate</phase>
55   - <goals>
56   - <goal>copy</goal>
57   - </goals>
58   - <configuration>
59   - <outputDirectory>${endorsed.dir}</outputDirectory>
60   - <silent>true</silent>
61   - <artifactItems>
62   - <artifactItem>
63   - <groupId>javax</groupId>
64   - <artifactId>javaee-endorsed-api</artifactId>
65   - <version>6.0</version>
66   - <type>jar</type>
67   - </artifactItem>
68   - </artifactItems>
69   - </configuration>
70   - </execution>
71   - </executions>
72   - </plugin>
73   - </plugins>
74   - </build>
75   -
76   -</project>
PositioningServer/Server_Servlets/src/WEB-INF/web.xml deleted
View file @a860c80
1   -<servlet>
2   - <servlet-name>calibrationServlet</servlet-name>
3   - <servlet-class>servlets.com.utbm.lo53.CalibrationServlet</servlet-class>
4   -</servlet>
5   -
6   -<servlet-mapping>
7   - <servlet-name>calibrationServlet</servlet-name>
8   - <url-pattern>/calibration</url-pattern>
9   -</servlet-mapping>
10   -
11   -<servlet>
12   - <servlet-name>positioningServlet</servlet-name>
13   - <servlet-class>servlets.PositioningServlet</servlet-class>
14   -</servlet>
15   -
16   -<servlet-mapping>
17   - <servlet-name>positioningServlet</servlet-name>
18   - <url-pattern>/positioning</url-pattern>
19   -</servlet-mapping>
20 0 \ No newline at end of file
PositioningServer/Server_Servlets/src/main/java/com/utbm/lo53/CalibrationServlet.java deleted
View file @a860c80
1   -package com.utbm.lo53;
2   -
3   -import javax.servlet.ServletException;
4   -import javax.servlet.http.HttpServlet;
5   -import javax.servlet.http.HttpServletRequest;
6   -import javax.servlet.http.HttpServletResponse;
7   -import java.io.IOException;
8   -
9   -/**
10   - * Created by Guillaume on 15/05/2017.
11   - */
12   -//TODO à compiler et à placer dans le dossier WEB-INF\Servlets
13   -public class CalibrationServlet extends HttpServlet{
14   - @Override
15   - public void service (final HttpServletRequest servletRequest, final HttpServletResponse servletResponse)
16   - throws ServletException, IOException {
17   - //TODO
18   - }
19   -
20   - @Override
21   - public void doGet(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse)
22   - throws ServletException, IOException {
23   - service(servletRequest, servletResponse);
24   - }
25   -
26   - @Override
27   - public void doPost(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse)
28   - throws ServletException, IOException {
29   - service(servletRequest, servletResponse);
30   - }
31   -}
PositioningServer/Server_Servlets/src/main/java/com/utbm/lo53/PositioningServlet.java deleted
View file @a860c80
1   -package com.utbm.lo53;
2   -
3   -import javax.servlet.ServletException;
4   -import javax.servlet.http.HttpServlet;
5   -import javax.servlet.http.HttpServletRequest;
6   -import javax.servlet.http.HttpServletResponse;
7   -import java.io.IOException;
8   -
9   -/**
10   - * Created by Guillaume on 15/05/2017.
11   - */
12   -//TODO à compiler et à placer dans le dossier WEB-INF\Servlets
13   -public class PositioningServlet extends HttpServlet{
14   - @Override
15   - public void service (final HttpServletRequest servletRequest, final HttpServletResponse servletResponse)
16   - throws ServletException, IOException {
17   - //TODO
18   - }
19   -
20   - @Override
21   - public void doGet(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse)
22   - throws ServletException, IOException {
23   - service(servletRequest, servletResponse);
24   - }
25   -
26   - @Override
27   - public void doPost(final HttpServletRequest servletRequest, final HttpServletResponse servletResponse)
28   - throws ServletException, IOException {
29   - service(servletRequest, servletResponse);
30   - }
31   -}
PositioningServer/Server_Servlets/src/main/webapp/index.jsp deleted
View file @a860c80
1   -<%@page contentType="text/html" pageEncoding="UTF-8"%>
2   -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
3   - "http://www.w3.org/TR/html4/loose.dtd">
4   -
5   -<html>
6   - <head>
7   - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8   - <title>JSP Page</title>
9   - </head>
10   - <body>
11   - <h1>Hello World!</h1>
12   - </body>
13   -</html>
PositioningServer/src/main/java/ServerApp.java deleted
View file @a860c80
1   -import com.utbm.lo53.dao.HibernateDao;
2   -import com.utbm.lo53.repository.AccessPoint;
3   -import com.utbm.lo53.repository.Mape;
4   -
5   -/**
6   - * Created by Guillaume on 09/05/2017.
7   - */
8   -public class ServerApp {
9   - public static void main(String args[]){
10   - HibernateDao dao = new HibernateDao();
11   - AccessPoint ap = new AccessPoint();
12   - ap.setMac_addr("aa:aa:aa:aa:aa:aa:aa:aa");
13   - dao.saveAccessPoint(ap);
14   - /*
15   - Mape mape = new Mape();
16   - dao.saveMap(mape);/**/
17   - }
18   -}
PositioningServer/src/main/java/com/utbm/lo53/dao/DebianDao.java deleted
View file @a860c80
1   -package com.utbm.lo53.dao;
2   -
3   -/**
4   - * Created by Guillaume on 09/05/2017.
5   - */
6   -public class DebianDao {
7   -
8   - public String getMacAddr(String ipAddr){return null;}
9   -}
PositioningServer/src/main/java/com/utbm/lo53/dao/HibernateDao.java deleted
View file @a860c80
1   -package com.utbm.lo53.dao;
2   -
3   -import com.utbm.lo53.repository.*;
4   -import com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/repository/AccessPoint.java deleted
View file @a860c80
1   -package com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/repository/Location.java deleted
View file @a860c80
1   -package com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/repository/Mape.java deleted
View file @a860c80
1   -package com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/repository/RssiRecord.java deleted
View file @a860c80
1   -package com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/repository/TempRssi.java deleted
View file @a860c80
1   -package com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/service/CalibrationService.java deleted
View file @a860c80
1   -package com.utbm.lo53.service;
2   -
3   -import com.utbm.lo53.dao.HibernateDao;
4   -import com.utbm.lo53.repository.AccessPoint;
5   -import com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/service/ConnectionService.java deleted
View file @a860c80
1   -package com.utbm.lo53.service;
2   -
3   -/**
4   - * Created by Guillaume on 09/05/2017.
5   - */
6   -public class ConnectionService {
7   -
8   -
9   - public void queryApData(boolean tryAgainMessage){}
10   - public void acknoledge(){}
11   - public void sendPosition(){}
12   -}
PositioningServer/src/main/java/com/utbm/lo53/service/PositioningService.java deleted
View file @a860c80
1   -package com.utbm.lo53.service;
2   -
3   -import com.utbm.lo53.dao.HibernateDao;
4   -import com.utbm.lo53.repository.Location;
5   -import com.utbm.lo53.repository.RssiRecord;
6   -import com.utbm.lo53.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   -}
PositioningServer/src/main/java/com/utbm/lo53/utils/HibernateUtil.java deleted
View file @a860c80
1   -package com.utbm.lo53.utils;
2   -
3   -import org.hibernate.SessionFactory;
4   -import org.hibernate.cfg.AnnotationConfiguration;
5   -import org.hibernate.cfg.Configuration;
6   -
7   -public class HibernateUtil {
8   -
9   - private static final SessionFactory sessionFactory = buildSessionFactory();
10   - private static SessionFactory buildSessionFactory() {
11   - try {
12   - // Create the SessionFactory from hibernate.cfg.xml
13   - return new AnnotationConfiguration().configure().buildSessionFactory();
14   - } catch (Exception ex) {
15   - System.err.println("Initial SessionFactory creation failed." + ex);
16   - throw new ExceptionInInitializerError(ex);
17   - }
18   - }
19   - public static SessionFactory getSessionFactory() {
20   - return sessionFactory;
21   - }
22   -}
23 0 \ No newline at end of file
PositioningServer/src/main/resources/hibernate.cfg.xml deleted
View file @a860c80
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<!DOCTYPE hibernate-configuration SYSTEM
3   - "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
4   -
5   -<hibernate-configuration>
6   - <session-factory>
7   - <property name="connection.driver_class">org.postgresql.Driver</property>
8   - <property name="connection.url">jdbc:postgresql://localhost:5432/LO53_BDD</property>
9   - <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
10   - <property name="connection.username">lo53_user</property>
11   - <property name="connection.password">lo53</property>
12   - <property name="connection.pool_size">1</property>
13   - <property name="hbm2ddl.auto">update</property>
14   -
15   - <mapping class="com.utbm.lo53.repository.AccessPoint"/>
16   - <mapping class="com.utbm.lo53.repository.Location"/>
17   - <mapping class="com.utbm.lo53.repository.Mape"/>
18   - <mapping class="com.utbm.lo53.repository.RssiRecord"/>
19   - <mapping class="com.utbm.lo53.repository.TempRssi"/>
20   - </session-factory>
21   -</hibernate-configuration>
22 0 \ No newline at end of file
PositioningServer/target/classes/ServerApp.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/dao/DebianDao.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/dao/HibernateDao$ITransactionProcess.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/dao/HibernateDao$TransactionCallBack.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/dao/HibernateDao.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/repository/AccessPoint.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/repository/Location.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/repository/Mape.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/repository/RssiRecord.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/repository/TempRssi.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/service/CalibrationService.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/service/ConnectionService.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/service/PositioningService.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/com/utbm/lo53/utils/HibernateUtil.class deleted
View file @a860c80
No preview for this file type
PositioningServer/target/classes/hibernate.cfg.xml deleted
View file @a860c80
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<!DOCTYPE hibernate-configuration SYSTEM
3   - "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
4   -
5   -<hibernate-configuration>
6   - <session-factory>
7   - <property name="connection.driver_class">org.postgresql.Driver</property>
8   - <property name="connection.url">jdbc:postgresql://localhost:5432/LO53_BDD</property>
9   - <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
10   - <property name="connection.username">lo53_user</property>
11   - <property name="connection.password">lo53</property>
12   - <property name="connection.pool_size">1</property>
13   - <property name="hbm2ddl.auto">update</property>
14   -
15   - <mapping class="com.utbm.lo53.repository.AccessPoint"/>
16   - <mapping class="com.utbm.lo53.repository.Location"/>
17   - <mapping class="com.utbm.lo53.repository.Mape"/>
18   - <mapping class="com.utbm.lo53.repository.RssiRecord"/>
19   - <mapping class="com.utbm.lo53.repository.TempRssi"/>
20   - </session-factory>
21   -</hibernate-configuration>
22 0 \ No newline at end of file
PositioningServer/pom.xml renamed to pom.xml
  Show/Hide comments   View file @acb1396
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>PositioningServer</artifactId>
9   - <version>1.0-SNAPSHOT</version>
10   - <build>
11   - <plugins>
12   - <plugin>
13   - <groupId>org.apache.maven.plugins</groupId>
14   - <artifactId>maven-compiler-plugin</artifactId>
15   - <configuration>
16   - <source>1.8</source>
17   - <target>1.8</target>
18   - </configuration>
19   - </plugin>
20   - </plugins>
21   - </build>
22   -
23   - <dependencies>
24   - <!-- https://mvnrepository.com/artifact/postgresql/postgresql -->
25   - <dependency>
26   - <groupId>org.postgresql</groupId>
27   - <artifactId>postgresql</artifactId>
28   - <version>9.4.1212</version>
29   - </dependency>
30   -
31   -
32   - <dependency>
33   - <groupId>org.hibernate</groupId>
34   - <artifactId>hibernate-core</artifactId>
35   - <version>3.5.6-Final</version>
36   - </dependency>
37   -
38   - <!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-annotations -->
39   - <dependency>
40   - <groupId>org.hibernate</groupId>
41   - <artifactId>hibernate-annotations</artifactId>
42   - <version>3.5.6-Final</version>
43   - </dependency>
44   -
45   -
46   - <dependency>
47   - <groupId>org.slf4j</groupId>
48   - <artifactId>slf4j-log4j12</artifactId>
49   - <version>1.5.8</version>
50   - <scope>runtime</scope>
51   - </dependency>
52   -
53   - <dependency>
54   - <groupId>javassist</groupId>
55   - <artifactId>javassist</artifactId>
56   - <version>3.9.0.GA</version>
57   - <scope>runtime</scope>
58   - </dependency>
59   - </dependencies>
60   -</project>
61 1 \ No newline at end of file
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  3 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  4 + <modelVersion>4.0.0</modelVersion>
  5 + <groupId>com.utbm.lo53</groupId>
  6 + <artifactId>positioning_server</artifactId>
  7 + <packaging>war</packaging>
  8 + <version>1.0-SNAPSHOT</version>
  9 + <name>positioning_server Maven Webapp</name>
  10 + <url>http://maven.apache.org</url>
  11 +
  12 +
  13 + <dependencies>
  14 +
  15 + <dependency>
  16 + <groupId>junit</groupId>
  17 + <artifactId>junit</artifactId>
  18 + <version>3.8.1</version>
  19 + <scope>test</scope>
  20 + </dependency>
  21 +
  22 + <dependency>
  23 + <groupId>javax</groupId>
  24 + <artifactId>javaee-web-api</artifactId>
  25 + <version>6.0</version>
  26 + <scope>provided</scope>
  27 + </dependency>
  28 +
  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 + <build>
  66 + <finalName>positioning_server</finalName>
  67 + <plugins>
  68 + <plugin>
  69 + <groupId>org.apache.maven.plugins</groupId>
  70 + <artifactId>maven-compiler-plugin</artifactId>
  71 + <configuration>
  72 + <source>1.8</source>
  73 + <target>1.8</target>
  74 + </configuration>
  75 + </plugin>
  76 + </plugins>
  77 + </build>
  78 +</project>
... ...
project/server_servlet/server_servlet.iml renamed to positioning_server.iml
  Show/Hide comments   View file @acb1396
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  3 + <component name="FacetManager">
  4 + <facet type="web" name="Web">
  5 + <configuration>
  6 + <descriptors>
  7 + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
  8 + </descriptors>
  9 + <webroots>
  10 + <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
  11 + </webroots>
  12 + </configuration>
  13 + </facet>
  14 + <facet type="hibernate" name="Hibernate">
  15 + <configuration>
  16 + <datasource-map />
  17 + <naming-strategy-map />
  18 + <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
  19 + </configuration>
  20 + </facet>
  21 + </component>
3 22 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4 23 <output url="file://$MODULE_DIR$/target/classes" />
5 24 <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 25 <content url="file://$MODULE_DIR$">
7   - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8 26 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9   - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
  27 + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
10 28 <excludeFolder url="file://$MODULE_DIR$/target" />
11 29 </content>
12 30 <orderEntry type="inheritedJdk" />
13 31 <orderEntry type="sourceFolder" forTests="false" />
  32 + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
14 33 <orderEntry type="library" scope="PROVIDED" name="Maven: javax:javaee-web-api:6.0" level="project" />
15   - <orderEntry type="module" module-name="server_core" />
16 34 <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1212" level="project" />
17 35 <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:3.5.6-Final" level="project" />
18 36 <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project" />
... ...
project/.idea/artifacts/servlets.xml deleted
View file @a860c80
1   -<component name="ArtifactManager">
2   - <artifact build-on-make="true" name="servlets">
3   - <output-path>$PROJECT_DIR$/out/artifacts/servlets</output-path>
4   - <root id="root">
5   - <element id="archive" name="servlets.war">
6   - <element id="directory" name="WEB-INF">
7   - <element id="dir-copy" path="$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF" />
8   - <element id="directory" name="classes">
9   - <element id="module-output" name="server_servlet" />
10   - </element>
11   - </element>
12   - </element>
13   - </root>
14   - </artifact>
15   -</component>
16 0 \ No newline at end of file
project/.idea/compiler.xml deleted
View file @a860c80
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>
20 0 \ No newline at end of file
project/.idea/libraries/Maven__antlr_antlr_2_7_6.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__commons_collections_commons_collections_3_1.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__javassist_javassist_3_9_0_GA.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__javax_javaee_web_api_6_0.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__javax_transaction_jta_1_1.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__log4j_log4j_1_2_14.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__org_hibernate_hibernate_annotations_3_5_6_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__org_hibernate_hibernate_core_3_5_6_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1212.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_8.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_8.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml deleted
View file @a860c80
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>
14 0 \ No newline at end of file
project/.idea/modules.xml deleted
View file @a860c80
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>
11 0 \ No newline at end of file
project/.idea/workspace.xml deleted
View file @a860c80
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="CreatePatchCommitExecutor">
17   - <option name="PATCH_PATH" value="" />
18   - </component>
19   - <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
20   - <component name="FileEditorManager">
21   - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
22   - <file leaf-file-name="PositioningServlet.java" pinned="false" current-in-tab="false">
23   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java">
24   - <provider selected="true" editor-type-id="text-editor">
25   - <state relative-caret-position="208">
26   - <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" />
27   - <folding>
28   - <element signature="imports" expanded="true" />
29   - </folding>
30   - </state>
31   - </provider>
32   - </entry>
33   - </file>
34   - <file leaf-file-name="PositioningService.java" pinned="false" current-in-tab="true">
35   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java">
36   - <provider selected="true" editor-type-id="text-editor">
37   - <state relative-caret-position="656">
38   - <caret line="48" column="20" lean-forward="false" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" />
39   - <folding />
40   - </state>
41   - </provider>
42   - </entry>
43   - </file>
44   - <file leaf-file-name="web.xml" pinned="false" current-in-tab="false">
45   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml">
46   - <provider selected="true" editor-type-id="text-editor">
47   - <state relative-caret-position="155">
48   - <caret line="37" column="36" lean-forward="false" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" />
49   - <folding />
50   - </state>
51   - </provider>
52   - </entry>
53   - </file>
54   - <file leaf-file-name="APMeasurementServlet.java" pinned="false" current-in-tab="false">
55   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java">
56   - <provider selected="true" editor-type-id="text-editor">
57   - <state relative-caret-position="320">
58   - <caret line="34" column="41" lean-forward="false" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
59   - <folding>
60   - <element signature="imports" expanded="true" />
61   - </folding>
62   - </state>
63   - </provider>
64   - </entry>
65   - </file>
66   - </leaf>
67   - </component>
68   - <component name="FileTemplateManagerImpl">
69   - <option name="RECENT_TEMPLATES">
70   - <list>
71   - <option value="Class" />
72   - </list>
73   - </option>
74   - </component>
75   - <component name="GradleLocalSettings">
76   - <option name="externalProjectsViewState">
77   - <projects_view />
78   - </option>
79   - </component>
80   - <component name="IdeDocumentHistory">
81   - <option name="CHANGED_PATHS">
82   - <list>
83   - <option value="$PROJECT_DIR$/server_core/pom.xml" />
84   - <option value="$PROJECT_DIR$/pom.xml" />
85   - <option value="$PROJECT_DIR$/server_servlet/pom.xml" />
86   - <option value="$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java" />
87   - <option value="$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java" />
88   - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Mape.java" />
89   - <option value="$PROJECT_DIR$/server_core/src/main/resources/hibernate.cfg.xml" />
90   - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Location.java" />
91   - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java" />
92   - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java" />
93   - <option value="$PROJECT_DIR$/server_core/src/main/java/ServerApp.java" />
94   - <option value="$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java" />
95   - <option value="$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java" />
96   - <option value="$PROJECT_DIR$/server_core/src/main/java/dao/DebianDao.java" />
97   - <option value="$PROJECT_DIR$/server_core/src/main/java/service/MapService.java" />
98   - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Map.java" />
99   - <option value="$PROJECT_DIR$/server_servlet/src/main/java/MapServlet.java" />
100   - <option value="$PROJECT_DIR$/server_servlet/src/main/java/MapByteServlet.java" />
101   - <option value="$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java" />
102   - <option value="$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml" />
103   - <option value="$PROJECT_DIR$/server_core/src/main/java/service/MeasurementService.java" />
104   - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java" />
105   - <option value="$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java" />
106   - <option value="$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java" />
107   - <option value="$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java" />
108   - </list>
109   - </option>
110   - </component>
111   - <component name="MavenImportPreferences">
112   - <option name="importingSettings">
113   - <MavenImportingSettings>
114   - <option name="importAutomatically" value="true" />
115   - </MavenImportingSettings>
116   - </option>
117   - </component>
118   - <component name="ProjectFrameBounds">
119   - <option name="x" value="54" />
120   - <option name="y" value="-8" />
121   - <option name="width" value="1320" />
122   - <option name="height" value="784" />
123   - </component>
124   - <component name="ProjectView">
125   - <navigator currentView="ProjectPane" proportions="" version="1">
126   - <flattenPackages />
127   - <showMembers />
128   - <showModules />
129   - <showLibraryContents />
130   - <hideEmptyPackages />
131   - <abbreviatePackageNames />
132   - <autoscrollToSource />
133   - <autoscrollFromSource />
134   - <sortByType />
135   - <manualOrder />
136   - <foldersAlwaysOnTop value="true" />
137   - </navigator>
138   - <panes>
139   - <pane id="ProjectPane">
140   - <subPane>
141   - <PATH>
142   - <PATH_ELEMENT>
143   - <option name="myItemId" value="project" />
144   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
145   - </PATH_ELEMENT>
146   - <PATH_ELEMENT>
147   - <option name="myItemId" value="project" />
148   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
149   - </PATH_ELEMENT>
150   - </PATH>
151   - <PATH>
152   - <PATH_ELEMENT>
153   - <option name="myItemId" value="project" />
154   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
155   - </PATH_ELEMENT>
156   - <PATH_ELEMENT>
157   - <option name="myItemId" value="project" />
158   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
159   - </PATH_ELEMENT>
160   - <PATH_ELEMENT>
161   - <option name="myItemId" value="server_servlet" />
162   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
163   - </PATH_ELEMENT>
164   - </PATH>
165   - <PATH>
166   - <PATH_ELEMENT>
167   - <option name="myItemId" value="project" />
168   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
169   - </PATH_ELEMENT>
170   - <PATH_ELEMENT>
171   - <option name="myItemId" value="project" />
172   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
173   - </PATH_ELEMENT>
174   - <PATH_ELEMENT>
175   - <option name="myItemId" value="server_servlet" />
176   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
177   - </PATH_ELEMENT>
178   - <PATH_ELEMENT>
179   - <option name="myItemId" value="src" />
180   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
181   - </PATH_ELEMENT>
182   - <PATH_ELEMENT>
183   - <option name="myItemId" value="main" />
184   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
185   - </PATH_ELEMENT>
186   - </PATH>
187   - <PATH>
188   - <PATH_ELEMENT>
189   - <option name="myItemId" value="project" />
190   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
191   - </PATH_ELEMENT>
192   - <PATH_ELEMENT>
193   - <option name="myItemId" value="project" />
194   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
195   - </PATH_ELEMENT>
196   - <PATH_ELEMENT>
197   - <option name="myItemId" value="server_servlet" />
198   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
199   - </PATH_ELEMENT>
200   - <PATH_ELEMENT>
201   - <option name="myItemId" value="src" />
202   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
203   - </PATH_ELEMENT>
204   - <PATH_ELEMENT>
205   - <option name="myItemId" value="main" />
206   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
207   - </PATH_ELEMENT>
208   - <PATH_ELEMENT>
209   - <option name="myItemId" value="java" />
210   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
211   - </PATH_ELEMENT>
212   - </PATH>
213   - <PATH>
214   - <PATH_ELEMENT>
215   - <option name="myItemId" value="project" />
216   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
217   - </PATH_ELEMENT>
218   - <PATH_ELEMENT>
219   - <option name="myItemId" value="project" />
220   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
221   - </PATH_ELEMENT>
222   - <PATH_ELEMENT>
223   - <option name="myItemId" value="server_core" />
224   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
225   - </PATH_ELEMENT>
226   - </PATH>
227   - <PATH>
228   - <PATH_ELEMENT>
229   - <option name="myItemId" value="project" />
230   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
231   - </PATH_ELEMENT>
232   - <PATH_ELEMENT>
233   - <option name="myItemId" value="project" />
234   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
235   - </PATH_ELEMENT>
236   - <PATH_ELEMENT>
237   - <option name="myItemId" value="server_core" />
238   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
239   - </PATH_ELEMENT>
240   - <PATH_ELEMENT>
241   - <option name="myItemId" value="src" />
242   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
243   - </PATH_ELEMENT>
244   - <PATH_ELEMENT>
245   - <option name="myItemId" value="main" />
246   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
247   - </PATH_ELEMENT>
248   - </PATH>
249   - <PATH>
250   - <PATH_ELEMENT>
251   - <option name="myItemId" value="project" />
252   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
253   - </PATH_ELEMENT>
254   - <PATH_ELEMENT>
255   - <option name="myItemId" value="project" />
256   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
257   - </PATH_ELEMENT>
258   - <PATH_ELEMENT>
259   - <option name="myItemId" value="server_core" />
260   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
261   - </PATH_ELEMENT>
262   - <PATH_ELEMENT>
263   - <option name="myItemId" value="src" />
264   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
265   - </PATH_ELEMENT>
266   - <PATH_ELEMENT>
267   - <option name="myItemId" value="main" />
268   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
269   - </PATH_ELEMENT>
270   - <PATH_ELEMENT>
271   - <option name="myItemId" value="java" />
272   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
273   - </PATH_ELEMENT>
274   - </PATH>
275   - <PATH>
276   - <PATH_ELEMENT>
277   - <option name="myItemId" value="project" />
278   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
279   - </PATH_ELEMENT>
280   - <PATH_ELEMENT>
281   - <option name="myItemId" value="project" />
282   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
283   - </PATH_ELEMENT>
284   - <PATH_ELEMENT>
285   - <option name="myItemId" value="server_core" />
286   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
287   - </PATH_ELEMENT>
288   - <PATH_ELEMENT>
289   - <option name="myItemId" value="src" />
290   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
291   - </PATH_ELEMENT>
292   - <PATH_ELEMENT>
293   - <option name="myItemId" value="main" />
294   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
295   - </PATH_ELEMENT>
296   - <PATH_ELEMENT>
297   - <option name="myItemId" value="java" />
298   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
299   - </PATH_ELEMENT>
300   - <PATH_ELEMENT>
301   - <option name="myItemId" value="service" />
302   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
303   - </PATH_ELEMENT>
304   - </PATH>
305   - <PATH>
306   - <PATH_ELEMENT>
307   - <option name="myItemId" value="project" />
308   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
309   - </PATH_ELEMENT>
310   - <PATH_ELEMENT>
311   - <option name="myItemId" value="project" />
312   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
313   - </PATH_ELEMENT>
314   - <PATH_ELEMENT>
315   - <option name="myItemId" value="server_core" />
316   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
317   - </PATH_ELEMENT>
318   - <PATH_ELEMENT>
319   - <option name="myItemId" value="src" />
320   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
321   - </PATH_ELEMENT>
322   - <PATH_ELEMENT>
323   - <option name="myItemId" value="main" />
324   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
325   - </PATH_ELEMENT>
326   - <PATH_ELEMENT>
327   - <option name="myItemId" value="java" />
328   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
329   - </PATH_ELEMENT>
330   - <PATH_ELEMENT>
331   - <option name="myItemId" value="repository" />
332   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
333   - </PATH_ELEMENT>
334   - </PATH>
335   - </subPane>
336   - </pane>
337   - <pane id="Scratches" />
338   - <pane id="Scope" />
339   - <pane id="PackagesPane" />
340   - </panes>
341   - </component>
342   - <component name="PropertiesComponent">
343   - <property name="project.structure.last.edited" value="Artifacts" />
344   - <property name="project.structure.proportion" value="0.15" />
345   - <property name="project.structure.side.proportion" value="0.2" />
346   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../LO54-JEE-MiniProjet" />
347   - </component>
348   - <component name="RunDashboard">
349   - <option name="ruleStates">
350   - <list>
351   - <RuleState>
352   - <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
353   - </RuleState>
354   - <RuleState>
355   - <option name="name" value="StatusDashboardGroupingRule" />
356   - </RuleState>
357   - </list>
358   - </option>
359   - </component>
360   - <component name="RunManager" selected="Application.ServerApp">
361   - <configuration default="false" name="ServerApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
362   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
363   - <option name="MAIN_CLASS_NAME" value="ServerApp" />
364   - <option name="VM_PARAMETERS" />
365   - <option name="PROGRAM_PARAMETERS" />
366   - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
367   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
368   - <option name="ALTERNATIVE_JRE_PATH" />
369   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
370   - <option name="ENV_VARIABLES" />
371   - <option name="PASS_PARENT_ENVS" value="true" />
372   - <module name="server_core" />
373   - <envs />
374   - <method />
375   - </configuration>
376   - <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
377   - <module name="" />
378   - <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
379   - <option name="PROGRAM_PARAMETERS" />
380   - <predefined_log_file id="idea.log" enabled="true" />
381   - <method />
382   - </configuration>
383   - <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
384   - <module name="" />
385   - <option name="DEPLOY" value="true" />
386   - <option name="ARTIFACT_NAME" value="" />
387   - <option name="PM_INSTALL_OPTIONS" value="" />
388   - <option name="ACTIVITY_EXTRA_FLAGS" value="" />
389   - <option name="MODE" value="default_activity" />
390   - <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
391   - <option name="PREFERRED_AVD" value="" />
392   - <option name="CLEAR_LOGCAT" value="false" />
393   - <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
394   - <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
395   - <option name="FORCE_STOP_RUNNING_APP" value="true" />
396   - <option name="DEBUGGER_TYPE" value="Java" />
397   - <option name="USE_LAST_SELECTED_DEVICE" value="false" />
398   - <option name="PREFERRED_AVD" value="" />
399   - <Java />
400   - <Profilers>
401   - <option name="ENABLE_ADVANCED_PROFILING" value="true" />
402   - <option name="GAPID_ENABLED" value="false" />
403   - <option name="GAPID_DISABLE_PCS" value="false" />
404   - <option name="SUPPORT_LIB_ENABLED" value="true" />
405   - <option name="INSTRUMENTATION_ENABLED" value="true" />
406   - </Profilers>
407   - <option name="DEEP_LINK" value="" />
408   - <option name="ACTIVITY_CLASS" value="" />
409   - <method />
410   - </configuration>
411   - <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
412   - <module name="" />
413   - <option name="TESTING_TYPE" value="0" />
414   - <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
415   - <option name="METHOD_NAME" value="" />
416   - <option name="CLASS_NAME" value="" />
417   - <option name="PACKAGE_NAME" value="" />
418   - <option name="EXTRA_OPTIONS" value="" />
419   - <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
420   - <option name="PREFERRED_AVD" value="" />
421   - <option name="CLEAR_LOGCAT" value="false" />
422   - <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
423   - <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
424   - <option name="FORCE_STOP_RUNNING_APP" value="true" />
425   - <option name="DEBUGGER_TYPE" value="Java" />
426   - <option name="USE_LAST_SELECTED_DEVICE" value="false" />
427   - <option name="PREFERRED_AVD" value="" />
428   - <Java />
429   - <Profilers>
430   - <option name="ENABLE_ADVANCED_PROFILING" value="true" />
431   - <option name="GAPID_ENABLED" value="false" />
432   - <option name="GAPID_DISABLE_PCS" value="false" />
433   - <option name="SUPPORT_LIB_ENABLED" value="true" />
434   - <option name="INSTRUMENTATION_ENABLED" value="true" />
435   - </Profilers>
436   - <method />
437   - </configuration>
438   - <configuration default="true" type="Applet" factoryName="Applet">
439   - <option name="HTML_USED" value="false" />
440   - <option name="WIDTH" value="400" />
441   - <option name="HEIGHT" value="300" />
442   - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
443   - <module />
444   - <method />
445   - </configuration>
446   - <configuration default="true" type="Application" factoryName="Application">
447   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
448   - <option name="MAIN_CLASS_NAME" />
449   - <option name="VM_PARAMETERS" />
450   - <option name="PROGRAM_PARAMETERS" />
451   - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
452   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
453   - <option name="ALTERNATIVE_JRE_PATH" />
454   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
455   - <option name="ENV_VARIABLES" />
456   - <option name="PASS_PARENT_ENVS" value="true" />
457   - <module name="" />
458   - <envs />
459   - <method />
460   - </configuration>
461   - <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
462   - <ExternalSystemSettings>
463   - <option name="executionName" />
464   - <option name="externalProjectPath" />
465   - <option name="externalSystemIdString" value="GRADLE" />
466   - <option name="scriptParameters" />
467   - <option name="taskDescriptions">
468   - <list />
469   - </option>
470   - <option name="taskNames">
471   - <list />
472   - </option>
473   - <option name="vmOptions" />
474   - </ExternalSystemSettings>
475   - <method />
476   - </configuration>
477   - <configuration default="true" type="JUnit" factoryName="JUnit">
478   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
479   - <module name="" />
480   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
481   - <option name="ALTERNATIVE_JRE_PATH" />
482   - <option name="PACKAGE_NAME" />
483   - <option name="MAIN_CLASS_NAME" />
484   - <option name="METHOD_NAME" />
485   - <option name="TEST_OBJECT" value="class" />
486   - <option name="VM_PARAMETERS" value="-ea" />
487   - <option name="PARAMETERS" />
488   - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
489   - <option name="ENV_VARIABLES" />
490   - <option name="PASS_PARENT_ENVS" value="true" />
491   - <option name="TEST_SEARCH_SCOPE">
492   - <value defaultName="singleModule" />
493   - </option>
494   - <envs />
495   - <patterns />
496   - <method />
497   - </configuration>
498   - <configuration default="true" type="JarApplication" factoryName="JAR Application">
499   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
500   - <envs />
501   - <method />
502   - </configuration>
503   - <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
504   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
505   - <option name="SCRATCH_FILE_ID" value="0" />
506   - <option name="MAIN_CLASS_NAME" />
507   - <option name="VM_PARAMETERS" />
508   - <option name="PROGRAM_PARAMETERS" />
509   - <option name="WORKING_DIRECTORY" />
510   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
511   - <option name="ALTERNATIVE_JRE_PATH" />
512   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
513   - <option name="ENV_VARIABLES" />
514   - <option name="PASS_PARENT_ENVS" value="true" />
515   - <module name="" />
516   - <envs />
517   - <method />
518   - </configuration>
519   - <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
520   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
521   - <option name="MAIN_CLASS_NAME" />
522   - <option name="VM_PARAMETERS" />
523   - <option name="PROGRAM_PARAMETERS" />
524   - <option name="WORKING_DIRECTORY" />
525   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
526   - <option name="ALTERNATIVE_JRE_PATH" />
527   - <option name="PASS_PARENT_ENVS" value="true" />
528   - <module name="project" />
529   - <envs />
530   - <method />
531   - </configuration>
532   - <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
533   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
534   - <option name="filePath" />
535   - <option name="vmParameters" />
536   - <option name="alternativeJrePath" />
537   - <option name="programParameters" />
538   - <option name="passParentEnvs" value="true" />
539   - <option name="workingDirectory" />
540   - <option name="isAlternativeJrePathEnabled" value="false" />
541   - <envs />
542   - <method />
543   - </configuration>
544   - <configuration default="true" type="Remote" factoryName="Remote">
545   - <option name="USE_SOCKET_TRANSPORT" value="true" />
546   - <option name="SERVER_MODE" value="false" />
547   - <option name="SHMEM_ADDRESS" value="javadebug" />
548   - <option name="HOST" value="localhost" />
549   - <option name="PORT" value="5005" />
550   - <method />
551   - </configuration>
552   - <configuration default="true" type="TestNG" factoryName="TestNG">
553   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
554   - <module name="" />
555   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
556   - <option name="ALTERNATIVE_JRE_PATH" />
557   - <option name="SUITE_NAME" />
558   - <option name="PACKAGE_NAME" />
559   - <option name="MAIN_CLASS_NAME" />
560   - <option name="METHOD_NAME" />
561   - <option name="GROUP_NAME" />
562   - <option name="TEST_OBJECT" value="CLASS" />
563   - <option name="VM_PARAMETERS" value="-ea" />
564   - <option name="PARAMETERS" />
565   - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
566   - <option name="OUTPUT_DIRECTORY" />
567   - <option name="ANNOTATION_TYPE" />
568   - <option name="ENV_VARIABLES" />
569   - <option name="PASS_PARENT_ENVS" value="true" />
570   - <option name="TEST_SEARCH_SCOPE">
571   - <value defaultName="singleModule" />
572   - </option>
573   - <option name="USE_DEFAULT_REPORTERS" value="false" />
574   - <option name="PROPERTIES_FILE" />
575   - <envs />
576   - <properties />
577   - <listeners />
578   - <method />
579   - </configuration>
580   - <list size="1">
581   - <item index="0" class="java.lang.String" itemvalue="Application.ServerApp" />
582   - </list>
583   - <recent_temporary>
584   - <list size="1">
585   - <item index="0" class="java.lang.String" itemvalue="Application.ServerApp" />
586   - </list>
587   - </recent_temporary>
588   - </component>
589   - <component name="ShelveChangesManager" show_recycled="false">
590   - <option name="remove_strategy" value="false" />
591   - </component>
592   - <component name="TaskManager">
593   - <task active="true" id="Default" summary="Default task">
594   - <changelist id="405901ee-1a49-4b2c-aa2f-be7d7103021e" name="Default" comment="" />
595   - <created>1495960020203</created>
596   - <option name="number" value="Default" />
597   - <option name="presentableId" value="Default" />
598   - <updated>1495960020203</updated>
599   - </task>
600   - <servers />
601   - </component>
602   - <component name="TodoView">
603   - <todo-panel id="selected-file">
604   - <is-autoscroll-to-source value="true" />
605   - </todo-panel>
606   - <todo-panel id="all">
607   - <are-packages-shown value="true" />
608   - <is-autoscroll-to-source value="true" />
609   - </todo-panel>
610   - </component>
611   - <component name="ToolWindowManager">
612   - <frame x="54" y="-8" width="1320" height="784" extended-state="6" />
613   - <editor active="true" />
614   - <layout>
615   - <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" />
616   - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18222222" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
617   - <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" />
618   - <window_info id="Palette&#9;" 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" />
619   - <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="2" side_tool="false" content_ui="tabs" />
620   - <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="3" side_tool="false" content_ui="tabs" />
621   - <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="7" side_tool="true" content_ui="tabs" />
622   - <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="3" side_tool="false" content_ui="tabs" />
623   - <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="7" side_tool="false" content_ui="tabs" />
624   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39809927" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
625   - <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="3" side_tool="false" content_ui="tabs" />
626   - <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="7" side_tool="false" content_ui="tabs" />
627   - <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="2" side_tool="false" content_ui="tabs" />
628   - <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="2" side_tool="false" content_ui="tabs" />
629   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33358896" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
630   - <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" />
631   - <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" />
632   - <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" />
633   - <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="3" side_tool="false" content_ui="tabs" />
634   - <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="2" side_tool="true" content_ui="tabs" />
635   - <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" />
636   - <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" />
637   - <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" />
638   - <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" />
639   - <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" />
640   - <window_info id="Application Servers" 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="8" side_tool="false" content_ui="tabs" />
641   - <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" />
642   - <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" />
643   - <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" />
644   - <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" />
645   - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.05185185" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
646   - <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" />
647   - <window_info id="IDEtalk Messages" 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="13" side_tool="false" content_ui="tabs" />
648   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32946146" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
649   - </layout>
650   - </component>
651   - <component name="VcsContentAnnotationSettings">
652   - <option name="myLimit" value="2678400000" />
653   - </component>
654   - <component name="XDebuggerManager">
655   - <breakpoint-manager>
656   - <option name="time" value="2" />
657   - </breakpoint-manager>
658   - <watches-manager />
659   - </component>
660   - <component name="antWorkspaceConfiguration">
661   - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
662   - <option name="FILTER_TARGETS" value="false" />
663   - </component>
664   - <component name="editorHistoryManager">
665   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java">
666   - <provider selected="true" editor-type-id="text-editor">
667   - <state relative-caret-position="208">
668   - <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" />
669   - <folding>
670   - <element signature="imports" expanded="true" />
671   - </folding>
672   - </state>
673   - </provider>
674   - </entry>
675   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java">
676   - <provider selected="true" editor-type-id="text-editor">
677   - <state relative-caret-position="656">
678   - <caret line="48" column="20" lean-forward="false" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" />
679   - <folding />
680   - </state>
681   - </provider>
682   - </entry>
683   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml">
684   - <provider selected="true" editor-type-id="text-editor">
685   - <state relative-caret-position="0">
686   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
687   - <folding />
688   - </state>
689   - </provider>
690   - </entry>
691   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java">
692   - <provider selected="true" editor-type-id="text-editor">
693   - <state relative-caret-position="320">
694   - <caret line="34" column="41" lean-forward="false" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
695   - <folding>
696   - <element signature="imports" expanded="true" />
697   - </folding>
698   - </state>
699   - </provider>
700   - </entry>
701   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java">
702   - <provider selected="true" editor-type-id="text-editor">
703   - <state relative-caret-position="208">
704   - <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
705   - </state>
706   - </provider>
707   - </entry>
708   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java">
709   - <provider selected="true" editor-type-id="text-editor">
710   - <state relative-caret-position="384">
711   - <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
712   - <folding>
713   - <element signature="imports" expanded="true" />
714   - </folding>
715   - </state>
716   - </provider>
717   - </entry>
718   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml">
719   - <provider selected="true" editor-type-id="text-editor">
720   - <state relative-caret-position="0">
721   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
722   - <folding />
723   - </state>
724   - </provider>
725   - </entry>
726   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java">
727   - <provider selected="true" editor-type-id="text-editor">
728   - <state relative-caret-position="112">
729   - <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
730   - <folding>
731   - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" />
732   - <element signature="method#execTransactionProcess#0;class#HibernateDao#0" expanded="false" />
733   - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" />
734   - <element signature="method#internal_saveData#0;class#HibernateDao#0" expanded="false" />
735   - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" />
736   - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" />
737   - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" />
738   - <element signature="method#getAccessPoints#0;class#HibernateDao#0" expanded="false" />
739   - <element signature="method#getLocation#0;class#HibernateDao#0" expanded="false" />
740   - </folding>
741   - </state>
742   - </provider>
743   - </entry>
744   - <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml">
745   - <provider selected="true" editor-type-id="text-editor">
746   - <state relative-caret-position="64">
747   - <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
748   - </state>
749   - </provider>
750   - </entry>
751   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java">
752   - <provider selected="true" editor-type-id="text-editor">
753   - <state relative-caret-position="464">
754   - <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
755   - </state>
756   - </provider>
757   - </entry>
758   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java">
759   - <provider selected="true" editor-type-id="text-editor">
760   - <state relative-caret-position="221">
761   - <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
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="408">
768   - <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
769   - <folding>
770   - <element signature="imports" expanded="true" />
771   - </folding>
772   - </state>
773   - </provider>
774   - </entry>
775   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java">
776   - <provider selected="true" editor-type-id="text-editor">
777   - <state relative-caret-position="119">
778   - <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
779   - <folding>
780   - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" />
781   - <element signature="method#execTransactionProcess#0;class#HibernateDao#0" expanded="false" />
782   - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" />
783   - <element signature="method#internal_saveData#0;class#HibernateDao#0" expanded="false" />
784   - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" />
785   - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" />
786   - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" />
787   - <element signature="method#getAccessPoints#0;class#HibernateDao#0" expanded="false" />
788   - <element signature="method#getLocation#0;class#HibernateDao#0" expanded="false" />
789   - </folding>
790   - </state>
791   - </provider>
792   - </entry>
793   - <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml">
794   - <provider selected="true" editor-type-id="text-editor">
795   - <state relative-caret-position="68">
796   - <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
797   - </state>
798   - </provider>
799   - </entry>
800   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java">
801   - <provider selected="true" editor-type-id="text-editor">
802   - <state relative-caret-position="493">
803   - <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
804   - </state>
805   - </provider>
806   - </entry>
807   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml">
808   - <provider selected="true" editor-type-id="text-editor">
809   - <state relative-caret-position="391">
810   - <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
811   - <folding />
812   - </state>
813   - </provider>
814   - </entry>
815   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java">
816   - <provider selected="true" editor-type-id="text-editor">
817   - <state relative-caret-position="0">
818   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
819   - </state>
820   - </provider>
821   - </entry>
822   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Map.java">
823   - <provider selected="true" editor-type-id="text-editor">
824   - <state relative-caret-position="221">
825   - <caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
826   - </state>
827   - </provider>
828   - </entry>
829   - <entry file="file://$PROJECT_DIR$/server_core/pom.xml">
830   - <provider selected="true" editor-type-id="text-editor">
831   - <state relative-caret-position="170">
832   - <caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
833   - </state>
834   - </provider>
835   - </entry>
836   - <entry file="file://$PROJECT_DIR$/pom.xml">
837   - <provider selected="true" editor-type-id="text-editor">
838   - <state relative-caret-position="760">
839   - <caret line="63" column="19" lean-forward="false" selection-start-line="63" selection-start-column="19" selection-end-line="63" selection-end-column="19" />
840   - <folding />
841   - </state>
842   - </provider>
843   - </entry>
844   - <entry file="file://$PROJECT_DIR$/server_core/src/main/resources/hibernate.cfg.xml">
845   - <provider selected="true" editor-type-id="text-editor">
846   - <state relative-caret-position="340">
847   - <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
848   - </state>
849   - </provider>
850   - </entry>
851   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java">
852   - <provider selected="true" editor-type-id="text-editor">
853   - <state relative-caret-position="306">
854   - <caret line="20" column="1" lean-forward="false" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
855   - </state>
856   - </provider>
857   - </entry>
858   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java">
859   - <provider selected="true" editor-type-id="text-editor">
860   - <state relative-caret-position="187">
861   - <caret line="12" column="15" lean-forward="false" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
862   - </state>
863   - </provider>
864   - </entry>
865   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java">
866   - <provider selected="true" editor-type-id="text-editor">
867   - <state relative-caret-position="391">
868   - <caret line="23" column="28" lean-forward="true" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
869   - </state>
870   - </provider>
871   - </entry>
872   - <entry file="jar://C:/Program Files/Java/jdk1.8.0_66/src.zip!/java/lang/Thread.java">
873   - <provider selected="true" editor-type-id="text-editor">
874   - <state relative-caret-position="215">
875   - <caret line="300" column="30" lean-forward="false" selection-start-line="300" selection-start-column="30" selection-end-line="300" selection-end-column="30" />
876   - </state>
877   - </provider>
878   - </entry>
879   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java">
880   - <provider selected="true" editor-type-id="text-editor">
881   - <state relative-caret-position="480">
882   - <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
883   - </state>
884   - </provider>
885   - </entry>
886   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java">
887   - <provider selected="true" editor-type-id="text-editor">
888   - <state relative-caret-position="288">
889   - <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
890   - </state>
891   - </provider>
892   - </entry>
893   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/DebianDao.java">
894   - <provider selected="true" editor-type-id="text-editor">
895   - <state relative-caret-position="128">
896   - <caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
897   - </state>
898   - </provider>
899   - </entry>
900   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Location.java">
901   - <provider selected="true" editor-type-id="text-editor">
902   - <state relative-caret-position="560">
903   - <caret line="48" column="5" lean-forward="true" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
904   - </state>
905   - </provider>
906   - </entry>
907   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java" />
908   - <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml">
909   - <provider selected="true" editor-type-id="text-editor">
910   - <state relative-caret-position="64">
911   - <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
912   - </state>
913   - </provider>
914   - </entry>
915   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java">
916   - <provider selected="true" editor-type-id="text-editor">
917   - <state relative-caret-position="288">
918   - <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
919   - </state>
920   - </provider>
921   - </entry>
922   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/MapService.java">
923   - <provider selected="true" editor-type-id="text-editor">
924   - <state relative-caret-position="336">
925   - <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
926   - </state>
927   - </provider>
928   - </entry>
929   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Map.java">
930   - <provider selected="true" editor-type-id="text-editor">
931   - <state relative-caret-position="208">
932   - <caret line="27" column="4" lean-forward="true" selection-start-line="27" selection-start-column="4" selection-end-line="27" selection-end-column="4" />
933   - </state>
934   - </provider>
935   - </entry>
936   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/MapScaleServlet.java">
937   - <provider selected="true" editor-type-id="text-editor">
938   - <state relative-caret-position="110">
939   - <caret line="19" column="29" lean-forward="false" selection-start-line="19" selection-start-column="29" selection-end-line="44" selection-end-column="1" />
940   - <folding>
941   - <element signature="imports" expanded="true" />
942   - </folding>
943   - </state>
944   - </provider>
945   - </entry>
946   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/MapByteServlet.java">
947   - <provider selected="true" editor-type-id="text-editor">
948   - <state relative-caret-position="270">
949   - <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
950   - </state>
951   - </provider>
952   - </entry>
953   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java">
954   - <provider selected="true" editor-type-id="text-editor">
955   - <state relative-caret-position="99">
956   - <caret line="27" column="29" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" />
957   - </state>
958   - </provider>
959   - </entry>
960   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/MeasurementService.java">
961   - <provider selected="true" editor-type-id="text-editor">
962   - <state relative-caret-position="368">
963   - <caret line="23" column="60" lean-forward="true" selection-start-line="23" selection-start-column="60" selection-end-line="23" selection-end-column="60" />
964   - </state>
965   - </provider>
966   - </entry>
967   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java">
968   - <provider selected="true" editor-type-id="text-editor">
969   - <state relative-caret-position="144">
970   - <caret line="74" column="32" lean-forward="false" selection-start-line="74" selection-start-column="32" selection-end-line="74" selection-end-column="32" />
971   - <folding>
972   - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" />
973   - <element signature="method#execTransactionProcess#0;class#HibernateDao#0" expanded="false" />
974   - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" />
975   - <element signature="method#internal_saveData#0;class#HibernateDao#0" expanded="false" />
976   - <element signature="e#2375#2376#0" expanded="true" />
977   - <element signature="e#2420#2421#0" expanded="true" />
978   - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" />
979   - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" />
980   - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" />
981   - <element signature="method#getAccessPoints#0;class#HibernateDao#0" expanded="false" />
982   - <element signature="method#getLocation#0;class#HibernateDao#0" expanded="false" />
983   - </folding>
984   - </state>
985   - </provider>
986   - </entry>
987   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java">
988   - <provider selected="true" editor-type-id="text-editor">
989   - <state relative-caret-position="320">
990   - <caret line="34" column="41" lean-forward="false" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
991   - <folding>
992   - <element signature="imports" expanded="true" />
993   - </folding>
994   - </state>
995   - </provider>
996   - </entry>
997   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java">
998   - <provider selected="true" editor-type-id="text-editor">
999   - <state relative-caret-position="208">
1000   - <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" />
1001   - <folding>
1002   - <element signature="imports" expanded="true" />
1003   - </folding>
1004   - </state>
1005   - </provider>
1006   - </entry>
1007   - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml">
1008   - <provider selected="true" editor-type-id="text-editor">
1009   - <state relative-caret-position="155">
1010   - <caret line="37" column="36" lean-forward="false" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" />
1011   - <folding />
1012   - </state>
1013   - </provider>
1014   - </entry>
1015   - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java">
1016   - <provider selected="true" editor-type-id="text-editor">
1017   - <state relative-caret-position="656">
1018   - <caret line="48" column="20" lean-forward="false" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" />
1019   - <folding />
1020   - </state>
1021   - </provider>
1022   - </entry>
1023   - </component>
1024   - <component name="masterDetails">
1025   - <states>
1026   - <state key="ArtifactsStructureConfigurable.UI">
1027   - <settings>
1028   - <artifact-editor>
1029   - <show-content>
1030   - <type id="artifact" />
1031   - <type id="library" />
1032   - </show-content>
1033   - </artifact-editor>
1034   - <last-edited>servlets</last-edited>
1035   - <splitter-proportions>
1036   - <option name="proportions">
1037   - <list>
1038   - <option value="0.2" />
1039   - <option value="0.5" />
1040   - </list>
1041   - </option>
1042   - </splitter-proportions>
1043   - </settings>
1044   - </state>
1045   - <state key="FacetStructureConfigurable.UI">
1046   - <settings>
1047   - <last-edited>No facets are configured</last-edited>
1048   - <splitter-proportions>
1049   - <option name="proportions">
1050   - <list>
1051   - <option value="0.2" />
1052   - </list>
1053   - </option>
1054   - </splitter-proportions>
1055   - </settings>
1056   - </state>
1057   - <state key="GlobalLibrariesConfigurable.UI">
1058   - <settings>
1059   - <splitter-proportions>
1060   - <option name="proportions">
1061   - <list>
1062   - <option value="0.2" />
1063   - </list>
1064   - </option>
1065   - </splitter-proportions>
1066   - </settings>
1067   - </state>
1068   - <state key="JdkListConfigurable.UI">
1069   - <settings>
1070   - <last-edited>1.8</last-edited>
1071   - <splitter-proportions>
1072   - <option name="proportions">
1073   - <list>
1074   - <option value="0.2" />
1075   - </list>
1076   - </option>
1077   - </splitter-proportions>
1078   - </settings>
1079   - </state>
1080   - <state key="ModuleStructureConfigurable.UI">
1081   - <settings>
1082   - <last-edited>server_servlet</last-edited>
1083   - <splitter-proportions>
1084   - <option name="proportions">
1085   - <list>
1086   - <option value="0.2" />
1087   - <option value="0.6" />
1088   - </list>
1089   - </option>
1090   - </splitter-proportions>
1091   - </settings>
1092   - </state>
1093   - <state key="ProjectLibrariesConfigurable.UI">
1094   - <settings>
1095   - <last-edited>Maven: antlr:antlr:2.7.6</last-edited>
1096   - <splitter-proportions>
1097   - <option name="proportions">
1098   - <list>
1099   - <option value="0.2" />
1100   - </list>
1101   - </option>
1102   - </splitter-proportions>
1103   - </settings>
1104   - </state>
1105   - </states>
1106   - </component>
1107   -</project>
1108 0 \ No newline at end of file
project/pom.xml deleted
View file @a860c80
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>
67 0 \ No newline at end of file
project/project.iml deleted
View file @a860c80
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>
30 0 \ No newline at end of file
project/server_core/pom.xml deleted
View file @a860c80
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>
17 0 \ No newline at end of file
project/server_core/server_core.iml deleted
View file @a860c80
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>
30 0 \ No newline at end of file
project/server_servlet/pom.xml deleted
View file @a860c80
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   - <dependency>
23   - <groupId>com.utbm.lo53</groupId>
24   - <artifactId>server_core</artifactId>
25   - <version>1.0-SNAPSHOT</version>
26   - </dependency>
27   - </dependencies>
28   -
29   -</project>
30 0 \ No newline at end of file
project/server_core/src/main/java/ServerApp.java renamed to src/main/java/core/ServerApp.java
  Show/Hide comments   View file @acb1396
1   -import dao.HibernateDao;
2   -import repository.AccessPoint;
3   -import repository.Map;
  1 +import core.dao.HibernateDao;
  2 +import core.repository.AccessPoint;
  3 +import core.repository.Map;
4 4  
5 5 /**
6 6 * Created by Guillaume on 09/05/2017.
... ...
project/server_core/src/main/java/dao/DebianDao.java renamed to src/main/java/core/dao/DebianDao.java
  Show/Hide comments   View file @acb1396
1   -package dao;
  1 +package core.dao;
2 2  
3 3 /**
4 4 * Created by Guillaume on 09/05/2017.
... ...
project/server_core/src/main/java/dao/HibernateDao.java renamed to src/main/java/core/dao/HibernateDao.java
  Show/Hide comments   View file @acb1396
1   -package dao;
  1 +package core.dao;
2 2  
3   -import repository.*;
4   -import utils.HibernateUtil;
  3 +import core.repository.*;
  4 +import core.utils.HibernateUtil;
5 5 import org.hibernate.HibernateException;
6 6 import org.hibernate.Query;
7 7 import org.hibernate.Session;
... ... @@ -9,6 +9,8 @@ import org.hibernate.Session;
9 9 import java.util.ArrayList;
10 10 import java.util.List;
11 11  
  12 +
  13 +
12 14 /**
13 15 * Created by Guillaume on 09/05/2017.
14 16 */
... ... @@ -79,13 +81,13 @@ public class HibernateDao {
79 81 return new ArrayList<>();
80 82  
81 83 TransactionCallBack callBack = execTransactionProcess((session)->{
82   - TransactionCallBack reply = new TransactionCallBack<RssiRecord>();
  84 + TransactionCallBack<TempRssi> reply = new TransactionCallBack<TempRssi>();
83 85 Query query = session.createQuery("from TempRssi tr where tr.client_mac_addr = :mac_addr");
84 86 query.setParameter("mac_addr", macAddr);
85 87 List<Object> results = query.list();
86 88 for(Object result : results){
87 89 if(result instanceof TempRssi)
88   - reply.getResults().add(result);
  90 + reply.getResults().add((TempRssi)result);
89 91 }
90 92 return reply;
91 93 });
... ... @@ -184,24 +186,24 @@ public class HibernateDao {
184 186 private boolean status;
185 187 private List<T> results;
186 188  
187   - public TransactionCallBack () {
  189 + TransactionCallBack () {
188 190 status = false;
189 191 results = new ArrayList<T>();
190 192 }
191 193  
192   - public boolean isStatus () {
  194 + boolean isStatus () {
193 195 return status;
194 196 }
195 197  
196   - public void setStatus (final boolean status) {
  198 + void setStatus (final boolean status) {
197 199 this.status = status;
198 200 }
199 201  
200   - public List<T> getResults () {
  202 + List<T> getResults () {
201 203 return results;
202 204 }
203 205  
204   - public void setResults (final List<T> results) {
  206 + void setResults (final List<T> results) {
205 207 this.results = results;
206 208 }
207 209 }
... ...
project/server_core/src/main/java/repository/AccessPoint.java renamed to src/main/java/core/repository/AccessPoint.java
  Show/Hide comments   View file @acb1396
1   -package repository;
  1 +package core.repository;
2 2  
3 3 import java.io.Serializable;
4 4 import javax.persistence.*;
... ...
project/server_core/src/main/java/repository/Location.java renamed to src/main/java/core/repository/Location.java
  Show/Hide comments   View file @acb1396
1   -package repository;
  1 +package core.repository;
2 2  
3 3 import javax.persistence.*;
4 4 import java.io.Serializable;
... ...
project/server_core/src/main/java/repository/Map.java renamed to src/main/java/core/repository/Map.java
  Show/Hide comments   View file @acb1396
1   -package repository;
  1 +package core.repository;
2 2  
3 3 import javax.persistence.*;
4 4 import java.io.Serializable;
... ...
project/server_core/src/main/java/repository/RssiRecord.java renamed to src/main/java/core/repository/RssiRecord.java
  Show/Hide comments   View file @acb1396
1   -package repository;
  1 +package core.repository;
2 2  
3 3 import javax.persistence.*;
4 4 import java.io.Serializable;
... ...
project/server_core/src/main/java/repository/TempRssi.java renamed to src/main/java/core/repository/TempRssi.java
  Show/Hide comments   View file @acb1396
1   -package repository;
  1 +package core.repository;
2 2  
3 3 import javax.persistence.*;
4 4  
... ...
project/server_core/src/main/java/service/CalibrationService.java renamed to src/main/java/core/service/CalibrationService.java
  Show/Hide comments   View file @acb1396
1   -package service;
  1 +package core.service;
2 2  
3   -import dao.HibernateDao;
4   -import repository.AccessPoint;
5   -import repository.Location;
6   -import repository.RssiRecord;
  3 +import core.dao.HibernateDao;
  4 +import core.repository.AccessPoint;
  5 +import core.repository.Location;
  6 +import core.repository.RssiRecord;
7 7  
8 8 import java.util.List;
9 9  
... ...
project/server_core/src/main/java/service/MapService.java renamed to src/main/java/core/service/MapService.java
  Show/Hide comments   View file @acb1396
1   -package service;
  1 +package core.service;
2 2  
3   -import dao.HibernateDao;
4   -import repository.Map;
  3 +import core.dao.HibernateDao;
  4 +import core.repository.Map;
5 5  
6 6 /**
7 7 * Created by Guillaume on 29/05/2017.
... ...
project/server_core/src/main/java/service/MeasurementService.java renamed to src/main/java/core/service/MeasurementService.java
  Show/Hide comments   View file @acb1396
1   -package service;
  1 +package core.service;
2 2  
3   -import dao.HibernateDao;
4   -import repository.AccessPoint;
5   -import repository.TempRssi;
  3 +import core.dao.HibernateDao;
  4 +import core.repository.AccessPoint;
  5 +import core.repository.TempRssi;
6 6  
7 7 import java.util.List;
8 8  
... ...
project/server_core/src/main/java/service/PositioningService.java renamed to src/main/java/core/service/PositioningService.java
  Show/Hide comments   View file @acb1396
1   -package service;
  1 +package core.service;
2 2  
3   -import dao.DebianDao;
4   -import dao.HibernateDao;
5   -import repository.Location;
6   -import repository.RssiRecord;
7   -import repository.TempRssi;
  3 +import core.dao.DebianDao;
  4 +import core.dao.HibernateDao;
  5 +import core.repository.Location;
  6 +import core.repository.RssiRecord;
  7 +import core.repository.TempRssi;
8 8  
9 9 import java.util.ArrayList;
10 10 import java.util.List;
... ...
project/server_core/src/main/java/utils/HibernateUtil.java renamed to src/main/java/core/utils/HibernateUtil.java
  Show/Hide comments   View file @acb1396
1   -package utils;
  1 +package core.utils;
2 2  
3 3 import org.hibernate.SessionFactory;
4 4 import org.hibernate.cfg.AnnotationConfiguration;
... ...
project/server_servlet/src/main/java/APMeasurementServlet.java renamed to src/main/java/servlet/APMeasurementServlet.java
  Show/Hide comments   View file @acb1396
1   -import repository.Location;
2   -import service.MeasurementService;
3   -import service.PositioningService;
  1 +package servlet;
  2 +
  3 +import core.service.MeasurementService;
4 4  
5 5 import javax.servlet.ServletException;
6 6 import javax.servlet.http.HttpServlet;
7 7 import javax.servlet.http.HttpServletRequest;
8 8 import javax.servlet.http.HttpServletResponse;
9 9 import java.io.IOException;
10   -import java.net.DatagramPacket;
11   -import java.net.DatagramSocket;
12   -import java.net.Inet4Address;
13   -import java.net.InetAddress;
14   -
15   -import static java.lang.Thread.sleep;
16 10  
17 11 /**
18 12 * Created by Guillaume on 29/05/2017.
... ...
project/server_servlet/src/main/java/CalibrationServlet.java renamed to src/main/java/servlet/CalibrationServlet.java
  Show/Hide comments   View file @acb1396
1   -import service.CalibrationService;
  1 +package servlet;
  2 +
  3 +import core.service.CalibrationService;
2 4  
3 5 import javax.servlet.ServletException;
4 6 import javax.servlet.http.HttpServlet;
... ...
project/server_servlet/src/main/java/MapByteServlet.java renamed to src/main/java/servlet/MapByteServlet.java
  Show/Hide comments   View file @acb1396
1   -import repository.Map;
2   -import service.MapService;
  1 +package servlet;
  2 +
  3 +import core.repository.Map;
  4 +import core.service.MapService;
3 5  
4 6 import javax.servlet.ServletException;
5 7 import javax.servlet.http.HttpServlet;
... ...
project/server_servlet/src/main/java/MapScaleServlet.java renamed to src/main/java/servlet/MapScaleServlet.java
  Show/Hide comments   View file @acb1396
1   -import repository.Location;
2   -import repository.Map;
3   -import service.MapService;
4   -import service.PositioningService;
  1 +package servlet;
  2 +
  3 +import core.repository.Map;
  4 +import core.service.MapService;
5 5  
6 6 import javax.servlet.ServletException;
7 7 import javax.servlet.http.HttpServlet;
8 8 import javax.servlet.http.HttpServletRequest;
9 9 import javax.servlet.http.HttpServletResponse;
10 10 import java.io.IOException;
11   -import java.net.DatagramPacket;
12   -import java.net.DatagramSocket;
13   -import java.net.InetAddress;
14   -
15   -import static java.lang.Thread.sleep;
16 11  
17 12 /**
18 13 * Created by Guillaume on 29/05/2017.
... ...
project/server_servlet/src/main/java/PositioningServlet.java renamed to src/main/java/servlet/PositioningServlet.java
  Show/Hide comments   View file @acb1396
1   -import repository.Location;
2   -import service.PositioningService;
  1 +package servlet;
  2 +
  3 +import core.repository.Location;
  4 +import core.service.PositioningService;
3 5  
4 6 import javax.servlet.ServletException;
5 7 import javax.servlet.http.HttpServlet;
... ...
project/server_core/src/main/resources/hibernate.cfg.xml renamed to src/main/resources/hibernate.cfg.xml
  Show/Hide comments   View file @acb1396
... ... @@ -12,10 +12,10 @@
12 12 <property name="connection.pool_size">1</property>
13 13 <property name="hibernate.hbm2ddl.auto">create</property>
14 14  
15   - <mapping class="repository.AccessPoint"/>
16   - <mapping class="repository.Location"/>
17   - <mapping class="repository.Map"/>
18   - <mapping class="repository.RssiRecord"/>
19   - <mapping class="repository.TempRssi"/>
  15 + <mapping class="core.repository.AccessPoint"/>
  16 + <mapping class="core.repository.Location"/>
  17 + <mapping class="core.repository.Map"/>
  18 + <mapping class="core.repository.RssiRecord"/>
  19 + <mapping class="core.repository.TempRssi"/>
20 20 </session-factory>
21 21 </hibernate-configuration>
22 22 \ No newline at end of file
... ...
project/server_servlet/src/main/webapp/META-INF/MANIFEST.MF renamed to src/main/webapp/META-INF/MANIFEST.MF
  Show/Hide comments   View file @acb1396
project/server_servlet/src/main/webapp/WEB-INF/web.xml renamed to src/main/webapp/WEB-INF/web.xml
  Show/Hide comments   View file @acb1396