Михаил лет назад: 7
Родитель
Сommit
06a99a1c89
100 измененных файлов с 19272 добавлено и 0 удалено
  1. 8 0
      .idea/artifacts/AuthModule_war.xml
  2. 70 0
      .idea/artifacts/AuthModule_war_exploded.xml
  3. 8 0
      .idea/artifacts/DBModule_war.xml
  4. 49 0
      .idea/artifacts/DBModule_war_exploded.xml
  5. 8 0
      .idea/artifacts/PCabinModule_war.xml
  6. 69 0
      .idea/artifacts/PCabinModule_war_exploded.xml
  7. 13 0
      .idea/artifacts/PCabinModule_war_exploded2.xml
  8. 8 0
      .idea/artifacts/RegModule_war.xml
  9. 68 0
      .idea/artifacts/RegModule_war_exploded.xml
  10. 21 0
      .idea/compiler.xml
  11. 25 0
      .idea/dataSources.local.xml
  12. 49 0
      .idea/dataSources.xml
  13. 326 0
      .idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml
  14. 2 0
      .idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded/storage.xml
  15. 326 0
      .idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml
  16. 2 0
      .idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781/storage.xml
  17. 13 0
      .idea/libraries/Maven__antlr_antlr_2_7_7.xml
  18. 13 0
      .idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
  19. 13 0
      .idea/libraries/Maven__com_efsavage_jquery_jquery_maven_1_8_2.xml
  20. 13 0
      .idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml
  21. 13 0
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml
  22. 13 0
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_7.xml
  23. 13 0
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_7.xml
  24. 13 0
      .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
  25. 13 0
      .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
  26. 13 0
      .idea/libraries/Maven__javax_el_javax_el_api_3_0_0.xml
  27. 13 0
      .idea/libraries/Maven__javax_enterprise_cdi_api_1_2.xml
  28. 13 0
      .idea/libraries/Maven__javax_inject_javax_inject_1.xml
  29. 13 0
      .idea/libraries/Maven__javax_interceptor_javax_interceptor_api_1_2.xml
  30. 13 0
      .idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
  31. 13 0
      .idea/libraries/Maven__jstl_jstl_1_2.xml
  32. 13 0
      .idea/libraries/Maven__junit_junit_3_8_1.xml
  33. 13 0
      .idea/libraries/Maven__li_rudin_mavenjs_ajax_utils_1_0.xml
  34. 13 0
      .idea/libraries/Maven__log4j_log4j_1_2_14.xml
  35. 13 0
      .idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml
  36. 13 0
      .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_6_6.xml
  37. 13 0
      .idea/libraries/Maven__org_biins_spring_commons_1_0_0.xml
  38. 13 0
      .idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
  39. 13 0
      .idea/libraries/Maven__org_codehaus_jackson_jackson_core_lgpl_1_9_13.xml
  40. 13 0
      .idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml
  41. 13 0
      .idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
  42. 13 0
      .idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_lgpl_1_9_13.xml
  43. 13 0
      .idea/libraries/Maven__org_hibernate_antlr_2_7_5H3.xml
  44. 13 0
      .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml
  45. 13 0
      .idea/libraries/Maven__org_hibernate_hibernate_core_5_2_8_Final.xml
  46. 13 0
      .idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_2_8_Final.xml
  47. 13 0
      .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Draft_16.xml
  48. 13 0
      .idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml
  49. 13 0
      .idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml
  50. 13 0
      .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
  51. 13 0
      .idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_1_Final.xml
  52. 13 0
      .idea/libraries/Maven__org_slf4j_slf4j_api_1_5_6.xml
  53. 13 0
      .idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_6.xml
  54. 13 0
      .idea/libraries/Maven__org_springframework_session_spring_session_1_3_0_RELEASE.xml
  55. 13 0
      .idea/libraries/Maven__org_springframework_spring_aop_4_3_6_RELEASE.xml
  56. 13 0
      .idea/libraries/Maven__org_springframework_spring_beans_4_3_6_RELEASE.xml
  57. 13 0
      .idea/libraries/Maven__org_springframework_spring_context_4_3_6_RELEASE.xml
  58. 13 0
      .idea/libraries/Maven__org_springframework_spring_core_4_3_6_RELEASE.xml
  59. 13 0
      .idea/libraries/Maven__org_springframework_spring_expression_4_3_6_RELEASE.xml
  60. 13 0
      .idea/libraries/Maven__org_springframework_spring_jdbc_4_3_6_RELEASE.xml
  61. 13 0
      .idea/libraries/Maven__org_springframework_spring_tx_4_3_6_RELEASE.xml
  62. 13 0
      .idea/libraries/Maven__org_springframework_spring_web_4_3_6_RELEASE.xml
  63. 13 0
      .idea/libraries/Maven__org_springframework_spring_webmvc_4_3_6_RELEASE.xml
  64. 13 0
      .idea/libraries/Maven__org_springframework_spring_webmvc_portlet_4_3_6_RELEASE.xml
  65. 13 0
      .idea/libraries/Maven__org_springframework_spring_websocket_4_3_6_RELEASE.xml
  66. 13 0
      .idea/libraries/Maven__org_webjars_jquery_3_1_1.xml
  67. 25 0
      .idea/misc.xml
  68. 10 0
      .idea/modules.xml
  69. 124 0
      .idea/uiDesigner.xml
  70. 6 0
      .idea/vcs.xml
  71. 1492 0
      .idea/workspace.xml
  72. 80 0
      AuthModule/AuthModule.iml
  73. 170 0
      AuthModule/pom.xml
  74. 75 0
      AuthModule/src/main/java/Controller/AdminMovController.java
  75. 84 0
      AuthModule/src/main/java/Controller/ClientMovController.java
  76. 185 0
      AuthModule/src/main/java/Controller/LoginController.java
  77. 199 0
      AuthModule/src/main/java/Controller/RegistrationController.java
  78. 40 0
      AuthModule/src/main/java/Controller/StudentMovController.java
  79. 61 0
      AuthModule/src/main/java/ServiceEntites/AddInfEnt.java
  80. 27 0
      AuthModule/src/main/java/ServiceEntites/LoginUser.java
  81. 61 0
      AuthModule/src/main/java/ServiceEntites/RegStudent.java
  82. 48 0
      AuthModule/src/main/java/ServiceEntites/RegUser.java
  83. 16 0
      AuthModule/src/main/java/ServiceEntites/SelectProject.java
  84. 6 0
      AuthModule/src/main/webapp/WEB-INF/applicationContext.xml
  85. 1339 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css
  86. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map
  87. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css
  88. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map
  89. 459 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css
  90. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map
  91. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css
  92. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map
  93. 9320 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css
  94. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map
  95. 6 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css
  96. 1 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map
  97. 187 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css
  98. 3535 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js
  99. 7 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js
  100. 0 0
      AuthModule/src/main/webapp/WEB-INF/dispatcher-servlet.xml

+ 8 - 0
.idea/artifacts/AuthModule_war.xml

@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="AuthModule:war">
+    <output-path>$PROJECT_DIR$/AuthModule/target</output-path>
+    <root id="archive" name="AuthModule.war">
+      <element id="artifact" artifact-name="AuthModule:war exploded" />
+    </root>
+  </artifact>
+</component>

+ 70 - 0
.idea/artifacts/AuthModule_war_exploded.xml

@@ -0,0 +1,70 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="AuthModule:war exploded">
+    <output-path>$PROJECT_DIR$/AuthModule/target/AuthModule</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="AuthModule" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="archive" name="DBModule-1.0.jar">
+            <element id="module-output" name="DBModule" />
+          </element>
+          <element id="library" level="project" name="Maven: org.hibernate:antlr:2.7.5H3" />
+          <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-16" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
+          <element id="library" level="project" name="Maven: org.javassist:javassist:3.20.0-GA" />
+          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" />
+          <element id="library" level="project" name="Maven: org.jboss:jandex:2.0.3.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.3.0" />
+          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.40" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-entitymanager:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.6.6" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.biins:spring-commons:1.0.0" />
+          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" />
+          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
+          <element id="library" level="project" name="Maven: li.rudin.mavenjs:ajax-utils:1.0" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.5.6" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.5.6" />
+          <element id="library" level="project" name="Maven: log4j:log4j:1.2.14" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc-portlet:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-websocket:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: javax.enterprise:cdi-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.el:javax.el-api:3.0.0" />
+          <element id="library" level="project" name="Maven: javax.interceptor:javax.interceptor-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.inject:javax.inject:1" />
+          <element id="library" level="project" name="Maven: org.webjars:jquery:3.1.1" />
+          <element id="library" level="project" name="Maven: com.efsavage.jquery:jquery-maven:1.8.2" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.springframework.session:spring-session:1.3.0.RELEASE" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
+          <element id="library" level="project" name="Maven: javax.servlet:javax.servlet-api:3.1.0" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/AuthModule/target/AuthModule/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="AuthModule/web/Web" />
+    </root>
+  </artifact>
+</component>

+ 8 - 0
.idea/artifacts/DBModule_war.xml

@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="DBModule:war">
+    <output-path>$PROJECT_DIR$/DBModule/target</output-path>
+    <root id="archive" name="DBModule.war">
+      <element id="artifact" artifact-name="DBModule:war exploded" />
+    </root>
+  </artifact>
+</component>

+ 49 - 0
.idea/artifacts/DBModule_war_exploded.xml

@@ -0,0 +1,49 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="DBModule:war exploded">
+    <output-path>$PROJECT_DIR$/DBModule/target/DBModule</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="DBModule" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="Maven: org.hibernate:antlr:2.7.5H3" />
+          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
+          <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-16" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
+          <element id="library" level="project" name="Maven: org.javassist:javassist:3.20.0-GA" />
+          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" />
+          <element id="library" level="project" name="Maven: org.jboss:jandex:2.0.3.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.3.0" />
+          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.40" />
+          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-entitymanager:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.6.6" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.5.6" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.5.6" />
+          <element id="library" level="project" name="Maven: log4j:log4j:1.2.14" />
+          <element id="library" level="project" name="Maven: javax.enterprise:cdi-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.el:javax.el-api:3.0.0" />
+          <element id="library" level="project" name="Maven: javax.interceptor:javax.interceptor-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.inject:javax.inject:1" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/DBModule/target/DBModule/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="DBModule/web/Web" />
+    </root>
+  </artifact>
+</component>

+ 8 - 0
.idea/artifacts/PCabinModule_war.xml

@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="PCabinModule:war">
+    <output-path>$PROJECT_DIR$/PCabinModule/target</output-path>
+    <root id="archive" name="PCabinModule.war">
+      <element id="artifact" artifact-name="PCabinModule:war exploded" />
+    </root>
+  </artifact>
+</component>

+ 69 - 0
.idea/artifacts/PCabinModule_war_exploded.xml

@@ -0,0 +1,69 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="PCabinModule:war exploded">
+    <output-path>$PROJECT_DIR$/PCabinModule/target/PCabinModule</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="PCabinModule" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="archive" name="DBModule-1.0.jar">
+            <element id="module-output" name="DBModule" />
+          </element>
+          <element id="library" level="project" name="Maven: org.hibernate:antlr:2.7.5H3" />
+          <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-16" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
+          <element id="library" level="project" name="Maven: org.javassist:javassist:3.20.0-GA" />
+          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" />
+          <element id="library" level="project" name="Maven: org.jboss:jandex:2.0.3.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.3.0" />
+          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.40" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-entitymanager:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.6.6" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.biins:spring-commons:1.0.0" />
+          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" />
+          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
+          <element id="library" level="project" name="Maven: li.rudin.mavenjs:ajax-utils:1.0" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.5.6" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.5.6" />
+          <element id="library" level="project" name="Maven: log4j:log4j:1.2.14" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc-portlet:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-websocket:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: javax.enterprise:cdi-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.el:javax.el-api:3.0.0" />
+          <element id="library" level="project" name="Maven: javax.interceptor:javax.interceptor-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.inject:javax.inject:1" />
+          <element id="library" level="project" name="Maven: org.webjars:jquery:3.1.1" />
+          <element id="library" level="project" name="Maven: com.efsavage.jquery:jquery-maven:1.8.2" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
+          <element id="library" level="project" name="Maven: javax.servlet:javax.servlet-api:3.1.0" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/PCabinModule/target/PCabinModule/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="PCabinModule/web/Web" />
+    </root>
+  </artifact>
+</component>

+ 13 - 0
.idea/artifacts/PCabinModule_war_exploded2.xml

@@ -0,0 +1,13 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="PCabinModule:war exploded2">
+    <output-path>$PROJECT_DIR$/out/artifacts/PCabinModule_war_exploded2</output-path>
+    <root id="root">
+      <element id="javaee-facet-resources" facet="PCabinModule/web/Web" />
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="PCabinModule" />
+        </element>
+      </element>
+    </root>
+  </artifact>
+</component>

+ 8 - 0
.idea/artifacts/RegModule_war.xml

@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="RegModule:war">
+    <output-path>$PROJECT_DIR$/RegModule/target</output-path>
+    <root id="archive" name="RegModule.war">
+      <element id="artifact" artifact-name="RegModule:war exploded" />
+    </root>
+  </artifact>
+</component>

+ 68 - 0
.idea/artifacts/RegModule_war_exploded.xml

@@ -0,0 +1,68 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="RegModule:war exploded">
+    <output-path>$PROJECT_DIR$/RegModule/target/RegModule</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="RegModule" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" />
+          <element id="archive" name="DBModule-1.0.jar">
+            <element id="module-output" name="DBModule" />
+          </element>
+          <element id="library" level="project" name="Maven: org.hibernate:antlr:2.7.5H3" />
+          <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-16" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
+          <element id="library" level="project" name="Maven: org.javassist:javassist:3.20.0-GA" />
+          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" />
+          <element id="library" level="project" name="Maven: org.jboss:jandex:2.0.3.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.3.0" />
+          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.40" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-entitymanager:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.6.6" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.biins:spring-commons:1.0.0" />
+          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" />
+          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
+          <element id="library" level="project" name="Maven: li.rudin.mavenjs:ajax-utils:1.0" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.5.6" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.5.6" />
+          <element id="library" level="project" name="Maven: log4j:log4j:1.2.14" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc-portlet:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-websocket:4.3.6.RELEASE" />
+          <element id="library" level="project" name="Maven: javax.enterprise:cdi-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.el:javax.el-api:3.0.0" />
+          <element id="library" level="project" name="Maven: javax.interceptor:javax.interceptor-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.inject:javax.inject:1" />
+          <element id="library" level="project" name="Maven: org.webjars:jquery:3.1.1" />
+          <element id="library" level="project" name="Maven: com.efsavage.jquery:jquery-maven:1.8.2" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/RegModule/target/RegModule/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="RegModule/web/Web" />
+    </root>
+  </artifact>
+</component>

+ 21 - 0
.idea/compiler.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="AuthModule" />
+        <module name="DBModule" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="AuthModule" target="1.7" />
+      <module name="DBModule" target="1.7" />
+      <module name="mephorce" target="1.7" />
+      <module name="PCabinModule" target="1.7" />
+      <module name="RegModule" target="1.7" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

+ 25 - 0
.idea/dataSources.local.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal">
+    <data-source name="anketa@localhost" uuid="e66f3b80-d157-473d-b64a-69cd88715781">
+      <database-info product="MySQL" version="5.7.17-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
+        <extra-name-characters>#@</extra-name-characters>
+        <identifier-quote-string>`</identifier-quote-string>
+      </database-info>
+      <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
+      <secret-storage>master_key</secret-storage>
+      <user-name>root</user-name>
+      <resolve-scope>anketa:</resolve-scope>
+    </data-source>
+    <data-source name="hibernate.cfg.xml/Hibernate" uuid="92c07869-f0de-4821-ba4d-23dc56e0fded">
+      <database-info product="MySQL" version="5.7.17-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
+        <extra-name-characters>#@</extra-name-characters>
+        <identifier-quote-string>`</identifier-quote-string>
+      </database-info>
+      <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
+      <secret-storage>master_key</secret-storage>
+      <user-name>root</user-name>
+      <resolve-scope>anketa:</resolve-scope>
+    </data-source>
+  </component>
+</project>

+ 49 - 0
.idea/dataSources.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="anketa@localhost" uuid="e66f3b80-d157-473d-b64a-69cd88715781">
+      <driver-ref>mysql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/anketa</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+        <property name="zeroDateTimeBehavior" value="convertToNull" />
+        <property name="tinyInt1isBit" value="false" />
+        <property name="characterEncoding" value="utf8" />
+        <property name="characterSetResults" value="utf8" />
+        <property name="yearIsDateType" value="false" />
+      </driver-properties>
+    </data-source>
+    <data-source source="LOCAL" name="hibernate.cfg.xml/Hibernate" uuid="92c07869-f0de-4821-ba4d-23dc56e0fded">
+      <driver-ref>mysql</driver-ref>
+      <synchronize>true</synchronize>
+      <imported>true</imported>
+      <remarks>$PROJECT_DIR$/AuthModule/src/main/resources/hibernate.cfg.xml</remarks>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/anketa</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+        <property name="zeroDateTimeBehavior" value="convertToNull" />
+        <property name="tinyInt1isBit" value="false" />
+        <property name="characterEncoding" value="utf8" />
+        <property name="characterSetResults" value="utf8" />
+        <property name="yearIsDateType" value="false" />
+      </driver-properties>
+      <libraries>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
+        </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
+        </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
+        </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
+        </library>
+      </libraries>
+    </data-source>
+  </component>
+</project>

+ 326 - 0
.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml

@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataSource name="hibernate.cfg.xml/Hibernate">
+  <database-model serializer="dbm" rdbms="MYSQL" format-version="4.0">
+    <root id="1"/>
+    <schema id="2" parent="1" name="anketa">
+      <Current>1</Current>
+      <Visible>1</Visible>
+    </schema>
+    <schema id="3" parent="1" name="information_schema"/>
+    <schema id="4" parent="1" name="mysql"/>
+    <schema id="5" parent="1" name="performance_schema"/>
+    <schema id="6" parent="1" name="sys"/>
+    <table id="7" parent="2" name="clients"/>
+    <table id="8" parent="2" name="groups"/>
+    <table id="9" parent="2" name="moderators"/>
+    <table id="10" parent="2" name="projects"/>
+    <table id="11" parent="2" name="st_pr"/>
+    <table id="12" parent="2" name="students"/>
+    <table id="13" parent="2" name="users"/>
+    <column id="14" parent="7" name="client_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="15" parent="7" name="cl_family">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="16" parent="7" name="cl_first_name">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="17" parent="7" name="cl_sec_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="18" parent="7" name="cl_password">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="19" parent="7" name="phone_number">
+      <Position>6</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="20" parent="7" name="e_mail">
+      <Position>7</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="21" parent="7" name="company">
+      <Position>8</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="22" parent="7" name="pos">
+      <Position>9</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="23" parent="7" name="hometown">
+      <Position>10</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="24" parent="7" name="birthdate">
+      <Position>11</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="25" parent="7" name="first_in">
+      <Position>12</Position>
+      <DataType>int(5)|0</DataType>
+    </column>
+    <key id="26" parent="7" name="PRIMARY">
+      <ColNames>client_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="27" parent="8" name="group_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="28" parent="8" name="group_name">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="29" parent="8" name="year">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <key id="30" parent="8" name="PRIMARY">
+      <ColNames>group_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="31" parent="9" name="mod_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="32" parent="9" name="mod_family">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="33" parent="9" name="mod_first_name">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="34" parent="9" name="mod_sec_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="35" parent="9" name="mod_password">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="36" parent="9" name="mod_birthdate">
+      <Position>6</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;11.11.2011&apos;</DefaultExpression>
+    </column>
+    <column id="37" parent="9" name="mod_email">
+      <Position>7</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;pochta@mail.ru&apos;</DefaultExpression>
+    </column>
+    <column id="38" parent="9" name="mod_hometown">
+      <Position>8</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;Город&apos;</DefaultExpression>
+    </column>
+    <column id="39" parent="9" name="mod_phone">
+      <Position>9</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;0000000000&apos;</DefaultExpression>
+    </column>
+    <column id="40" parent="9" name="first_in">
+      <Position>10</Position>
+      <DataType>int(5)|0</DataType>
+    </column>
+    <key id="41" parent="9" name="PRIMARY">
+      <ColNames>mod_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="42" parent="10" name="pr_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+      <SequenceIdentity>1</SequenceIdentity>
+    </column>
+    <column id="43" parent="10" name="title">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="44" parent="10" name="description">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="45" parent="10" name="date_of_creation">
+      <Position>4</Position>
+      <DataType>timestamp|0</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
+    </column>
+    <column id="46" parent="10" name="status">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="47" parent="10" name="date_of_ready">
+      <Position>6</Position>
+      <DataType>date|0</DataType>
+    </column>
+    <column id="48" parent="10" name="sum">
+      <Position>7</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="49" parent="10" name="mod_id">
+      <Position>8</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="50" parent="10" name="client_id">
+      <Position>9</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="51" parent="10" name="jsondata">
+      <Position>10</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;[]&apos;</DefaultExpression>
+    </column>
+    <index id="52" parent="10" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <ColNames>client_id</ColNames>
+    </index>
+    <index id="53" parent="10" name="pr_modFK_idx">
+      <ColNames>mod_id</ColNames>
+    </index>
+    <key id="54" parent="10" name="PRIMARY">
+      <ColNames>pr_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <foreign-key id="55" parent="10" name="pr_modFK">
+      <ColNames>mod_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>moderators</RefTableName>
+      <RefColNames>mod_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <foreign-key id="56" parent="10" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <ColNames>client_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>clients</RefTableName>
+      <RefColNames>client_id</RefColNames>
+    </foreign-key>
+    <column id="57" parent="11" name="id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="58" parent="11" name="st_id">
+      <Position>2</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="59" parent="11" name="pr_id">
+      <Position>3</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <index id="60" parent="11" name="prFK_idx">
+      <ColNames>pr_id</ColNames>
+    </index>
+    <index id="61" parent="11" name="stFK_idx">
+      <ColNames>st_id</ColNames>
+    </index>
+    <key id="62" parent="11" name="PRIMARY">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <foreign-key id="63" parent="11" name="stFK">
+      <ColNames>st_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>students</RefTableName>
+      <RefColNames>students_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <foreign-key id="64" parent="11" name="prFK">
+      <ColNames>pr_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>projects</RefTableName>
+      <RefColNames>pr_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <column id="65" parent="12" name="students_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="66" parent="12" name="group_id">
+      <Position>2</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="67" parent="12" name="st_family">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="68" parent="12" name="st_first_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="69" parent="12" name="st_sec_name">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="70" parent="12" name="st_pk_number">
+      <Position>6</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="71" parent="12" name="bithdate">
+      <Position>7</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="72" parent="12" name="phone_number">
+      <Position>8</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="73" parent="12" name="e_mail">
+      <Position>9</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="74" parent="12" name="hometown">
+      <Position>10</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="75" parent="12" name="first_in">
+      <Position>11</Position>
+      <DataType>int(5)|0</DataType>
+    </column>
+    <index id="76" parent="12" name="stud_groupFK_idx">
+      <ColNames>group_id</ColNames>
+    </index>
+    <key id="77" parent="12" name="PRIMARY">
+      <ColNames>students_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <foreign-key id="78" parent="12" name="stud_groupFK">
+      <ColNames>group_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>groups</RefTableName>
+      <RefColNames>group_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <column id="79" parent="13" name="user_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="80" parent="13" name="user_login">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="81" parent="13" name="user_password">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <key id="82" parent="13" name="PRIMARY">
+      <ColNames>user_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+  </database-model>
+</dataSource>

+ 2 - 0
.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded/storage.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<storage-settings staging-layout="plain" base-layout="schema-zip" language="MySQL"/>

+ 326 - 0
.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml

@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataSource name="anketa@localhost">
+  <database-model serializer="dbm" rdbms="MYSQL" format-version="4.0">
+    <root id="1"/>
+    <schema id="2" parent="1" name="anketa">
+      <Current>1</Current>
+      <Visible>1</Visible>
+    </schema>
+    <schema id="3" parent="1" name="information_schema"/>
+    <schema id="4" parent="1" name="mysql"/>
+    <schema id="5" parent="1" name="performance_schema"/>
+    <schema id="6" parent="1" name="sys"/>
+    <table id="7" parent="2" name="clients"/>
+    <table id="8" parent="2" name="groups"/>
+    <table id="9" parent="2" name="moderators"/>
+    <table id="10" parent="2" name="projects"/>
+    <table id="11" parent="2" name="st_pr"/>
+    <table id="12" parent="2" name="students"/>
+    <table id="13" parent="2" name="users"/>
+    <column id="14" parent="7" name="client_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="15" parent="7" name="cl_family">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="16" parent="7" name="cl_first_name">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="17" parent="7" name="cl_sec_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="18" parent="7" name="cl_password">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="19" parent="7" name="phone_number">
+      <Position>6</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="20" parent="7" name="e_mail">
+      <Position>7</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="21" parent="7" name="company">
+      <Position>8</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="22" parent="7" name="pos">
+      <Position>9</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="23" parent="7" name="hometown">
+      <Position>10</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="24" parent="7" name="birthdate">
+      <Position>11</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="25" parent="7" name="first_in">
+      <Position>12</Position>
+      <DataType>int(5)|0</DataType>
+    </column>
+    <key id="26" parent="7" name="PRIMARY">
+      <ColNames>client_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="27" parent="8" name="group_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="28" parent="8" name="group_name">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="29" parent="8" name="year">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <key id="30" parent="8" name="PRIMARY">
+      <ColNames>group_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="31" parent="9" name="mod_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="32" parent="9" name="mod_family">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="33" parent="9" name="mod_first_name">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="34" parent="9" name="mod_sec_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="35" parent="9" name="mod_password">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="36" parent="9" name="mod_birthdate">
+      <Position>6</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;11.11.2011&apos;</DefaultExpression>
+    </column>
+    <column id="37" parent="9" name="mod_email">
+      <Position>7</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;pochta@mail.ru&apos;</DefaultExpression>
+    </column>
+    <column id="38" parent="9" name="mod_hometown">
+      <Position>8</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;Город&apos;</DefaultExpression>
+    </column>
+    <column id="39" parent="9" name="mod_phone">
+      <Position>9</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;0000000000&apos;</DefaultExpression>
+    </column>
+    <column id="40" parent="9" name="first_in">
+      <Position>10</Position>
+      <DataType>int(5)|0</DataType>
+    </column>
+    <key id="41" parent="9" name="PRIMARY">
+      <ColNames>mod_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="42" parent="10" name="pr_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+      <SequenceIdentity>1</SequenceIdentity>
+    </column>
+    <column id="43" parent="10" name="title">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="44" parent="10" name="description">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="45" parent="10" name="date_of_creation">
+      <Position>4</Position>
+      <DataType>timestamp|0</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
+    </column>
+    <column id="46" parent="10" name="status">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="47" parent="10" name="date_of_ready">
+      <Position>6</Position>
+      <DataType>date|0</DataType>
+    </column>
+    <column id="48" parent="10" name="sum">
+      <Position>7</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="49" parent="10" name="mod_id">
+      <Position>8</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="50" parent="10" name="client_id">
+      <Position>9</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="51" parent="10" name="jsondata">
+      <Position>10</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;[]&apos;</DefaultExpression>
+    </column>
+    <index id="52" parent="10" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <ColNames>client_id</ColNames>
+    </index>
+    <index id="53" parent="10" name="pr_modFK_idx">
+      <ColNames>mod_id</ColNames>
+    </index>
+    <key id="54" parent="10" name="PRIMARY">
+      <ColNames>pr_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <foreign-key id="55" parent="10" name="pr_modFK">
+      <ColNames>mod_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>moderators</RefTableName>
+      <RefColNames>mod_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <foreign-key id="56" parent="10" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <ColNames>client_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>clients</RefTableName>
+      <RefColNames>client_id</RefColNames>
+    </foreign-key>
+    <column id="57" parent="11" name="id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="58" parent="11" name="st_id">
+      <Position>2</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="59" parent="11" name="pr_id">
+      <Position>3</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <index id="60" parent="11" name="prFK_idx">
+      <ColNames>pr_id</ColNames>
+    </index>
+    <index id="61" parent="11" name="stFK_idx">
+      <ColNames>st_id</ColNames>
+    </index>
+    <key id="62" parent="11" name="PRIMARY">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <foreign-key id="63" parent="11" name="stFK">
+      <ColNames>st_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>students</RefTableName>
+      <RefColNames>students_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <foreign-key id="64" parent="11" name="prFK">
+      <ColNames>pr_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>projects</RefTableName>
+      <RefColNames>pr_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <column id="65" parent="12" name="students_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="66" parent="12" name="group_id">
+      <Position>2</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="67" parent="12" name="st_family">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="68" parent="12" name="st_first_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="69" parent="12" name="st_sec_name">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="70" parent="12" name="st_pk_number">
+      <Position>6</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="71" parent="12" name="bithdate">
+      <Position>7</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="72" parent="12" name="phone_number">
+      <Position>8</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="73" parent="12" name="e_mail">
+      <Position>9</Position>
+      <DataType>varchar(100)|0</DataType>
+    </column>
+    <column id="74" parent="12" name="hometown">
+      <Position>10</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="75" parent="12" name="first_in">
+      <Position>11</Position>
+      <DataType>int(5)|0</DataType>
+    </column>
+    <index id="76" parent="12" name="stud_groupFK_idx">
+      <ColNames>group_id</ColNames>
+    </index>
+    <key id="77" parent="12" name="PRIMARY">
+      <ColNames>students_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <foreign-key id="78" parent="12" name="stud_groupFK">
+      <ColNames>group_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>groups</RefTableName>
+      <RefColNames>group_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
+    </foreign-key>
+    <column id="79" parent="13" name="user_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="80" parent="13" name="user_login">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="81" parent="13" name="user_password">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <key id="82" parent="13" name="PRIMARY">
+      <ColNames>user_id</ColNames>
+      <Primary>1</Primary>
+    </key>
+  </database-model>
+</dataSource>

+ 2 - 0
.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781/storage.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<storage-settings staging-layout="plain" base-layout="schema-zip" language="MySQL"/>

+ 13 - 0
.idea/libraries/Maven__antlr_antlr_2_7_7.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: antlr:antlr:2.7.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: aopalliance:aopalliance:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_efsavage_jquery_jquery_maven_1_8_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.efsavage.jquery:jquery-maven:1.8.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/efsavage/jquery/jquery-maven/1.8.2/jquery-maven-1.8.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/efsavage/jquery/jquery-maven/1.8.2/jquery-maven-1.8.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/efsavage/jquery/jquery-maven/1.8.2/jquery-maven-1.8.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml:classmate:1.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.0/classmate-1.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.0/classmate-1.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.0/classmate-1.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_7.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_7.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.7/jackson-databind-2.8.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.7/jackson-databind-2.8.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.7/jackson-databind-2.8.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: dom4j:dom4j:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__javax_el_javax_el_api_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.el:javax.el-api:3.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/el/javax.el-api/3.0.0/javax.el-api-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/el/javax.el-api/3.0.0/javax.el-api-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/el/javax.el-api/3.0.0/javax.el-api-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__javax_enterprise_cdi_api_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.enterprise:cdi-api:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/enterprise/cdi-api/1.2/cdi-api-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/enterprise/cdi-api/1.2/cdi-api-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__javax_inject_javax_inject_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.inject:javax.inject:1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__javax_interceptor_javax_interceptor_api_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.interceptor:javax.interceptor-api:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/interceptor/javax.interceptor-api/1.2/javax.interceptor-api-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/interceptor/javax.interceptor-api/1.2/javax.interceptor-api-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/interceptor/javax.interceptor-api/1.2/javax.interceptor-api-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:javax.servlet-api:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__jstl_jstl_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jstl:jstl:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jstl/jstl/1.2/jstl-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jstl/jstl/1.2/jstl-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jstl/jstl/1.2/jstl-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__junit_junit_3_8_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:3.8.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__li_rudin_mavenjs_ajax_utils_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: li.rudin.mavenjs:ajax-utils:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/li/rudin/mavenjs/ajax-utils/1.0/ajax-utils-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/li/rudin/mavenjs/ajax-utils/1.0/ajax-utils-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/li/rudin/mavenjs/ajax-utils/1.0/ajax-utils-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__log4j_log4j_1_2_14.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: log4j:log4j:1.2.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: mysql:mysql-connector-java:5.1.40">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.40/mysql-connector-java-5.1.40.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.40/mysql-connector-java-5.1.40-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.40/mysql-connector-java-5.1.40-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_6_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy:1.6.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.6.6/byte-buddy-1.6.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.6.6/byte-buddy-1.6.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.6.6/byte-buddy-1.6.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_biins_spring_commons_1_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.biins:spring-commons:1.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/biins/spring-commons/1.0.0/spring-commons-1.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/biins/spring-commons/1.0.0/spring-commons-1.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/biins/spring-commons/1.0.0/spring-commons-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_codehaus_jackson_jackson_core_lgpl_1_9_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-lgpl/1.9.13/jackson-core-lgpl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-lgpl/1.9.13/jackson-core-lgpl-1.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-lgpl/1.9.13/jackson-core-lgpl-1.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.9.13/jackson-jaxrs-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.9.13/jackson-jaxrs-1.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.9.13/jackson-jaxrs-1.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_lgpl_1_9_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-lgpl/1.9.13/jackson-mapper-lgpl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-lgpl/1.9.13/jackson-mapper-lgpl-1.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-lgpl/1.9.13/jackson-mapper-lgpl-1.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_hibernate_antlr_2_7_5H3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:antlr:2.7.5H3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/antlr/2.7.5H3/antlr-2.7.5H3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/antlr/2.7.5H3/antlr-2.7.5H3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/antlr/2.7.5H3/antlr-2.7.5H3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_8_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-core:5.2.8.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.8.Final/hibernate-core-5.2.8.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.8.Final/hibernate-core-5.2.8.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.8.Final/hibernate-core-5.2.8.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_2_8_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-entitymanager:5.2.8.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.2.8.Final/hibernate-entitymanager-5.2.8.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.2.8.Final/hibernate-entitymanager-5.2.8.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.2.8.Final/hibernate-entitymanager-5.2.8.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Draft_16.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-16">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Draft-16/hibernate-jpa-2.1-api-1.0.0.Draft-16.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Draft-16/hibernate-jpa-2.1-api-1.0.0.Draft-16-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Draft-16/hibernate-jpa-2.1-api-1.0.0.Draft-16-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.javassist:javassist:3.20.0-GA">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss:jandex:2.0.3.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.0.3.Final/jandex-2.0.3.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.0.3.Final/jandex-2.0.3.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.0.3.Final/jandex-2.0.3.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_1_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.1.Final/jboss-transaction-api_1.2_spec-1.0.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.1.Final/jboss-transaction-api_1.2_spec-1.0.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.1.Final/jboss-transaction-api_1.2_spec-1.0.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.5.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-log4j12:1.5.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_session_spring_session_1_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.session:spring-session:1.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session/1.3.0.RELEASE/spring-session-1.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session/1.3.0.RELEASE/spring-session-1.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session/1.3.0.RELEASE/spring-session-1.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_aop_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.6.RELEASE/spring-aop-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.6.RELEASE/spring-aop-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.6.RELEASE/spring-aop-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_beans_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.6.RELEASE/spring-beans-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.6.RELEASE/spring-beans-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.6.RELEASE/spring-beans-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_context_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.6.RELEASE/spring-context-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.6.RELEASE/spring-context-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.6.RELEASE/spring-context-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_core_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.6.RELEASE/spring-core-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.6.RELEASE/spring-core-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.6.RELEASE/spring-core-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_expression_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-expression:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.6.RELEASE/spring-expression-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.6.RELEASE/spring-expression-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.6.RELEASE/spring-expression-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.6.RELEASE/spring-jdbc-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.6.RELEASE/spring-jdbc-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.6.RELEASE/spring-jdbc-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_tx_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.6.RELEASE/spring-tx-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.6.RELEASE/spring-tx-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.6.RELEASE/spring-tx-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_web_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.6.RELEASE/spring-web-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.6.RELEASE/spring-web-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.6.RELEASE/spring-web-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.6.RELEASE/spring-webmvc-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.6.RELEASE/spring-webmvc-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.6.RELEASE/spring-webmvc-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_webmvc_portlet_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webmvc-portlet:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc-portlet/4.3.6.RELEASE/spring-webmvc-portlet-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc-portlet/4.3.6.RELEASE/spring-webmvc-portlet-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc-portlet/4.3.6.RELEASE/spring-webmvc-portlet-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_websocket_4_3_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-websocket:4.3.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/4.3.6.RELEASE/spring-websocket-4.3.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/4.3.6.RELEASE/spring-websocket-4.3.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/4.3.6.RELEASE/spring-websocket-4.3.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_webjars_jquery_3_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.webjars:jquery:3.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/jquery/3.1.1/jquery-3.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/jquery/3.1.1/jquery-3.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/jquery/3.1.1/jquery-3.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 25 - 0
.idea/misc.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$/AuthModule" />
+    <file type="web" url="file://$PROJECT_DIR$/DBModule" />
+    <file type="web" url="file://$PROJECT_DIR$/PCabinModule" />
+    <file type="web" url="file://$PROJECT_DIR$/RegModule" />
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/PCabinModule/pom.xml" />
+        <option value="$PROJECT_DIR$/RegModule/pom.xml" />
+      </set>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

+ 10 - 0
.idea/modules.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/AuthModule/AuthModule.iml" filepath="$PROJECT_DIR$/AuthModule/AuthModule.iml" />
+      <module fileurl="file://$PROJECT_DIR$/DBModule/DBModule.iml" filepath="$PROJECT_DIR$/DBModule/DBModule.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mephorce.iml" filepath="$PROJECT_DIR$/mephorce.iml" />
+    </modules>
+  </component>
+</project>

+ 124 - 0
.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <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">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <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">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

Разница между файлами не показана из-за своего большого размера
+ 1492 - 0
.idea/workspace.xml


+ 80 - 0
AuthModule/AuthModule.iml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="module" module-name="DBModule" />
+    <orderEntry type="library" name="Maven: org.hibernate:antlr:2.7.5H3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-16" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.2.8.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.40" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:5.2.8.Final" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.6.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.biins:spring-commons:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" level="project" />
+    <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: li.rudin.mavenjs:ajax-utils:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.6" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc-portlet:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.el:javax.el-api:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.interceptor:javax.interceptor-api:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: org.webjars:jquery:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.efsavage.jquery:jquery-maven:1.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.session:spring-session:1.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+  </component>
+</module>

+ 170 - 0
AuthModule/pom.xml

@@ -0,0 +1,170 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>mephorce</artifactId>
+        <groupId>ru.mephorce</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>AuthModule</artifactId>
+    <packaging>war</packaging>
+    <name>AuthModule Maven Webapp</name>
+    <url>http://maven.apache.org</url>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ru.mephorce</groupId>
+            <artifactId>DBModule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.biins</groupId>
+            <artifactId>spring-commons</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>aopalliance</groupId>
+            <artifactId>aopalliance</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.8.7</version>
+        </dependency>
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>li.rudin.mavenjs</groupId>
+            <artifactId>ajax-utils</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc-portlet</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>3.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.efsavage.jquery</groupId>
+            <artifactId>jquery-maven</artifactId>
+            <version>1.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.8.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-lgpl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session</artifactId>
+            <version>1.3.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.8.7</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>AuthModule</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.2.2.v20140723</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>

+ 75 - 0
AuthModule/src/main/java/Controller/AdminMovController.java

@@ -0,0 +1,75 @@
+package Controller;
+
+import HibernateEntities.ModeratorsEntity;
+import ServiceEntites.AddInfEnt;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.SessionAttributes;
+import org.springframework.web.servlet.ModelAndView;
+
+import static DAOImplement.AdminDao.updateAdmin;
+
+/**
+ * Created by kinetik on 05.03.17.
+ */
+@Controller
+@SessionAttributes("Admin")
+public class AdminMovController {
+
+    @RequestMapping(value = "/PCabinAdminControl")
+    public ModelAndView adminInNextViewChecker(@ModelAttribute("Admin") ModeratorsEntity admin) {
+        ModelAndView adminFirstIn = new ModelAndView("inViews/firstInViews/adminFirstIn");
+        adminFirstIn.addObject("Admin", admin);
+        try {
+            if (admin == null) {
+                return new ModelAndView("otherViews/accessDeniedView");
+            }
+            if (admin.getModFirstIn() == null || admin.getModFirstIn() == 0) {
+                admin.setModFirstIn(1);
+                updateAdmin(admin);
+                adminFirstIn.addObject("addInf", new AddInfEnt());
+                return adminFirstIn;
+            }
+            return new ModelAndView("redirect:/PCabinAdmin");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/PCabinAdmin")
+    public ModelAndView adminPersonalCabinetGenerator(@ModelAttribute("Admin") ModeratorsEntity admin) {
+        try {
+            ModelAndView adminPersCabinet = new ModelAndView("inViews/persCabViews/adminPersCab");
+            return adminPersCabinet;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/PAdminChangeInfo")
+    public ModelAndView adminChangeInfoData(@ModelAttribute("Admin") ModeratorsEntity admin) {
+        try {
+            ModelAndView adminChData = new ModelAndView("inViews/persCabViews/adminChangeInfo");
+            adminChData.addObject("addInf", new AddInfEnt());
+            return adminChData;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/addInformAdmin")
+    public ModelAndView updateClientInformation(@ModelAttribute("Admin") ModeratorsEntity admin,
+                                                @ModelAttribute("addInf") AddInfEnt addInf) {
+        try {
+            admin.setModBirthdate(addInf.getBirthdate().trim());
+            admin.setModEmail(addInf.getE_mail().trim());
+            admin.setModHometown(addInf.getHometown().trim());
+            admin.setModPhone(addInf.getPhone_number().trim());
+            updateAdmin(admin);
+            return new ModelAndView("redirect:/PCabinAdmin");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+}

+ 84 - 0
AuthModule/src/main/java/Controller/ClientMovController.java

@@ -0,0 +1,84 @@
+package Controller;
+
+import HibernateEntities.ClientsEntity;
+import HibernateEntities.ProjectsEntity;
+import ServiceEntites.AddInfEnt;
+import ServiceEntites.SelectProject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.enterprise.inject.Model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static DAOImplement.ClientsDao.getClientProject;
+import static DAOImplement.ClientsDao.updateClient;
+
+/**
+ * Created by kinetik on 05.03.17.
+ */
+@Controller
+@SessionAttributes("Client")
+public class ClientMovController {
+
+    @RequestMapping(value = "/PCabinClientControl")
+    public ModelAndView clientInNextViewChecker(@ModelAttribute("Client") ClientsEntity client) {
+        ModelAndView clientFirstIn = new ModelAndView("inViews/firstInViews/clientFirstIn");
+        clientFirstIn.addObject("Client", client);
+        try {
+            if (client == null) {
+                return new ModelAndView("otherViews/accessDeniedView");
+            }
+            if (client.getClFirstIn() == null || client.getClFirstIn() == 0) {
+                client.setClFirstIn(1);
+                updateClient(client);
+                clientFirstIn.addObject("addInf", new AddInfEnt());
+                return clientFirstIn;
+            }
+            return new ModelAndView("redirect:/PCabinClient");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/PCabinClient")
+    public ModelAndView clientPersonalCabinetGenerator(@ModelAttribute("Client") ClientsEntity client) {
+        try {
+            ModelAndView clientPersCabinet = new ModelAndView("inViews/persCabViews/clientPersCab");
+            clientPersCabinet.addObject("projectList", getClientProject(client));
+            return clientPersCabinet;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/PClientChangeInfo")
+    public ModelAndView adminChangeInfoData(@ModelAttribute("Client") ClientsEntity client) {
+        try {
+            ModelAndView clientChData = new ModelAndView("inViews/persCabViews/clientChangeInfo");
+            clientChData.addObject("addInf", new AddInfEnt());
+            return clientChData;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/addInformClient")
+    public ModelAndView updateClientInformation(@ModelAttribute("Client") ClientsEntity client,
+                                                @ModelAttribute("addInf") AddInfEnt addInf) {
+        try {
+            client.setClBirthdate(addInf.getBirthdate().trim());
+            client.setClCompany(addInf.getCompany().trim());
+            client.setClEmail(addInf.getE_mail().trim());
+            client.setClHometown(addInf.getHometown().trim());
+            client.setClPos(addInf.getPosition().trim());
+            client.setClPhone(addInf.getPhone_number().trim());
+            updateClient(client);
+            return new ModelAndView("redirect:/PCabinClient");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+}

+ 185 - 0
AuthModule/src/main/java/Controller/LoginController.java

@@ -0,0 +1,185 @@
+package Controller;
+
+
+import HibernateEntities.*;
+import ServiceEntites.LoginUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import java.util.*;
+
+import static DAOImplement.AdminDao.getAdminList;
+import static DAOImplement.AdminDao.getAdminMap;
+import static DAOImplement.ClientsDao.getClientList;
+import static DAOImplement.ClientsDao.getClientMap;
+import static DAOImplement.GroupDao.getGroupList;
+import static DAOImplement.StudentDao.getStudentsMap;
+import static DAOImplement.StudentDao.loadStudent;
+import static DAOImplement.UsersDao.getUserNameList;
+import static DAOImplement.UsersDao.getUserObjectList;
+
+
+/**
+ * Created by kinetik on 25.02.17.
+ */
+@Controller
+@SessionAttributes("userObject")
+public class LoginController {
+    ModelAndView mvAdmin = new ModelAndView("loginViews/adminBar");
+    ModelAndView mvClient = new ModelAndView("loginViews/ownerBar");
+    ModelAndView mvStudent = new ModelAndView("loginViews/studentBar");
+    ModelAndView mvUsers = new ModelAndView("loginViews/index");
+
+    @RequestMapping(value = {"/", "welcome"}, method = RequestMethod.GET)
+    public ModelAndView main() {
+        try {
+            mvUsers.addObject("userList", getUserNameList());
+            mvUsers.addObject("userJSP", new LoginUser());
+            return mvUsers;
+        } catch (Exception ex){
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+    //Метод осуществляет проверку первого уровня аутентификации. Комментарий про мапу аналогичен след методу - надо подумать+посовещаться
+    @RequestMapping(value = "/check-user")
+    public ModelAndView checkUser(@ModelAttribute("userJSP") LoginUser user) {
+        HashMap<String, UsersEntity> userDict = getUserObjectList();
+        try {
+            if(userDict.get(user.getName()).getUserPassword().equals(user.getPassword())){
+                if(Objects.equals(user.getName(), "модератор")){
+                    ArrayList<String> adminList = getAdminList();
+                    //Нет смысла создавать LoginAdmin - поля те же, что и у заказчика
+                    mvAdmin.addObject("adminLogin", new LoginUser());
+                    mvAdmin.addObject("adminList", adminList);
+                    mvUsers.addObject("message","");
+                    return mvAdmin;
+                } else if(Objects.equals(user.getName(), "заказчик")){
+                    ArrayList<String> clientList = getClientList();
+                    mvClient.addObject("clientLogin", new LoginUser());
+                    mvClient.addObject("clientList", clientList);
+                    mvUsers.addObject("message","");
+                    return mvClient;
+                } else {
+                    mvUsers.addObject("message","");
+                    mvStudent.addObject("studentLogin", new LoginUser());
+                    return mvStudent;
+                }
+            } else {
+                mvUsers.addObject("message","Bad password");
+            }
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+
+        return mvUsers;
+    }
+    @RequestMapping(value = "/checkClient", method = RequestMethod.POST)
+    public ModelAndView checkClient(@ModelAttribute("clientLogin") LoginUser client, RedirectAttributes redir){
+        try {
+            HashMap<String, ClientsEntity> clientAll = getClientMap();
+            if (clientAll.containsKey(client.getName())) {
+                if ((clientAll.get(client.getName()).getClPassword()).equals(client.getPassword().trim())) {
+                    mvClient.addObject("message", "");
+                } else {
+                    mvClient.addObject("message", "Bad password");
+                    return mvClient;
+                }
+            } else {
+                mvClient.addObject("message", "Bad login");
+                return mvClient;
+            }
+            ClientsEntity clientForTrans = clientAll.get(client.getName());
+            redir.addFlashAttribute("Client", clientForTrans);
+            return new ModelAndView("redirect:/PCabinClientControl");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+    @RequestMapping(value = "/checkAdmin", method = RequestMethod.POST)
+    public ModelAndView checkAdmin(@ModelAttribute("adminLogin") LoginUser admin, RedirectAttributes redir){
+        try {
+            HashMap<String, ModeratorsEntity> adminMap = getAdminMap();
+            if (adminMap.containsKey(admin.getName())) {
+                if ((adminMap.get(admin.getName()).getModPassword()).equals(admin.getPassword().trim())) {
+                    mvAdmin.addObject("message", "");
+                } else {
+                    mvAdmin.addObject("message", "Bad password");
+                    return mvAdmin;
+                }
+            } else {
+                mvAdmin.addObject("message", "Bad login");
+                return mvAdmin;
+            }
+            ModeratorsEntity adminForTrans = adminMap.get(admin.getName());
+            redir.addFlashAttribute("Admin", adminForTrans);
+            return new ModelAndView("redirect:/PCabinAdminControl");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+    @RequestMapping(value = "/loadStudents", method = RequestMethod.GET)
+    @ResponseBody
+    public List<StudentsEntity> loadStudents(@RequestParam(value = "groupId", required = true) Integer groupId) throws IllegalStateException {
+        try {
+            List<StudentsEntity> stList = loadStudent(groupId);
+            return stList;
+        } catch (Exception ex) {
+            List<StudentsEntity> stList = new ArrayList<>();
+            StudentsEntity failStudent = new StudentsEntity();
+            failStudent.setStFamily("Ошибка");
+            failStudent.setStFirstName("Ошибка");
+            failStudent.setStSecName("Ошибка");
+            stList.add(failStudent);
+            return stList;
+        }
+    }
+    @RequestMapping(value = "/loadGroups", method = RequestMethod.GET)
+    @ResponseBody
+    public List<GroupsEntity> loadGroups(){
+        try {
+            List<GroupsEntity> groupList = getGroupList();
+            return groupList;
+        } catch (Exception ex){
+            List<GroupsEntity> grList = new ArrayList<>();
+            GroupsEntity failGroup = new GroupsEntity();
+            failGroup.setGroupId(-1);
+            failGroup.setGroupName("Ошибка");
+            grList.add(failGroup);
+            return grList;
+        }
+    }
+    @RequestMapping(value = "/checkStudent", method = RequestMethod.GET)
+    public ModelAndView checkStudent(@ModelAttribute("studentLogin")  LoginUser student, RedirectAttributes redir){
+        try {
+            HashMap<Integer, StudentsEntity> studentAll = getStudentsMap();
+            if (studentAll.containsKey(Integer.parseInt(student.getName()))) {
+                if (studentAll.get(Integer.parseInt(student.getName())).getStPkNumber().equals(student.getPassword().trim())) {
+                    mvStudent.addObject("message", "");
+                } else {
+                    mvStudent.addObject("message", "Неверный пароль");
+                    return mvStudent;
+                }
+            } else {
+                mvStudent.addObject("message", "Неверный логин");
+                return mvStudent;
+            }
+            StudentsEntity studentForRedir = studentAll.get(Integer.parseInt(student.getName()));
+            redir.addFlashAttribute("Student", studentForRedir);
+            return new ModelAndView("redirect:/PCabinStudentControl");
+        } catch (Exception e) {
+            return new ModelAndView("otherViews/errorView");
+        }
+
+    }
+    @RequestMapping(value="/aboutUs")
+    public ModelAndView aboutUs(){
+        return new ModelAndView("otherViews/aboutPage");
+    }
+    @RequestMapping(value="/contacts")
+    public ModelAndView contacts(){
+        return new ModelAndView("otherViews/contactPage");
+    }
+
+}

+ 199 - 0
AuthModule/src/main/java/Controller/RegistrationController.java

@@ -0,0 +1,199 @@
+package Controller;
+
+import HibernateEntities.ClientsEntity;
+import HibernateEntities.GroupsEntity;
+import HibernateEntities.ModeratorsEntity;
+import HibernateEntities.StudentsEntity;
+import ServiceEntites.RegStudent;
+import ServiceEntites.RegUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+
+import static DAOImplement.AdminDao.checkIsAdmin;
+import static DAOImplement.AdminDao.createNewAdmin;
+import static DAOImplement.ClientsDao.checkIsClient;
+import static DAOImplement.ClientsDao.createNewClient;
+import static DAOImplement.GroupDao.getGroupList;
+import static DAOImplement.StudentDao.checkIsStudent;
+import static DAOImplement.StudentDao.createNewStudent;
+
+/**
+ * Created by kinetik on 27.02.17.
+ */
+@Controller
+public class RegistrationController {
+    ModelAndView mvUsers = new ModelAndView("registrationViews/registrationSuccess");
+    ModelAndView mvRegAdmin = new ModelAndView("registrationViews/regAdminPage");
+    ModelAndView mvRegClient = new ModelAndView("registrationViews/regClientPage");
+    ModelAndView mvRegStudent = new ModelAndView("registrationViews/regStudentPage");
+    @RequestMapping(value="/registrate")
+    public ModelAndView registrationUser(){
+        return new ModelAndView("registrationViews/registration");
+    }
+    @RequestMapping(value="/regStudent")
+    public ModelAndView regStudentLink(){
+        try {
+            List<GroupsEntity> groupList = getGroupList();
+            mvRegStudent.addObject("groupList", groupList);
+            mvRegStudent.addObject("student", new RegStudent());
+            return mvRegStudent;
+        }catch (Exception ex) {
+            System.out.println(ex.getStackTrace());
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+    @RequestMapping(value="/regClient")
+    public ModelAndView regClientLink(){
+        mvRegClient.addObject("user", new RegUser());
+        return mvRegClient;
+    }
+    @RequestMapping(value="/regAdmin")
+    public ModelAndView regAdminLink(){
+        mvRegAdmin.addObject("user",new RegUser());
+        return mvRegAdmin;
+    }
+    @RequestMapping(value="/regStudentAction")
+    public ModelAndView regStudentAction(@ModelAttribute("student") RegStudent student){
+        mvRegStudent = new ModelAndView("registrationViews/regStudentPage");
+        boolean errors = false;
+        try {
+            if (student.getThirdName().trim().equals("")) {
+                mvRegStudent.addObject("famMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (student.getFirstName().trim().equals("")) {
+                mvRegStudent.addObject("nameMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (student.getSecondName().trim().equals("")) {
+                mvRegStudent.addObject("secNameMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (student.getPassword().trim().equals("")) {
+                mvRegStudent.addObject("passMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (student.getGroupId().trim().equals("")) {
+                mvRegStudent.addObject("groupMessage", "Выберите группу");
+                errors = true;
+            }
+            if (!student.getPassword().trim().equals(student.getConfPassword().trim())) {
+                mvRegStudent.addObject("confPassMessage", "Пароли должны совпадать");
+                errors = true;
+            }
+            if (errors) {
+                return mvRegStudent;
+            } else {
+                StudentsEntity studentForBase = new StudentsEntity();
+                studentForBase.setStFirstName(student.getFirstName().trim());
+                studentForBase.setStSecName(student.getSecondName().trim());
+                studentForBase.setStFamily(student.getThirdName().trim());
+                studentForBase.setStGroup(Integer.parseInt(student.getGroupId()));
+                studentForBase.setStPkNumber(student.getPassword());
+                if (checkIsStudent(studentForBase)) {
+                    mvRegStudent.addObject("errMessage", "Пользователь с такими данными уже зарегистрирован в системе");
+                    return mvRegStudent;
+                } else {
+                    createNewStudent(studentForBase);
+                    return mvUsers;
+                }
+            }
+        } catch (Exception ex) {
+            ModelAndView errorView = new ModelAndView("otherViews/errorView");
+            errorView.addObject("message", ex.toString());
+            return errorView;
+        }
+    }
+    @RequestMapping(value="/regClientAction")
+    public ModelAndView regClientAction(@ModelAttribute("user") RegUser user){
+        mvRegClient = new ModelAndView("registrationViews/regClientPage");
+        boolean errors = false;
+        try {
+            if (user.getThirdName().trim().equals("")) {
+                mvRegClient.addObject("famMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (user.getFirstName().trim().equals("")) {
+                mvRegClient.addObject("nameMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (user.getSecName().trim().equals("")) {
+                mvRegClient.addObject("secNameMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (user.getPassword().trim().equals("")) {
+                mvRegClient.addObject("passMessage", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (!user.getConfPassword().trim().equals(user.getPassword().trim())) {
+                mvRegClient.addObject("confPassMessage", "Пароли должны совпадать");
+                errors = true;
+            }
+            if (errors) {
+                return mvRegClient;
+            } else {
+                ClientsEntity client = new ClientsEntity();
+                client.setClFamily(user.getThirdName().trim());
+                client.setClFirstName(user.getFirstName().trim());
+                client.setClSecName(user.getSecName().trim());
+                client.setClPassword(user.getPassword().trim());
+                if (checkIsClient(client)) {
+                    mvRegClient.addObject("errMessage", "Пользовтаель с такими данными зарегистрирован в системе");
+                    return mvRegClient;
+                } else {
+                    createNewClient(client);
+                    return mvUsers;
+                }
+            }
+        } catch (Exception ex) {
+            ModelAndView errorView = new ModelAndView("otherViews/errorView");
+            errorView.addObject("message", ex.toString());
+            return errorView;
+        }
+    }
+    @RequestMapping(value="/regAdminAction")
+    public ModelAndView regAdminAction(@ModelAttribute("user") RegUser user){
+        mvRegAdmin = new ModelAndView("registrationViews/regAdminPage");
+        boolean errors = false;
+        if (user.getThirdName().trim().equals("")) {
+            mvRegAdmin.addObject("famMessage", "Это поле обязательно для заполнения");
+            errors = true;
+        }
+        if (user.getFirstName().trim().equals("")) {
+            mvRegAdmin.addObject("nameMessage", "Это поле обязательно для заполнения");
+            errors = true;
+        }
+        if (user.getSecName().trim().equals("")) {
+            mvRegAdmin.addObject("secNameMessage", "Это поле обязательно для заполнения");
+            errors = true;
+        }
+        if (user.getPassword().trim().equals("")) {
+            mvRegAdmin.addObject("passMessage", "Это поле обязательно для заполнения");
+            errors = true;
+        }
+        if (!user.getConfPassword().trim().equals(user.getPassword().trim())) {
+            mvRegAdmin.addObject("confPassMessage", "Пароли должны совпадать");
+            errors = true;
+        }
+        if (errors) {
+            return mvRegAdmin;
+        } else {
+            ModeratorsEntity admin = new ModeratorsEntity();
+            admin.setModFamily(user.getThirdName().trim());
+            admin.setModFirstName(user.getFirstName().trim());
+            admin.setModSecName(user.getSecName().trim());
+            admin.setModPassword(user.getPassword().trim());
+            if (checkIsAdmin(admin)) {
+                mvRegAdmin.addObject("errMessage", "Пользовтаель с такими данными зарегистрирован в системе");
+                return mvRegAdmin;
+            } else {
+                createNewAdmin(admin);
+                return mvUsers;
+            }
+        }
+    }
+}

+ 40 - 0
AuthModule/src/main/java/Controller/StudentMovController.java

@@ -0,0 +1,40 @@
+package Controller;
+
+import HibernateEntities.ModeratorsEntity;
+import HibernateEntities.StudentsEntity;
+import ServiceEntites.AddInfEnt;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.SessionAttributes;
+import org.springframework.web.servlet.ModelAndView;
+
+import static DAOImplement.StudentDao.updateStudent;
+
+/**
+ * Created by kinetik on 06.03.17.
+ */
+@Controller
+@SessionAttributes("Student")
+public class StudentMovController {
+
+    @RequestMapping(value = "/PCabinStudentControl")
+    public ModelAndView studentInNextViewChecker(@ModelAttribute("Student") StudentsEntity student) {
+        ModelAndView studentFirstIn = new ModelAndView("inViews/firstInViews/studentFirstIn");
+        studentFirstIn.addObject("Student", student);
+        try {
+            if (student == null) {
+                return new ModelAndView("otherViews/accessDeniedView");
+            }
+            if (student.getStFirstIn() == null || student.getStFirstIn() == 0) {
+                student.setStFirstIn(1);
+                updateStudent(student);
+                studentFirstIn.addObject("addInf", new AddInfEnt());
+                return studentFirstIn;
+            }
+            return new ModelAndView("redirect:/PCabinStudent");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+}

+ 61 - 0
AuthModule/src/main/java/ServiceEntites/AddInfEnt.java

@@ -0,0 +1,61 @@
+package ServiceEntites;
+
+/**
+ * Created by kinetik on 05.03.17.
+ */
+public class AddInfEnt {
+    private String birthdate;
+    private String hometown;
+    private String e_mail;
+    private String phone_number;
+    private String company;
+    private String position;
+
+    public String getBirthdate() {
+        return birthdate;
+    }
+
+    public void setBirthdate(String birthdate) {
+        this.birthdate = birthdate;
+    }
+
+    public String getHometown() {
+        return hometown;
+    }
+
+    public void setHometown(String hometown) {
+        this.hometown = hometown;
+    }
+
+    public String getE_mail() {
+        return e_mail;
+    }
+
+    public void setE_mail(String e_mail) {
+        this.e_mail = e_mail;
+    }
+
+    public String getPhone_number() {
+        return phone_number;
+    }
+
+    public void setPhone_number(String phone_number) {
+        this.phone_number = phone_number;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+}

+ 27 - 0
AuthModule/src/main/java/ServiceEntites/LoginUser.java

@@ -0,0 +1,27 @@
+package ServiceEntites;
+
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class LoginUser {
+
+    private String name;
+    private String password;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

+ 61 - 0
AuthModule/src/main/java/ServiceEntites/RegStudent.java

@@ -0,0 +1,61 @@
+package ServiceEntites;
+
+/**
+ * Created by kinetik on 05.03.17.
+ */
+public class RegStudent {
+    private String firstName;
+    private String secondName;
+    private String thirdName;
+    private String password;
+    private String confPassword;
+    private String groupId;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getSecondName() {
+        return secondName;
+    }
+
+    public void setSecondName(String secondName) {
+        this.secondName = secondName;
+    }
+
+    public String getThirdName() {
+        return thirdName;
+    }
+
+    public void setThirdName(String thirdName) {
+        this.thirdName = thirdName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getConfPassword() {
+        return confPassword;
+    }
+
+    public void setConfPassword(String confPassword) {
+        this.confPassword = confPassword;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+}

+ 48 - 0
AuthModule/src/main/java/ServiceEntites/RegUser.java

@@ -0,0 +1,48 @@
+package ServiceEntites;
+
+/**
+ * Created by kinetik on 27.02.17.
+ */
+public class RegUser {
+    private String firstName;
+    private String secName;
+    private String thirdName;
+    private String password;
+    private String confPassword;
+
+    public String getFirstName(){
+        return this.firstName;
+    }
+    public String getSecName(){
+        return this.secName;
+    }
+    public String getThirdName(){
+        return this.thirdName;
+    }
+    public String getPassword(){
+        return this.password;
+    }
+    public String getConfPassword(){
+        return this.confPassword;
+    }
+
+    public void setConfPassword(String confPassword) {
+        this.confPassword = confPassword;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setSecName(String secName) {
+        this.secName = secName;
+    }
+
+    public void setThirdName(String thirdName) {
+        this.thirdName = thirdName;
+    }
+}

+ 16 - 0
AuthModule/src/main/java/ServiceEntites/SelectProject.java

@@ -0,0 +1,16 @@
+package ServiceEntites;
+
+/**
+ * Created by kinetik on 06.03.17.
+ */
+public class SelectProject {
+    private int projId;
+
+    public int getProjId() {
+        return projId;
+    }
+
+    public void setProjId(int projId) {
+        this.projId = projId;
+    }
+}

+ 6 - 0
AuthModule/src/main/webapp/WEB-INF/applicationContext.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+</beans>

Разница между файлами не показана из-за своего большого размера
+ 1339 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map


+ 459 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css

@@ -0,0 +1,459 @@
+/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+html {
+  font-family: sans-serif;
+  line-height: 1.15;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+
+body {
+  margin: 0;
+}
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+figcaption,
+figure,
+main {
+  display: block;
+}
+
+figure {
+  margin: 1em 40px;
+}
+
+hr {
+  -webkit-box-sizing: content-box;
+          box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+}
+
+pre {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+a {
+  background-color: transparent;
+  -webkit-text-decoration-skip: objects;
+}
+
+a:active,
+a:hover {
+  outline-width: 0;
+}
+
+abbr[title] {
+  border-bottom: none;
+  text-decoration: underline;
+  text-decoration: underline dotted;
+}
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+dfn {
+  font-style: italic;
+}
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+small {
+  font-size: 80%;
+}
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+audio,
+video {
+  display: inline-block;
+}
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+img {
+  border-style: none;
+}
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: sans-serif;
+  font-size: 100%;
+  line-height: 1.15;
+  margin: 0;
+}
+
+button,
+input {
+  overflow: visible;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+button,
+html [type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+legend {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  color: inherit;
+  display: table;
+  max-width: 100%;
+  padding: 0;
+  white-space: normal;
+}
+
+progress {
+  display: inline-block;
+  vertical-align: baseline;
+}
+
+textarea {
+  overflow: auto;
+}
+
+[type="checkbox"],
+[type="radio"] {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  padding: 0;
+}
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+[type="search"] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  font: inherit;
+}
+
+details,
+menu {
+  display: block;
+}
+
+summary {
+  display: list-item;
+}
+
+canvas {
+  display: inline-block;
+}
+
+template {
+  display: none;
+}
+
+[hidden] {
+  display: none;
+}
+
+html {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+*,
+*::before,
+*::after {
+  -webkit-box-sizing: inherit;
+          box-sizing: inherit;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+html {
+  -ms-overflow-style: scrollbar;
+  -webkit-tap-highlight-color: transparent;
+}
+
+body {
+  font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font-size: 1rem;
+  font-weight: normal;
+  line-height: 1.5;
+  color: #292b2c;
+  background-color: #fff;
+}
+
+[tabindex="-1"]:focus {
+  outline: none !important;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 0;
+  margin-bottom: .5rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-bottom: .5rem;
+  margin-left: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+a {
+  color: #0275d8;
+  text-decoration: none;
+}
+
+a:focus, a:hover {
+  color: #014c8c;
+  text-decoration: underline;
+}
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):not([tabindex]):focus {
+  outline: 0;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img {
+  vertical-align: middle;
+}
+
+[role="button"] {
+  cursor: pointer;
+}
+
+a,
+area,
+button,
+[role="button"],
+input,
+label,
+select,
+summary,
+textarea {
+  -ms-touch-action: manipulation;
+      touch-action: manipulation;
+}
+
+table {
+  border-collapse: collapse;
+  background-color: transparent;
+}
+
+caption {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+  color: #636c72;
+  text-align: left;
+  caption-side: bottom;
+}
+
+th {
+  text-align: left;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: .5rem;
+}
+
+button:focus {
+  outline: 1px dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+}
+
+input,
+button,
+select,
+textarea {
+  line-height: inherit;
+}
+
+input[type="radio"]:disabled,
+input[type="checkbox"]:disabled {
+  cursor: not-allowed;
+}
+
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="month"] {
+  -webkit-appearance: listbox;
+}
+
+textarea {
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: .5rem;
+  font-size: 1.5rem;
+  line-height: inherit;
+}
+
+input[type="search"] {
+  -webkit-appearance: none;
+}
+
+output {
+  display: inline-block;
+}
+
+[hidden] {
+  display: none !important;
+}
+/*# sourceMappingURL=bootstrap-reboot.css.map */

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map


Разница между файлами не показана из-за своего большого размера
+ 9320 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map


Разница между файлами не показана из-за своего большого размера
+ 6 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map


+ 187 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css

@@ -0,0 +1,187 @@
+html {
+    position: relative;
+    min-height: 100%;
+    font-family: 'Roboto', sans-serif;
+}
+body {
+    margin-bottom: 60px;
+}
+
+.cf {
+    width: 50%;
+    margin: 0 auto;
+    text-align: center;
+    font-size: 14px;
+    margin-top: 100px;
+}
+
+.cf h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    margin-bottom: 15px;
+}
+
+.navbar-brand{
+    color: #063971;
+}
+
+.nav-masthead{
+    float: right;
+}
+
+.nav-masthead a{
+    color: #063971;
+}
+
+.footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 25px;
+    background-color: #f5f5f5;
+    text-align: center;
+}
+
+body > .container {
+    padding: 0px 15px 0;
+}
+
+.container .text-muted {
+    margin: 0px 0;
+}
+
+.footer > .container {
+    padding-right: 15px;
+    padding-left: 15px;
+}
+
+.login-block input {
+    width: 100%;
+    height: 42px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin-bottom: 20px;
+    font-size: 14px;
+    padding: 0 20px 0 50px;
+    outline: none;
+    background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+
+.login-block input#password {
+    background: #fff url('http://i.imgur.com/Qf83FTt.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+
+.login-block input:active, .login-block input:focus {
+    border: 1px solid #063971;
+}
+
+.login-block form select {
+    width: 100%;
+    height: 42px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin-bottom: 20px;
+    font-size: 14px;
+    padding: 0 20px 0 50px;
+    outline: none;
+    background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+
+.login-block form select option {
+    align-items: center;
+    color: #111;
+    display: flex;
+    justify-content: space-between;
+    font-size: 1.5em;
+    width: auto;
+}
+
+.login-block button {
+    width: 100%;
+    height: 40px;
+    background: #063971;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #063971;
+    color: #fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 14px;
+    outline: none;
+    cursor: pointer;
+}
+
+.login-block button:hover {
+    background: #063971;
+}
+
+.login-block {
+    width: 400px;
+    padding: 20px;
+    background: #ffffff;
+    border: 1px solid #063971;
+    border-radius: 5px;
+    border-top: 5px solid #063971;
+    margin: 0 auto;
+    margin-top: 100px;
+    margin-bottom: 40px;
+}
+
+.login-block h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    text-transform: uppercase;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+
+.btn-secondary,
+.btn-secondary:hover,
+.btn-secondary:focus {
+    color: #333;
+    text-shadow: none; /* Prevent inheritance from `body` */
+    background-color: #fff;
+    border: .05rem solid #fff;
+}
+
+@media (max-width: 767px) {
+
+    .nav-masthead{
+        float: none;
+    }
+
+    .login-block {
+        width: 100%;
+        padding: 20px;
+        background: #ffffff;
+        border: 1px solid #063971;
+        border-radius: 5px;
+        border-top: 5px solid #063971;
+        margin: 0 auto;
+        margin-top: 100px;
+    }
+    .nav-link{
+        margin-top: 10px;
+    }
+    .login-block form select{
+        width: 100%;
+        height: 42px;
+        box-sizing: border-box;
+        border-radius: 5px;
+        border: 1px solid #ccc;
+        margin-bottom: 20px;
+        font-size: 14px;
+        font-family: 'Roboto', sans-serif;
+        padding: 0 20px 0 50px;
+        outline: none;
+        background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
+        background-size: 16px 80px;
+    }
+}

Разница между файлами не показана из-за своего большого размера
+ 3535 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js


Разница между файлами не показана из-за своего большого размера
+ 7 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js


+ 0 - 0
AuthModule/src/main/webapp/WEB-INF/dispatcher-servlet.xml


Некоторые файлы не были показаны из-за большого количества измененных файлов