From cc538bbe18378e728a0367545858c073a39e3cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=BF=D0=BE=D0=B2=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Fri, 1 Dec 2017 17:46:04 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/libraries/Maven__antlr_antlr_2_7_7.xml | 13 + .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml | 13 + ..._transaction_javax_transaction_api_1_2.xml | 13 + .idea/libraries/Maven__log4j_log4j_1_2_17.xml | 13 - ...__org_apache_tomcat_tomcat_jdbc_8_5_23.xml | 13 + ...__org_apache_tomcat_tomcat_juli_8_5_23.xml | 13 + ...aven__org_aspectj_aspectjweaver_1_8_13.xml | 13 + .../Maven__org_atteo_evo_inflector_1_2_2.xml | 13 + ...ernate_commons_annotations_5_0_1_Final.xml | 13 + ..._hibernate_hibernate_core_5_0_12_Final.xml | 13 + ...e_hibernate_entitymanager_5_0_12_Final.xml | 13 + ...ence_hibernate_jpa_2_1_api_1_0_0_Final.xml | 13 + ...ven__org_javassist_javassist_3_21_0_GA.xml | 13 + .../Maven__org_jboss_jandex_2_0_0_Final.xml | 13 + ..._spring_boot_starter_aop_1_5_9_RELEASE.xml | 13 + ...ng_boot_starter_data_jpa_1_5_9_RELEASE.xml | 13 + ...spring_boot_starter_jdbc_1_5_9_RELEASE.xml | 13 + ...data_spring_data_commons_2_0_2_RELEASE.xml | 13 + ...rk_data_spring_data_jpa_1_11_9_RELEASE.xml | 13 + ...ta_spring_data_rest_core_2_6_9_RELEASE.xml | 13 + ..._hateoas_spring_hateoas_0_23_0_RELEASE.xml | 13 + ...lugin_spring_plugin_core_1_2_0_RELEASE.xml | 13 + ...ramework_spring_aspects_4_3_13_RELEASE.xml | 13 + ...ngframework_spring_jdbc_4_3_13_RELEASE.xml | 13 + ...ingframework_spring_orm_4_3_13_RELEASE.xml | 13 + ...ringframework_spring_tx_4_3_13_RELEASE.xml | 13 + .idea/workspace.xml | 550 +++++++++++++----- pom.xml | 26 +- restServer.iml | 38 +- restServer.rest | 0 .../ru/cft/task/restServer/BookStatus.java | 31 - .../ru/cft/task/restServer/EmailBook.java | 35 +- .../task/restServer/EmailBookController.java | 27 +- .../ru/cft/task/restServer/EmailRecord.java | 27 +- .../java/ru/cft/task/restServer/Main.java | 3 - src/main/resources/application.properties | 3 +- src/main/resources/log4j.properties | 8 - 37 files changed, 837 insertions(+), 249 deletions(-) create mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_7.xml create mode 100644 .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml create mode 100644 .idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml delete mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_17.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml create mode 100644 .idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml create mode 100644 .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml create mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_core_5_0_12_Final.xml create mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_0_12_Final.xml create mode 100644 .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml create mode 100644 .idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml create mode 100644 .idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_5_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_2_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_11_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_rest_core_2_6_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_23_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_aspects_4_3_13_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_orm_4_3_13_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml create mode 100644 restServer.rest delete mode 100644 src/main/java/ru/cft/task/restServer/BookStatus.java delete mode 100644 src/main/resources/log4j.properties diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml new file mode 100644 index 0000000..5f032d2 --- /dev/null +++ b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml deleted file mode 100644 index e383c1b..0000000 --- a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml new file mode 100644 index 0000000..38b86a3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml new file mode 100644 index 0000000..a9350c3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml new file mode 100644 index 0000000..d46e30a --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml b/.idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml new file mode 100644 index 0000000..2dde355 --- /dev/null +++ b/.idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml new file mode 100644 index 0000000..ce34f42 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_0_12_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_0_12_Final.xml new file mode 100644 index 0000000..34893a4 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_0_12_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_0_12_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_0_12_Final.xml new file mode 100644 index 0000000..27dda1e --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_0_12_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml new file mode 100644 index 0000000..09c4cf0 --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml new file mode 100644 index 0000000..a74dcfd --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_9_RELEASE.xml new file mode 100644 index 0000000..2932fb5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_5_9_RELEASE.xml new file mode 100644 index 0000000..adc9680 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_5_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml new file mode 100644 index 0000000..338299a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_2_RELEASE.xml new file mode 100644 index 0000000..3f1bdbc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_11_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_11_9_RELEASE.xml new file mode 100644 index 0000000..3f35534 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_11_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_2_6_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_2_6_9_RELEASE.xml new file mode 100644 index 0000000..3816e08 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_2_6_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_23_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_23_0_RELEASE.xml new file mode 100644 index 0000000..92e7f9f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_23_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml new file mode 100644 index 0000000..fbc0452 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_13_RELEASE.xml new file mode 100644 index 0000000..2d53c11 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_13_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml new file mode 100644 index 0000000..49da486 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_3_13_RELEASE.xml new file mode 100644 index 0000000..354d247 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_3_13_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml new file mode 100644 index 0000000..d56e28f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 62e5898..eab6c50 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -75,13 +110,16 @@ + + + - - + + @@ -90,22 +128,12 @@ - - - - - - - - - - - - - - + + + + @@ -114,43 +142,53 @@ - - + + - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - + + - - + + + + + + + + + + + + + + + + @@ -162,6 +200,7 @@ @@ -178,13 +217,13 @@ @@ -217,6 +256,34 @@